diff --git a/CMakeLists.txt b/CMakeLists.txt
index fcdeeca8fb..a1e1fa5537 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -778,7 +778,6 @@ add_subdirectory(Source)
 # Install shared data files
 #
 if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
-	install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN)
 	install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN)
 endif()
 if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin"))
diff --git a/Data/User/GameConfig/D43E01.ini b/Data/Sys/GameSettings/D43E01.ini
similarity index 100%
rename from Data/User/GameConfig/D43E01.ini
rename to Data/Sys/GameSettings/D43E01.ini
diff --git a/Data/User/GameConfig/D43J01.ini b/Data/Sys/GameSettings/D43J01.ini
similarity index 97%
rename from Data/User/GameConfig/D43J01.ini
rename to Data/Sys/GameSettings/D43J01.ini
index 03d04723dd..6db05bda2d 100644
--- a/Data/User/GameConfig/D43J01.ini
+++ b/Data/Sys/GameSettings/D43J01.ini
@@ -13,7 +13,7 @@ EmulationIssues =
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$loophack
+$loophack
 0x806866E4:word:0x60000000
 
 [ActionReplay]
diff --git a/Data/User/GameConfig/D43P01.ini b/Data/Sys/GameSettings/D43P01.ini
similarity index 100%
rename from Data/User/GameConfig/D43P01.ini
rename to Data/Sys/GameSettings/D43P01.ini
diff --git a/Data/User/GameConfig/D43U01.ini b/Data/Sys/GameSettings/D43U01.ini
similarity index 100%
rename from Data/User/GameConfig/D43U01.ini
rename to Data/Sys/GameSettings/D43U01.ini
diff --git a/Data/User/GameConfig/DTLX01.ini b/Data/Sys/GameSettings/DTLX01.ini
similarity index 100%
rename from Data/User/GameConfig/DTLX01.ini
rename to Data/Sys/GameSettings/DTLX01.ini
diff --git a/Data/User/GameConfig/DVDXDV.ini b/Data/Sys/GameSettings/DVDXDV.ini
similarity index 100%
rename from Data/User/GameConfig/DVDXDV.ini
rename to Data/Sys/GameSettings/DVDXDV.ini
diff --git a/Data/User/GameConfig/FABP01.ini b/Data/Sys/GameSettings/FABP01.ini
similarity index 100%
rename from Data/User/GameConfig/FABP01.ini
rename to Data/Sys/GameSettings/FABP01.ini
diff --git a/Data/User/GameConfig/FBYE01.ini b/Data/Sys/GameSettings/FBYE01.ini
similarity index 100%
rename from Data/User/GameConfig/FBYE01.ini
rename to Data/Sys/GameSettings/FBYE01.ini
diff --git a/Data/User/GameConfig/G2BE5G.ini b/Data/Sys/GameSettings/G2BE5G.ini
similarity index 100%
rename from Data/User/GameConfig/G2BE5G.ini
rename to Data/Sys/GameSettings/G2BE5G.ini
diff --git a/Data/User/GameConfig/G2BP7D.ini b/Data/Sys/GameSettings/G2BP7D.ini
similarity index 100%
rename from Data/User/GameConfig/G2BP7D.ini
rename to Data/Sys/GameSettings/G2BP7D.ini
diff --git a/Data/User/GameConfig/G2CE52.ini b/Data/Sys/GameSettings/G2CE52.ini
similarity index 100%
rename from Data/User/GameConfig/G2CE52.ini
rename to Data/Sys/GameSettings/G2CE52.ini
diff --git a/Data/User/GameConfig/G2FE78.ini b/Data/Sys/GameSettings/G2FE78.ini
similarity index 100%
rename from Data/User/GameConfig/G2FE78.ini
rename to Data/Sys/GameSettings/G2FE78.ini
diff --git a/Data/User/GameConfig/G2GJB2.ini b/Data/Sys/GameSettings/G2GJB2.ini
similarity index 100%
rename from Data/User/GameConfig/G2GJB2.ini
rename to Data/Sys/GameSettings/G2GJB2.ini
diff --git a/Data/User/GameConfig/G2ME01.ini b/Data/Sys/GameSettings/G2ME01.ini
similarity index 100%
rename from Data/User/GameConfig/G2ME01.ini
rename to Data/Sys/GameSettings/G2ME01.ini
diff --git a/Data/User/GameConfig/G2MP01.ini b/Data/Sys/GameSettings/G2MP01.ini
similarity index 100%
rename from Data/User/GameConfig/G2MP01.ini
rename to Data/Sys/GameSettings/G2MP01.ini
diff --git a/Data/User/GameConfig/G2OE41.ini b/Data/Sys/GameSettings/G2OE41.ini
similarity index 100%
rename from Data/User/GameConfig/G2OE41.ini
rename to Data/Sys/GameSettings/G2OE41.ini
diff --git a/Data/User/GameConfig/G2OP41.ini b/Data/Sys/GameSettings/G2OP41.ini
similarity index 100%
rename from Data/User/GameConfig/G2OP41.ini
rename to Data/Sys/GameSettings/G2OP41.ini
diff --git a/Data/User/GameConfig/G2RE52.ini b/Data/Sys/GameSettings/G2RE52.ini
similarity index 100%
rename from Data/User/GameConfig/G2RE52.ini
rename to Data/Sys/GameSettings/G2RE52.ini
diff --git a/Data/User/GameConfig/G2TE52.ini b/Data/Sys/GameSettings/G2TE52.ini
similarity index 100%
rename from Data/User/GameConfig/G2TE52.ini
rename to Data/Sys/GameSettings/G2TE52.ini
diff --git a/Data/User/GameConfig/G2VE08.ini b/Data/Sys/GameSettings/G2VE08.ini
similarity index 100%
rename from Data/User/GameConfig/G2VE08.ini
rename to Data/Sys/GameSettings/G2VE08.ini
diff --git a/Data/User/GameConfig/G2VP08.ini b/Data/Sys/GameSettings/G2VP08.ini
similarity index 100%
rename from Data/User/GameConfig/G2VP08.ini
rename to Data/Sys/GameSettings/G2VP08.ini
diff --git a/Data/User/GameConfig/G2XE8P.ini b/Data/Sys/GameSettings/G2XE8P.ini
similarity index 100%
rename from Data/User/GameConfig/G2XE8P.ini
rename to Data/Sys/GameSettings/G2XE8P.ini
diff --git a/Data/User/GameConfig/G2XP8P.ini b/Data/Sys/GameSettings/G2XP8P.ini
similarity index 100%
rename from Data/User/GameConfig/G2XP8P.ini
rename to Data/Sys/GameSettings/G2XP8P.ini
diff --git a/Data/User/GameConfig/G3AD69.ini b/Data/Sys/GameSettings/G3AD69.ini
similarity index 100%
rename from Data/User/GameConfig/G3AD69.ini
rename to Data/Sys/GameSettings/G3AD69.ini
diff --git a/Data/User/GameConfig/G3AE69.ini b/Data/Sys/GameSettings/G3AE69.ini
similarity index 100%
rename from Data/User/GameConfig/G3AE69.ini
rename to Data/Sys/GameSettings/G3AE69.ini
diff --git a/Data/User/GameConfig/G3AF69.ini b/Data/Sys/GameSettings/G3AF69.ini
similarity index 100%
rename from Data/User/GameConfig/G3AF69.ini
rename to Data/Sys/GameSettings/G3AF69.ini
diff --git a/Data/User/GameConfig/G3AP69.ini b/Data/Sys/GameSettings/G3AP69.ini
similarity index 100%
rename from Data/User/GameConfig/G3AP69.ini
rename to Data/Sys/GameSettings/G3AP69.ini
diff --git a/Data/User/GameConfig/G3DE6L.ini b/Data/Sys/GameSettings/G3DE6L.ini
similarity index 100%
rename from Data/User/GameConfig/G3DE6L.ini
rename to Data/Sys/GameSettings/G3DE6L.ini
diff --git a/Data/User/GameConfig/G3EE51.ini b/Data/Sys/GameSettings/G3EE51.ini
similarity index 100%
rename from Data/User/GameConfig/G3EE51.ini
rename to Data/Sys/GameSettings/G3EE51.ini
diff --git a/Data/User/GameConfig/G3FE69.ini b/Data/Sys/GameSettings/G3FE69.ini
similarity index 100%
rename from Data/User/GameConfig/G3FE69.ini
rename to Data/Sys/GameSettings/G3FE69.ini
diff --git a/Data/User/GameConfig/G3FF69.ini b/Data/Sys/GameSettings/G3FF69.ini
similarity index 100%
rename from Data/User/GameConfig/G3FF69.ini
rename to Data/Sys/GameSettings/G3FF69.ini
diff --git a/Data/User/GameConfig/G3FP69.ini b/Data/Sys/GameSettings/G3FP69.ini
similarity index 100%
rename from Data/User/GameConfig/G3FP69.ini
rename to Data/Sys/GameSettings/G3FP69.ini
diff --git a/Data/User/GameConfig/G3JEAF.ini b/Data/Sys/GameSettings/G3JEAF.ini
similarity index 100%
rename from Data/User/GameConfig/G3JEAF.ini
rename to Data/Sys/GameSettings/G3JEAF.ini
diff --git a/Data/User/GameConfig/G3LE8P.ini b/Data/Sys/GameSettings/G3LE8P.ini
similarity index 100%
rename from Data/User/GameConfig/G3LE8P.ini
rename to Data/Sys/GameSettings/G3LE8P.ini
diff --git a/Data/User/GameConfig/G3NJDA.ini b/Data/Sys/GameSettings/G3NJDA.ini
similarity index 100%
rename from Data/User/GameConfig/G3NJDA.ini
rename to Data/Sys/GameSettings/G3NJDA.ini
diff --git a/Data/User/GameConfig/G3QEA4.ini b/Data/Sys/GameSettings/G3QEA4.ini
similarity index 100%
rename from Data/User/GameConfig/G3QEA4.ini
rename to Data/Sys/GameSettings/G3QEA4.ini
diff --git a/Data/User/GameConfig/G3RD52.ini b/Data/Sys/GameSettings/G3RD52.ini
similarity index 100%
rename from Data/User/GameConfig/G3RD52.ini
rename to Data/Sys/GameSettings/G3RD52.ini
diff --git a/Data/User/GameConfig/G3RE52.ini b/Data/Sys/GameSettings/G3RE52.ini
similarity index 100%
rename from Data/User/GameConfig/G3RE52.ini
rename to Data/Sys/GameSettings/G3RE52.ini
diff --git a/Data/User/GameConfig/G3RF52.ini b/Data/Sys/GameSettings/G3RF52.ini
similarity index 100%
rename from Data/User/GameConfig/G3RF52.ini
rename to Data/Sys/GameSettings/G3RF52.ini
diff --git a/Data/User/GameConfig/G3RP52.ini b/Data/Sys/GameSettings/G3RP52.ini
similarity index 100%
rename from Data/User/GameConfig/G3RP52.ini
rename to Data/Sys/GameSettings/G3RP52.ini
diff --git a/Data/User/GameConfig/G3SE41.ini b/Data/Sys/GameSettings/G3SE41.ini
similarity index 100%
rename from Data/User/GameConfig/G3SE41.ini
rename to Data/Sys/GameSettings/G3SE41.ini
diff --git a/Data/User/GameConfig/G3VE69.ini b/Data/Sys/GameSettings/G3VE69.ini
similarity index 100%
rename from Data/User/GameConfig/G3VE69.ini
rename to Data/Sys/GameSettings/G3VE69.ini
diff --git a/Data/User/GameConfig/G3XE52.ini b/Data/Sys/GameSettings/G3XE52.ini
similarity index 100%
rename from Data/User/GameConfig/G3XE52.ini
rename to Data/Sys/GameSettings/G3XE52.ini
diff --git a/Data/User/GameConfig/G3XP52.ini b/Data/Sys/GameSettings/G3XP52.ini
similarity index 100%
rename from Data/User/GameConfig/G3XP52.ini
rename to Data/Sys/GameSettings/G3XP52.ini
diff --git a/Data/User/GameConfig/G4AEE9.ini b/Data/Sys/GameSettings/G4AEE9.ini
similarity index 100%
rename from Data/User/GameConfig/G4AEE9.ini
rename to Data/Sys/GameSettings/G4AEE9.ini
diff --git a/Data/User/GameConfig/G4BE08.ini b/Data/Sys/GameSettings/G4BE08.ini
similarity index 100%
rename from Data/User/GameConfig/G4BE08.ini
rename to Data/Sys/GameSettings/G4BE08.ini
diff --git a/Data/User/GameConfig/G4BP08.ini b/Data/Sys/GameSettings/G4BP08.ini
similarity index 100%
rename from Data/User/GameConfig/G4BP08.ini
rename to Data/Sys/GameSettings/G4BP08.ini
diff --git a/Data/User/GameConfig/G4CE54.ini b/Data/Sys/GameSettings/G4CE54.ini
similarity index 100%
rename from Data/User/GameConfig/G4CE54.ini
rename to Data/Sys/GameSettings/G4CE54.ini
diff --git a/Data/User/GameConfig/G4FD69.ini b/Data/Sys/GameSettings/G4FD69.ini
similarity index 100%
rename from Data/User/GameConfig/G4FD69.ini
rename to Data/Sys/GameSettings/G4FD69.ini
diff --git a/Data/User/GameConfig/G4FE69.ini b/Data/Sys/GameSettings/G4FE69.ini
similarity index 100%
rename from Data/User/GameConfig/G4FE69.ini
rename to Data/Sys/GameSettings/G4FE69.ini
diff --git a/Data/User/GameConfig/G4FF69.ini b/Data/Sys/GameSettings/G4FF69.ini
similarity index 100%
rename from Data/User/GameConfig/G4FF69.ini
rename to Data/Sys/GameSettings/G4FF69.ini
diff --git a/Data/User/GameConfig/G4FP69.ini b/Data/Sys/GameSettings/G4FP69.ini
similarity index 100%
rename from Data/User/GameConfig/G4FP69.ini
rename to Data/Sys/GameSettings/G4FP69.ini
diff --git a/Data/User/GameConfig/G4GEE9.ini b/Data/Sys/GameSettings/G4GEE9.ini
similarity index 100%
rename from Data/User/GameConfig/G4GEE9.ini
rename to Data/Sys/GameSettings/G4GEE9.ini
diff --git a/Data/User/GameConfig/G4ME69.ini b/Data/Sys/GameSettings/G4ME69.ini
similarity index 100%
rename from Data/User/GameConfig/G4ME69.ini
rename to Data/Sys/GameSettings/G4ME69.ini
diff --git a/Data/User/GameConfig/G4MP69.ini b/Data/Sys/GameSettings/G4MP69.ini
similarity index 100%
rename from Data/User/GameConfig/G4MP69.ini
rename to Data/Sys/GameSettings/G4MP69.ini
diff --git a/Data/User/GameConfig/G4NJDA.ini b/Data/Sys/GameSettings/G4NJDA.ini
similarity index 100%
rename from Data/User/GameConfig/G4NJDA.ini
rename to Data/Sys/GameSettings/G4NJDA.ini
diff --git a/Data/User/GameConfig/G4QE01.ini b/Data/Sys/GameSettings/G4QE01.ini
similarity index 100%
rename from Data/User/GameConfig/G4QE01.ini
rename to Data/Sys/GameSettings/G4QE01.ini
diff --git a/Data/User/GameConfig/G4QP01.ini b/Data/Sys/GameSettings/G4QP01.ini
similarity index 100%
rename from Data/User/GameConfig/G4QP01.ini
rename to Data/Sys/GameSettings/G4QP01.ini
diff --git a/Data/User/GameConfig/G4SE01.ini b/Data/Sys/GameSettings/G4SE01.ini
similarity index 100%
rename from Data/User/GameConfig/G4SE01.ini
rename to Data/Sys/GameSettings/G4SE01.ini
diff --git a/Data/User/GameConfig/G4SP01.ini b/Data/Sys/GameSettings/G4SP01.ini
similarity index 100%
rename from Data/User/GameConfig/G4SP01.ini
rename to Data/Sys/GameSettings/G4SP01.ini
diff --git a/Data/User/GameConfig/G4ZE69.ini b/Data/Sys/GameSettings/G4ZE69.ini
similarity index 100%
rename from Data/User/GameConfig/G4ZE69.ini
rename to Data/Sys/GameSettings/G4ZE69.ini
diff --git a/Data/User/GameConfig/G5DE78.ini b/Data/Sys/GameSettings/G5DE78.ini
similarity index 100%
rename from Data/User/GameConfig/G5DE78.ini
rename to Data/Sys/GameSettings/G5DE78.ini
diff --git a/Data/User/GameConfig/G5DP78.ini b/Data/Sys/GameSettings/G5DP78.ini
similarity index 100%
rename from Data/User/GameConfig/G5DP78.ini
rename to Data/Sys/GameSettings/G5DP78.ini
diff --git a/Data/User/GameConfig/G5SE7D.ini b/Data/Sys/GameSettings/G5SE7D.ini
similarity index 100%
rename from Data/User/GameConfig/G5SE7D.ini
rename to Data/Sys/GameSettings/G5SE7D.ini
diff --git a/Data/User/GameConfig/G5SP7D.ini b/Data/Sys/GameSettings/G5SP7D.ini
similarity index 100%
rename from Data/User/GameConfig/G5SP7D.ini
rename to Data/Sys/GameSettings/G5SP7D.ini
diff --git a/Data/User/GameConfig/G63E41.ini b/Data/Sys/GameSettings/G63E41.ini
similarity index 100%
rename from Data/User/GameConfig/G63E41.ini
rename to Data/Sys/GameSettings/G63E41.ini
diff --git a/Data/User/GameConfig/G63P41.ini b/Data/Sys/GameSettings/G63P41.ini
similarity index 100%
rename from Data/User/GameConfig/G63P41.ini
rename to Data/Sys/GameSettings/G63P41.ini
diff --git a/Data/User/GameConfig/G6FE69.ini b/Data/Sys/GameSettings/G6FE69.ini
similarity index 100%
rename from Data/User/GameConfig/G6FE69.ini
rename to Data/Sys/GameSettings/G6FE69.ini
diff --git a/Data/User/GameConfig/G6NE69.ini b/Data/Sys/GameSettings/G6NE69.ini
similarity index 100%
rename from Data/User/GameConfig/G6NE69.ini
rename to Data/Sys/GameSettings/G6NE69.ini
diff --git a/Data/User/GameConfig/G6NP69.ini b/Data/Sys/GameSettings/G6NP69.ini
similarity index 100%
rename from Data/User/GameConfig/G6NP69.ini
rename to Data/Sys/GameSettings/G6NP69.ini
diff --git a/Data/User/GameConfig/G6QE08.ini b/Data/Sys/GameSettings/G6QE08.ini
similarity index 100%
rename from Data/User/GameConfig/G6QE08.ini
rename to Data/Sys/GameSettings/G6QE08.ini
diff --git a/Data/User/GameConfig/G6TE5G.ini b/Data/Sys/GameSettings/G6TE5G.ini
similarity index 100%
rename from Data/User/GameConfig/G6TE5G.ini
rename to Data/Sys/GameSettings/G6TE5G.ini
diff --git a/Data/User/GameConfig/G6TP5G.ini b/Data/Sys/GameSettings/G6TP5G.ini
similarity index 100%
rename from Data/User/GameConfig/G6TP5G.ini
rename to Data/Sys/GameSettings/G6TP5G.ini
diff --git a/Data/User/GameConfig/G89EAF.ini b/Data/Sys/GameSettings/G89EAF.ini
similarity index 100%
rename from Data/User/GameConfig/G89EAF.ini
rename to Data/Sys/GameSettings/G89EAF.ini
diff --git a/Data/User/GameConfig/G8FE8P.ini b/Data/Sys/GameSettings/G8FE8P.ini
similarity index 100%
rename from Data/User/GameConfig/G8FE8P.ini
rename to Data/Sys/GameSettings/G8FE8P.ini
diff --git a/Data/User/GameConfig/G8ME01.ini b/Data/Sys/GameSettings/G8ME01.ini
similarity index 100%
rename from Data/User/GameConfig/G8ME01.ini
rename to Data/Sys/GameSettings/G8ME01.ini
diff --git a/Data/User/GameConfig/G8MJ01.ini b/Data/Sys/GameSettings/G8MJ01.ini
similarity index 100%
rename from Data/User/GameConfig/G8MJ01.ini
rename to Data/Sys/GameSettings/G8MJ01.ini
diff --git a/Data/User/GameConfig/G8MP01.ini b/Data/Sys/GameSettings/G8MP01.ini
similarity index 100%
rename from Data/User/GameConfig/G8MP01.ini
rename to Data/Sys/GameSettings/G8MP01.ini
diff --git a/Data/User/GameConfig/G8OJ18.ini b/Data/Sys/GameSettings/G8OJ18.ini
similarity index 100%
rename from Data/User/GameConfig/G8OJ18.ini
rename to Data/Sys/GameSettings/G8OJ18.ini
diff --git a/Data/User/GameConfig/G8SJAF.ini b/Data/Sys/GameSettings/G8SJAF.ini
similarity index 100%
rename from Data/User/GameConfig/G8SJAF.ini
rename to Data/Sys/GameSettings/G8SJAF.ini
diff --git a/Data/User/GameConfig/G8WE01.ini b/Data/Sys/GameSettings/G8WE01.ini
similarity index 100%
rename from Data/User/GameConfig/G8WE01.ini
rename to Data/Sys/GameSettings/G8WE01.ini
diff --git a/Data/User/GameConfig/G8WP01.ini b/Data/Sys/GameSettings/G8WP01.ini
similarity index 100%
rename from Data/User/GameConfig/G8WP01.ini
rename to Data/Sys/GameSettings/G8WP01.ini
diff --git a/Data/User/GameConfig/G9BEE9.ini b/Data/Sys/GameSettings/G9BEE9.ini
similarity index 100%
rename from Data/User/GameConfig/G9BEE9.ini
rename to Data/Sys/GameSettings/G9BEE9.ini
diff --git a/Data/User/GameConfig/G9RE7D.ini b/Data/Sys/GameSettings/G9RE7D.ini
similarity index 100%
rename from Data/User/GameConfig/G9RE7D.ini
rename to Data/Sys/GameSettings/G9RE7D.ini
diff --git a/Data/User/GameConfig/G9SE8P.ini b/Data/Sys/GameSettings/G9SE8P.ini
similarity index 100%
rename from Data/User/GameConfig/G9SE8P.ini
rename to Data/Sys/GameSettings/G9SE8P.ini
diff --git a/Data/User/GameConfig/G9SJ8P.ini b/Data/Sys/GameSettings/G9SJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/G9SJ8P.ini
rename to Data/Sys/GameSettings/G9SJ8P.ini
diff --git a/Data/User/GameConfig/G9SP8P.ini b/Data/Sys/GameSettings/G9SP8P.ini
similarity index 100%
rename from Data/User/GameConfig/G9SP8P.ini
rename to Data/Sys/GameSettings/G9SP8P.ini
diff --git a/Data/User/GameConfig/G9TD52.ini b/Data/Sys/GameSettings/G9TD52.ini
similarity index 100%
rename from Data/User/GameConfig/G9TD52.ini
rename to Data/Sys/GameSettings/G9TD52.ini
diff --git a/Data/User/GameConfig/G9TE52.ini b/Data/Sys/GameSettings/G9TE52.ini
similarity index 100%
rename from Data/User/GameConfig/G9TE52.ini
rename to Data/Sys/GameSettings/G9TE52.ini
diff --git a/Data/User/GameConfig/G9TF52.ini b/Data/Sys/GameSettings/G9TF52.ini
similarity index 100%
rename from Data/User/GameConfig/G9TF52.ini
rename to Data/Sys/GameSettings/G9TF52.ini
diff --git a/Data/User/GameConfig/G9TI52.ini b/Data/Sys/GameSettings/G9TI52.ini
similarity index 100%
rename from Data/User/GameConfig/G9TI52.ini
rename to Data/Sys/GameSettings/G9TI52.ini
diff --git a/Data/User/GameConfig/G9TP52.ini b/Data/Sys/GameSettings/G9TP52.ini
similarity index 100%
rename from Data/User/GameConfig/G9TP52.ini
rename to Data/Sys/GameSettings/G9TP52.ini
diff --git a/Data/User/GameConfig/GA2E51.ini b/Data/Sys/GameSettings/GA2E51.ini
similarity index 100%
rename from Data/User/GameConfig/GA2E51.ini
rename to Data/Sys/GameSettings/GA2E51.ini
diff --git a/Data/User/GameConfig/GA3E51.ini b/Data/Sys/GameSettings/GA3E51.ini
similarity index 100%
rename from Data/User/GameConfig/GA3E51.ini
rename to Data/Sys/GameSettings/GA3E51.ini
diff --git a/Data/User/GameConfig/GA4E51.ini b/Data/Sys/GameSettings/GA4E51.ini
similarity index 100%
rename from Data/User/GameConfig/GA4E51.ini
rename to Data/Sys/GameSettings/GA4E51.ini
diff --git a/Data/User/GameConfig/GA7E70.ini b/Data/Sys/GameSettings/GA7E70.ini
similarity index 100%
rename from Data/User/GameConfig/GA7E70.ini
rename to Data/Sys/GameSettings/GA7E70.ini
diff --git a/Data/User/GameConfig/GABEAF.ini b/Data/Sys/GameSettings/GABEAF.ini
similarity index 100%
rename from Data/User/GameConfig/GABEAF.ini
rename to Data/Sys/GameSettings/GABEAF.ini
diff --git a/Data/User/GameConfig/GACE5H.ini b/Data/Sys/GameSettings/GACE5H.ini
similarity index 100%
rename from Data/User/GameConfig/GACE5H.ini
rename to Data/Sys/GameSettings/GACE5H.ini
diff --git a/Data/User/GameConfig/GAFE01.ini b/Data/Sys/GameSettings/GAFE01.ini
similarity index 100%
rename from Data/User/GameConfig/GAFE01.ini
rename to Data/Sys/GameSettings/GAFE01.ini
diff --git a/Data/User/GameConfig/GAFJ01.ini b/Data/Sys/GameSettings/GAFJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GAFJ01.ini
rename to Data/Sys/GameSettings/GAFJ01.ini
diff --git a/Data/User/GameConfig/GAFP01.ini b/Data/Sys/GameSettings/GAFP01.ini
similarity index 100%
rename from Data/User/GameConfig/GAFP01.ini
rename to Data/Sys/GameSettings/GAFP01.ini
diff --git a/Data/User/GameConfig/GAFU01.ini b/Data/Sys/GameSettings/GAFU01.ini
similarity index 100%
rename from Data/User/GameConfig/GAFU01.ini
rename to Data/Sys/GameSettings/GAFU01.ini
diff --git a/Data/User/GameConfig/GAGP70.ini b/Data/Sys/GameSettings/GAGP70.ini
similarity index 100%
rename from Data/User/GameConfig/GAGP70.ini
rename to Data/Sys/GameSettings/GAGP70.ini
diff --git a/Data/User/GameConfig/GAHEGG.ini b/Data/Sys/GameSettings/GAHEGG.ini
similarity index 100%
rename from Data/User/GameConfig/GAHEGG.ini
rename to Data/Sys/GameSettings/GAHEGG.ini
diff --git a/Data/User/GameConfig/GALE01.ini b/Data/Sys/GameSettings/GALE01.ini
similarity index 100%
rename from Data/User/GameConfig/GALE01.ini
rename to Data/Sys/GameSettings/GALE01.ini
diff --git a/Data/User/GameConfig/GALJ01.ini b/Data/Sys/GameSettings/GALJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GALJ01.ini
rename to Data/Sys/GameSettings/GALJ01.ini
diff --git a/Data/User/GameConfig/GALP01.ini b/Data/Sys/GameSettings/GALP01.ini
similarity index 100%
rename from Data/User/GameConfig/GALP01.ini
rename to Data/Sys/GameSettings/GALP01.ini
diff --git a/Data/User/GameConfig/GAME5H.ini b/Data/Sys/GameSettings/GAME5H.ini
similarity index 100%
rename from Data/User/GameConfig/GAME5H.ini
rename to Data/Sys/GameSettings/GAME5H.ini
diff --git a/Data/User/GameConfig/GANE7U.ini b/Data/Sys/GameSettings/GANE7U.ini
similarity index 100%
rename from Data/User/GameConfig/GANE7U.ini
rename to Data/Sys/GameSettings/GANE7U.ini
diff --git a/Data/User/GameConfig/GAPE52.ini b/Data/Sys/GameSettings/GAPE52.ini
similarity index 100%
rename from Data/User/GameConfig/GAPE52.ini
rename to Data/Sys/GameSettings/GAPE52.ini
diff --git a/Data/User/GameConfig/GAQE6S.ini b/Data/Sys/GameSettings/GAQE6S.ini
similarity index 100%
rename from Data/User/GameConfig/GAQE6S.ini
rename to Data/Sys/GameSettings/GAQE6S.ini
diff --git a/Data/User/GameConfig/GARE5H.ini b/Data/Sys/GameSettings/GARE5H.ini
similarity index 100%
rename from Data/User/GameConfig/GARE5H.ini
rename to Data/Sys/GameSettings/GARE5H.ini
diff --git a/Data/User/GameConfig/GATE51.ini b/Data/Sys/GameSettings/GATE51.ini
similarity index 100%
rename from Data/User/GameConfig/GATE51.ini
rename to Data/Sys/GameSettings/GATE51.ini
diff --git a/Data/User/GameConfig/GATP51.ini b/Data/Sys/GameSettings/GATP51.ini
similarity index 100%
rename from Data/User/GameConfig/GATP51.ini
rename to Data/Sys/GameSettings/GATP51.ini
diff --git a/Data/User/GameConfig/GAUE08.ini b/Data/Sys/GameSettings/GAUE08.ini
similarity index 100%
rename from Data/User/GameConfig/GAUE08.ini
rename to Data/Sys/GameSettings/GAUE08.ini
diff --git a/Data/User/GameConfig/GAUJ08.ini b/Data/Sys/GameSettings/GAUJ08.ini
similarity index 100%
rename from Data/User/GameConfig/GAUJ08.ini
rename to Data/Sys/GameSettings/GAUJ08.ini
diff --git a/Data/User/GameConfig/GAVE78.ini b/Data/Sys/GameSettings/GAVE78.ini
similarity index 100%
rename from Data/User/GameConfig/GAVE78.ini
rename to Data/Sys/GameSettings/GAVE78.ini
diff --git a/Data/User/GameConfig/GAVP78.ini b/Data/Sys/GameSettings/GAVP78.ini
similarity index 100%
rename from Data/User/GameConfig/GAVP78.ini
rename to Data/Sys/GameSettings/GAVP78.ini
diff --git a/Data/User/GameConfig/GAVY78.ini b/Data/Sys/GameSettings/GAVY78.ini
similarity index 100%
rename from Data/User/GameConfig/GAVY78.ini
rename to Data/Sys/GameSettings/GAVY78.ini
diff --git a/Data/User/GameConfig/GAXE5D.ini b/Data/Sys/GameSettings/GAXE5D.ini
similarity index 100%
rename from Data/User/GameConfig/GAXE5D.ini
rename to Data/Sys/GameSettings/GAXE5D.ini
diff --git a/Data/User/GameConfig/GAZD69.ini b/Data/Sys/GameSettings/GAZD69.ini
similarity index 100%
rename from Data/User/GameConfig/GAZD69.ini
rename to Data/Sys/GameSettings/GAZD69.ini
diff --git a/Data/User/GameConfig/GAZE69.ini b/Data/Sys/GameSettings/GAZE69.ini
similarity index 100%
rename from Data/User/GameConfig/GAZE69.ini
rename to Data/Sys/GameSettings/GAZE69.ini
diff --git a/Data/User/GameConfig/GAZF69.ini b/Data/Sys/GameSettings/GAZF69.ini
similarity index 100%
rename from Data/User/GameConfig/GAZF69.ini
rename to Data/Sys/GameSettings/GAZF69.ini
diff --git a/Data/User/GameConfig/GAZH69.ini b/Data/Sys/GameSettings/GAZH69.ini
similarity index 100%
rename from Data/User/GameConfig/GAZH69.ini
rename to Data/Sys/GameSettings/GAZH69.ini
diff --git a/Data/User/GameConfig/GAZI69.ini b/Data/Sys/GameSettings/GAZI69.ini
similarity index 100%
rename from Data/User/GameConfig/GAZI69.ini
rename to Data/Sys/GameSettings/GAZI69.ini
diff --git a/Data/User/GameConfig/GAZJ69.ini b/Data/Sys/GameSettings/GAZJ69.ini
similarity index 100%
rename from Data/User/GameConfig/GAZJ69.ini
rename to Data/Sys/GameSettings/GAZJ69.ini
diff --git a/Data/User/GameConfig/GAZM69.ini b/Data/Sys/GameSettings/GAZM69.ini
similarity index 100%
rename from Data/User/GameConfig/GAZM69.ini
rename to Data/Sys/GameSettings/GAZM69.ini
diff --git a/Data/User/GameConfig/GAZP69.ini b/Data/Sys/GameSettings/GAZP69.ini
similarity index 100%
rename from Data/User/GameConfig/GAZP69.ini
rename to Data/Sys/GameSettings/GAZP69.ini
diff --git a/Data/User/GameConfig/GAZS69.ini b/Data/Sys/GameSettings/GAZS69.ini
similarity index 100%
rename from Data/User/GameConfig/GAZS69.ini
rename to Data/Sys/GameSettings/GAZS69.ini
diff --git a/Data/User/GameConfig/GB3E51.ini b/Data/Sys/GameSettings/GB3E51.ini
similarity index 100%
rename from Data/User/GameConfig/GB3E51.ini
rename to Data/Sys/GameSettings/GB3E51.ini
diff --git a/Data/User/GameConfig/GB4E51.ini b/Data/Sys/GameSettings/GB4E51.ini
similarity index 100%
rename from Data/User/GameConfig/GB4E51.ini
rename to Data/Sys/GameSettings/GB4E51.ini
diff --git a/Data/User/GameConfig/GB4P51.ini b/Data/Sys/GameSettings/GB4P51.ini
similarity index 100%
rename from Data/User/GameConfig/GB4P51.ini
rename to Data/Sys/GameSettings/GB4P51.ini
diff --git a/Data/User/GameConfig/GBDE5G.ini b/Data/Sys/GameSettings/GBDE5G.ini
similarity index 100%
rename from Data/User/GameConfig/GBDE5G.ini
rename to Data/Sys/GameSettings/GBDE5G.ini
diff --git a/Data/User/GameConfig/GBDS7D.ini b/Data/Sys/GameSettings/GBDS7D.ini
similarity index 100%
rename from Data/User/GameConfig/GBDS7D.ini
rename to Data/Sys/GameSettings/GBDS7D.ini
diff --git a/Data/User/GameConfig/GBFE70.ini b/Data/Sys/GameSettings/GBFE70.ini
similarity index 100%
rename from Data/User/GameConfig/GBFE70.ini
rename to Data/Sys/GameSettings/GBFE70.ini
diff --git a/Data/User/GameConfig/GBGE5G.ini b/Data/Sys/GameSettings/GBGE5G.ini
similarity index 100%
rename from Data/User/GameConfig/GBGE5G.ini
rename to Data/Sys/GameSettings/GBGE5G.ini
diff --git a/Data/User/GameConfig/GBGP7D.ini b/Data/Sys/GameSettings/GBGP7D.ini
similarity index 100%
rename from Data/User/GameConfig/GBGP7D.ini
rename to Data/Sys/GameSettings/GBGP7D.ini
diff --git a/Data/User/GameConfig/GBHDC8.ini b/Data/Sys/GameSettings/GBHDC8.ini
similarity index 100%
rename from Data/User/GameConfig/GBHDC8.ini
rename to Data/Sys/GameSettings/GBHDC8.ini
diff --git a/Data/User/GameConfig/GBHEC8.ini b/Data/Sys/GameSettings/GBHEC8.ini
similarity index 100%
rename from Data/User/GameConfig/GBHEC8.ini
rename to Data/Sys/GameSettings/GBHEC8.ini
diff --git a/Data/User/GameConfig/GBHFC8.ini b/Data/Sys/GameSettings/GBHFC8.ini
similarity index 100%
rename from Data/User/GameConfig/GBHFC8.ini
rename to Data/Sys/GameSettings/GBHFC8.ini
diff --git a/Data/User/GameConfig/GBHPC8.ini b/Data/Sys/GameSettings/GBHPC8.ini
similarity index 100%
rename from Data/User/GameConfig/GBHPC8.ini
rename to Data/Sys/GameSettings/GBHPC8.ini
diff --git a/Data/User/GameConfig/GBIE08.ini b/Data/Sys/GameSettings/GBIE08.ini
similarity index 100%
rename from Data/User/GameConfig/GBIE08.ini
rename to Data/Sys/GameSettings/GBIE08.ini
diff --git a/Data/User/GameConfig/GBIP08.ini b/Data/Sys/GameSettings/GBIP08.ini
similarity index 100%
rename from Data/User/GameConfig/GBIP08.ini
rename to Data/Sys/GameSettings/GBIP08.ini
diff --git a/Data/User/GameConfig/GBKE70.ini b/Data/Sys/GameSettings/GBKE70.ini
similarity index 100%
rename from Data/User/GameConfig/GBKE70.ini
rename to Data/Sys/GameSettings/GBKE70.ini
diff --git a/Data/User/GameConfig/GBLE52.ini b/Data/Sys/GameSettings/GBLE52.ini
similarity index 100%
rename from Data/User/GameConfig/GBLE52.ini
rename to Data/Sys/GameSettings/GBLE52.ini
diff --git a/Data/User/GameConfig/GBLP52.ini b/Data/Sys/GameSettings/GBLP52.ini
similarity index 100%
rename from Data/User/GameConfig/GBLP52.ini
rename to Data/Sys/GameSettings/GBLP52.ini
diff --git a/Data/User/GameConfig/GBLPGL.ini b/Data/Sys/GameSettings/GBLPGL.ini
similarity index 100%
rename from Data/User/GameConfig/GBLPGL.ini
rename to Data/Sys/GameSettings/GBLPGL.ini
diff --git a/Data/User/GameConfig/GBME7F.ini b/Data/Sys/GameSettings/GBME7F.ini
similarity index 100%
rename from Data/User/GameConfig/GBME7F.ini
rename to Data/Sys/GameSettings/GBME7F.ini
diff --git a/Data/User/GameConfig/GBMP7F.ini b/Data/Sys/GameSettings/GBMP7F.ini
similarity index 100%
rename from Data/User/GameConfig/GBMP7F.ini
rename to Data/Sys/GameSettings/GBMP7F.ini
diff --git a/Data/User/GameConfig/GBOP51.ini b/Data/Sys/GameSettings/GBOP51.ini
similarity index 100%
rename from Data/User/GameConfig/GBOP51.ini
rename to Data/Sys/GameSettings/GBOP51.ini
diff --git a/Data/User/GameConfig/GBQE78.ini b/Data/Sys/GameSettings/GBQE78.ini
similarity index 100%
rename from Data/User/GameConfig/GBQE78.ini
rename to Data/Sys/GameSettings/GBQE78.ini
diff --git a/Data/User/GameConfig/GBSE8P.ini b/Data/Sys/GameSettings/GBSE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GBSE8P.ini
rename to Data/Sys/GameSettings/GBSE8P.ini
diff --git a/Data/User/GameConfig/GBSP8P.ini b/Data/Sys/GameSettings/GBSP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GBSP8P.ini
rename to Data/Sys/GameSettings/GBSP8P.ini
diff --git a/Data/User/GameConfig/GBTE70.ini b/Data/Sys/GameSettings/GBTE70.ini
similarity index 100%
rename from Data/User/GameConfig/GBTE70.ini
rename to Data/Sys/GameSettings/GBTE70.ini
diff --git a/Data/User/GameConfig/GBVE41.ini b/Data/Sys/GameSettings/GBVE41.ini
similarity index 100%
rename from Data/User/GameConfig/GBVE41.ini
rename to Data/Sys/GameSettings/GBVE41.ini
diff --git a/Data/User/GameConfig/GBVP41.ini b/Data/Sys/GameSettings/GBVP41.ini
similarity index 100%
rename from Data/User/GameConfig/GBVP41.ini
rename to Data/Sys/GameSettings/GBVP41.ini
diff --git a/Data/User/GameConfig/GBWD64.ini b/Data/Sys/GameSettings/GBWD64.ini
similarity index 100%
rename from Data/User/GameConfig/GBWD64.ini
rename to Data/Sys/GameSettings/GBWD64.ini
diff --git a/Data/User/GameConfig/GBWE64.ini b/Data/Sys/GameSettings/GBWE64.ini
similarity index 100%
rename from Data/User/GameConfig/GBWE64.ini
rename to Data/Sys/GameSettings/GBWE64.ini
diff --git a/Data/User/GameConfig/GBWF64.ini b/Data/Sys/GameSettings/GBWF64.ini
similarity index 100%
rename from Data/User/GameConfig/GBWF64.ini
rename to Data/Sys/GameSettings/GBWF64.ini
diff --git a/Data/User/GameConfig/GBWP64.ini b/Data/Sys/GameSettings/GBWP64.ini
similarity index 100%
rename from Data/User/GameConfig/GBWP64.ini
rename to Data/Sys/GameSettings/GBWP64.ini
diff --git a/Data/User/GameConfig/GBXE51.ini b/Data/Sys/GameSettings/GBXE51.ini
similarity index 100%
rename from Data/User/GameConfig/GBXE51.ini
rename to Data/Sys/GameSettings/GBXE51.ini
diff --git a/Data/User/GameConfig/GBYE0A.ini b/Data/Sys/GameSettings/GBYE0A.ini
similarity index 100%
rename from Data/User/GameConfig/GBYE0A.ini
rename to Data/Sys/GameSettings/GBYE0A.ini
diff --git a/Data/User/GameConfig/GBZE08.ini b/Data/Sys/GameSettings/GBZE08.ini
similarity index 100%
rename from Data/User/GameConfig/GBZE08.ini
rename to Data/Sys/GameSettings/GBZE08.ini
diff --git a/Data/User/GameConfig/GBZP08.ini b/Data/Sys/GameSettings/GBZP08.ini
similarity index 100%
rename from Data/User/GameConfig/GBZP08.ini
rename to Data/Sys/GameSettings/GBZP08.ini
diff --git a/Data/User/GameConfig/GC2E9G.ini b/Data/Sys/GameSettings/GC2E9G.ini
similarity index 100%
rename from Data/User/GameConfig/GC2E9G.ini
rename to Data/Sys/GameSettings/GC2E9G.ini
diff --git a/Data/User/GameConfig/GC3D78.ini b/Data/Sys/GameSettings/GC3D78.ini
similarity index 100%
rename from Data/User/GameConfig/GC3D78.ini
rename to Data/Sys/GameSettings/GC3D78.ini
diff --git a/Data/User/GameConfig/GC3E78.ini b/Data/Sys/GameSettings/GC3E78.ini
similarity index 100%
rename from Data/User/GameConfig/GC3E78.ini
rename to Data/Sys/GameSettings/GC3E78.ini
diff --git a/Data/User/GameConfig/GC3F78.ini b/Data/Sys/GameSettings/GC3F78.ini
similarity index 100%
rename from Data/User/GameConfig/GC3F78.ini
rename to Data/Sys/GameSettings/GC3F78.ini
diff --git a/Data/User/GameConfig/GC3P78.ini b/Data/Sys/GameSettings/GC3P78.ini
similarity index 100%
rename from Data/User/GameConfig/GC3P78.ini
rename to Data/Sys/GameSettings/GC3P78.ini
diff --git a/Data/User/GameConfig/GC4JBN.ini b/Data/Sys/GameSettings/GC4JBN.ini
similarity index 100%
rename from Data/User/GameConfig/GC4JBN.ini
rename to Data/Sys/GameSettings/GC4JBN.ini
diff --git a/Data/User/GameConfig/GC5PNK.ini b/Data/Sys/GameSettings/GC5PNK.ini
similarity index 100%
rename from Data/User/GameConfig/GC5PNK.ini
rename to Data/Sys/GameSettings/GC5PNK.ini
diff --git a/Data/User/GameConfig/GC6E01.ini b/Data/Sys/GameSettings/GC6E01.ini
similarity index 100%
rename from Data/User/GameConfig/GC6E01.ini
rename to Data/Sys/GameSettings/GC6E01.ini
diff --git a/Data/User/GameConfig/GC6P01.ini b/Data/Sys/GameSettings/GC6P01.ini
similarity index 100%
rename from Data/User/GameConfig/GC6P01.ini
rename to Data/Sys/GameSettings/GC6P01.ini
diff --git a/Data/User/GameConfig/GC7PNK.ini b/Data/Sys/GameSettings/GC7PNK.ini
similarity index 100%
rename from Data/User/GameConfig/GC7PNK.ini
rename to Data/Sys/GameSettings/GC7PNK.ini
diff --git a/Data/User/GameConfig/GC9P6S.ini b/Data/Sys/GameSettings/GC9P6S.ini
similarity index 100%
rename from Data/User/GameConfig/GC9P6S.ini
rename to Data/Sys/GameSettings/GC9P6S.ini
diff --git a/Data/User/GameConfig/GCAE5H.ini b/Data/Sys/GameSettings/GCAE5H.ini
similarity index 100%
rename from Data/User/GameConfig/GCAE5H.ini
rename to Data/Sys/GameSettings/GCAE5H.ini
diff --git a/Data/User/GameConfig/GCBE7D.ini b/Data/Sys/GameSettings/GCBE7D.ini
similarity index 100%
rename from Data/User/GameConfig/GCBE7D.ini
rename to Data/Sys/GameSettings/GCBE7D.ini
diff --git a/Data/User/GameConfig/GCBP7D.ini b/Data/Sys/GameSettings/GCBP7D.ini
similarity index 100%
rename from Data/User/GameConfig/GCBP7D.ini
rename to Data/Sys/GameSettings/GCBP7D.ini
diff --git a/Data/User/GameConfig/GCCE01.ini b/Data/Sys/GameSettings/GCCE01.ini
similarity index 100%
rename from Data/User/GameConfig/GCCE01.ini
rename to Data/Sys/GameSettings/GCCE01.ini
diff --git a/Data/User/GameConfig/GCCP01.ini b/Data/Sys/GameSettings/GCCP01.ini
similarity index 100%
rename from Data/User/GameConfig/GCCP01.ini
rename to Data/Sys/GameSettings/GCCP01.ini
diff --git a/Data/User/GameConfig/GCDE08.ini b/Data/Sys/GameSettings/GCDE08.ini
similarity index 100%
rename from Data/User/GameConfig/GCDE08.ini
rename to Data/Sys/GameSettings/GCDE08.ini
diff --git a/Data/User/GameConfig/GCDP08.ini b/Data/Sys/GameSettings/GCDP08.ini
similarity index 100%
rename from Data/User/GameConfig/GCDP08.ini
rename to Data/Sys/GameSettings/GCDP08.ini
diff --git a/Data/User/GameConfig/GCEE41.ini b/Data/Sys/GameSettings/GCEE41.ini
similarity index 97%
rename from Data/User/GameConfig/GCEE41.ini
rename to Data/Sys/GameSettings/GCEE41.ini
index a9e3e13ca3..37e171c52a 100644
--- a/Data/User/GameConfig/GCEE41.ini
+++ b/Data/Sys/GameSettings/GCEE41.ini
@@ -16,4 +16,3 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-[Gecko]
diff --git a/Data/User/GameConfig/GCEP41.ini b/Data/Sys/GameSettings/GCEP41.ini
similarity index 97%
rename from Data/User/GameConfig/GCEP41.ini
rename to Data/Sys/GameSettings/GCEP41.ini
index 5385275894..e049fe69ba 100644
--- a/Data/User/GameConfig/GCEP41.ini
+++ b/Data/Sys/GameSettings/GCEP41.ini
@@ -16,4 +16,3 @@ PH_ZFar =
 [Video_Settings]
 UseXFB = True
 UseRealXFB = True
-[Gecko]
diff --git a/Data/User/GameConfig/GCFE9G.ini b/Data/Sys/GameSettings/GCFE9G.ini
similarity index 100%
rename from Data/User/GameConfig/GCFE9G.ini
rename to Data/Sys/GameSettings/GCFE9G.ini
diff --git a/Data/User/GameConfig/GCGE41.ini b/Data/Sys/GameSettings/GCGE41.ini
similarity index 100%
rename from Data/User/GameConfig/GCGE41.ini
rename to Data/Sys/GameSettings/GCGE41.ini
diff --git a/Data/User/GameConfig/GCHE78.ini b/Data/Sys/GameSettings/GCHE78.ini
similarity index 100%
rename from Data/User/GameConfig/GCHE78.ini
rename to Data/Sys/GameSettings/GCHE78.ini
diff --git a/Data/User/GameConfig/GCJE41.ini b/Data/Sys/GameSettings/GCJE41.ini
similarity index 100%
rename from Data/User/GameConfig/GCJE41.ini
rename to Data/Sys/GameSettings/GCJE41.ini
diff --git a/Data/User/GameConfig/GCJP41.ini b/Data/Sys/GameSettings/GCJP41.ini
similarity index 100%
rename from Data/User/GameConfig/GCJP41.ini
rename to Data/Sys/GameSettings/GCJP41.ini
diff --git a/Data/User/GameConfig/GCLP69.ini b/Data/Sys/GameSettings/GCLP69.ini
similarity index 100%
rename from Data/User/GameConfig/GCLP69.ini
rename to Data/Sys/GameSettings/GCLP69.ini
diff --git a/Data/User/GameConfig/GCNE7D.ini b/Data/Sys/GameSettings/GCNE7D.ini
similarity index 100%
rename from Data/User/GameConfig/GCNE7D.ini
rename to Data/Sys/GameSettings/GCNE7D.ini
diff --git a/Data/User/GameConfig/GCNP7D.ini b/Data/Sys/GameSettings/GCNP7D.ini
similarity index 100%
rename from Data/User/GameConfig/GCNP7D.ini
rename to Data/Sys/GameSettings/GCNP7D.ini
diff --git a/Data/User/GameConfig/GCOE52.ini b/Data/Sys/GameSettings/GCOE52.ini
similarity index 100%
rename from Data/User/GameConfig/GCOE52.ini
rename to Data/Sys/GameSettings/GCOE52.ini
diff --git a/Data/User/GameConfig/GCOPDV.ini b/Data/Sys/GameSettings/GCOPDV.ini
similarity index 100%
rename from Data/User/GameConfig/GCOPDV.ini
rename to Data/Sys/GameSettings/GCOPDV.ini
diff --git a/Data/User/GameConfig/GCPE6S.ini b/Data/Sys/GameSettings/GCPE6S.ini
similarity index 100%
rename from Data/User/GameConfig/GCPE6S.ini
rename to Data/Sys/GameSettings/GCPE6S.ini
diff --git a/Data/User/GameConfig/GCPP6S.ini b/Data/Sys/GameSettings/GCPP6S.ini
similarity index 100%
rename from Data/User/GameConfig/GCPP6S.ini
rename to Data/Sys/GameSettings/GCPP6S.ini
diff --git a/Data/User/GameConfig/GCQE7D.ini b/Data/Sys/GameSettings/GCQE7D.ini
similarity index 100%
rename from Data/User/GameConfig/GCQE7D.ini
rename to Data/Sys/GameSettings/GCQE7D.ini
diff --git a/Data/User/GameConfig/GCQP7D.ini b/Data/Sys/GameSettings/GCQP7D.ini
similarity index 100%
rename from Data/User/GameConfig/GCQP7D.ini
rename to Data/Sys/GameSettings/GCQP7D.ini
diff --git a/Data/User/GameConfig/GCSEAF.ini b/Data/Sys/GameSettings/GCSEAF.ini
similarity index 100%
rename from Data/User/GameConfig/GCSEAF.ini
rename to Data/Sys/GameSettings/GCSEAF.ini
diff --git a/Data/User/GameConfig/GCTE51.ini b/Data/Sys/GameSettings/GCTE51.ini
similarity index 100%
rename from Data/User/GameConfig/GCTE51.ini
rename to Data/Sys/GameSettings/GCTE51.ini
diff --git a/Data/User/GameConfig/GCTP51.ini b/Data/Sys/GameSettings/GCTP51.ini
similarity index 100%
rename from Data/User/GameConfig/GCTP51.ini
rename to Data/Sys/GameSettings/GCTP51.ini
diff --git a/Data/User/GameConfig/GCVEEB.ini b/Data/Sys/GameSettings/GCVEEB.ini
similarity index 100%
rename from Data/User/GameConfig/GCVEEB.ini
rename to Data/Sys/GameSettings/GCVEEB.ini
diff --git a/Data/User/GameConfig/GCZE69.ini b/Data/Sys/GameSettings/GCZE69.ini
similarity index 100%
rename from Data/User/GameConfig/GCZE69.ini
rename to Data/Sys/GameSettings/GCZE69.ini
diff --git a/Data/User/GameConfig/GCZP69.ini b/Data/Sys/GameSettings/GCZP69.ini
similarity index 100%
rename from Data/User/GameConfig/GCZP69.ini
rename to Data/Sys/GameSettings/GCZP69.ini
diff --git a/Data/User/GameConfig/GD4E6S.ini b/Data/Sys/GameSettings/GD4E6S.ini
similarity index 100%
rename from Data/User/GameConfig/GD4E6S.ini
rename to Data/Sys/GameSettings/GD4E6S.ini
diff --git a/Data/User/GameConfig/GD6EB2.ini b/Data/Sys/GameSettings/GD6EB2.ini
similarity index 100%
rename from Data/User/GameConfig/GD6EB2.ini
rename to Data/Sys/GameSettings/GD6EB2.ini
diff --git a/Data/User/GameConfig/GD6P70.ini b/Data/Sys/GameSettings/GD6P70.ini
similarity index 100%
rename from Data/User/GameConfig/GD6P70.ini
rename to Data/Sys/GameSettings/GD6P70.ini
diff --git a/Data/User/GameConfig/GD7PB2.ini b/Data/Sys/GameSettings/GD7PB2.ini
similarity index 100%
rename from Data/User/GameConfig/GD7PB2.ini
rename to Data/Sys/GameSettings/GD7PB2.ini
diff --git a/Data/User/GameConfig/GD9E69.ini b/Data/Sys/GameSettings/GD9E69.ini
similarity index 100%
rename from Data/User/GameConfig/GD9E69.ini
rename to Data/Sys/GameSettings/GD9E69.ini
diff --git a/Data/User/GameConfig/GD9P69.ini b/Data/Sys/GameSettings/GD9P69.ini
similarity index 100%
rename from Data/User/GameConfig/GD9P69.ini
rename to Data/Sys/GameSettings/GD9P69.ini
diff --git a/Data/User/GameConfig/GDDE41.ini b/Data/Sys/GameSettings/GDDE41.ini
similarity index 100%
rename from Data/User/GameConfig/GDDE41.ini
rename to Data/Sys/GameSettings/GDDE41.ini
diff --git a/Data/User/GameConfig/GDEE71.ini b/Data/Sys/GameSettings/GDEE71.ini
similarity index 100%
rename from Data/User/GameConfig/GDEE71.ini
rename to Data/Sys/GameSettings/GDEE71.ini
diff --git a/Data/User/GameConfig/GDFE5D.ini b/Data/Sys/GameSettings/GDFE5D.ini
similarity index 100%
rename from Data/User/GameConfig/GDFE5D.ini
rename to Data/Sys/GameSettings/GDFE5D.ini
diff --git a/Data/User/GameConfig/GDFP5D.ini b/Data/Sys/GameSettings/GDFP5D.ini
similarity index 100%
rename from Data/User/GameConfig/GDFP5D.ini
rename to Data/Sys/GameSettings/GDFP5D.ini
diff --git a/Data/User/GameConfig/GDGE7H.ini b/Data/Sys/GameSettings/GDGE7H.ini
similarity index 100%
rename from Data/User/GameConfig/GDGE7H.ini
rename to Data/Sys/GameSettings/GDGE7H.ini
diff --git a/Data/User/GameConfig/GDGP78.ini b/Data/Sys/GameSettings/GDGP78.ini
similarity index 100%
rename from Data/User/GameConfig/GDGP78.ini
rename to Data/Sys/GameSettings/GDGP78.ini
diff --git a/Data/User/GameConfig/GDIE7D.ini b/Data/Sys/GameSettings/GDIE7D.ini
similarity index 100%
rename from Data/User/GameConfig/GDIE7D.ini
rename to Data/Sys/GameSettings/GDIE7D.ini
diff --git a/Data/User/GameConfig/GDIP7D.ini b/Data/Sys/GameSettings/GDIP7D.ini
similarity index 100%
rename from Data/User/GameConfig/GDIP7D.ini
rename to Data/Sys/GameSettings/GDIP7D.ini
diff --git a/Data/User/GameConfig/GDJEB2.ini b/Data/Sys/GameSettings/GDJEB2.ini
similarity index 100%
rename from Data/User/GameConfig/GDJEB2.ini
rename to Data/Sys/GameSettings/GDJEB2.ini
diff --git a/Data/User/GameConfig/GDKEA4.ini b/Data/Sys/GameSettings/GDKEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GDKEA4.ini
rename to Data/Sys/GameSettings/GDKEA4.ini
diff --git a/Data/User/GameConfig/GDLEA4.ini b/Data/Sys/GameSettings/GDLEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GDLEA4.ini
rename to Data/Sys/GameSettings/GDLEA4.ini
diff --git a/Data/User/GameConfig/GDME01.ini b/Data/Sys/GameSettings/GDME01.ini
similarity index 100%
rename from Data/User/GameConfig/GDME01.ini
rename to Data/Sys/GameSettings/GDME01.ini
diff --git a/Data/User/GameConfig/GDQP6S.ini b/Data/Sys/GameSettings/GDQP6S.ini
similarity index 100%
rename from Data/User/GameConfig/GDQP6S.ini
rename to Data/Sys/GameSettings/GDQP6S.ini
diff --git a/Data/User/GameConfig/GDREAF.ini b/Data/Sys/GameSettings/GDREAF.ini
similarity index 100%
rename from Data/User/GameConfig/GDREAF.ini
rename to Data/Sys/GameSettings/GDREAF.ini
diff --git a/Data/User/GameConfig/GDSE78.ini b/Data/Sys/GameSettings/GDSE78.ini
similarity index 100%
rename from Data/User/GameConfig/GDSE78.ini
rename to Data/Sys/GameSettings/GDSE78.ini
diff --git a/Data/User/GameConfig/GDSP78.ini b/Data/Sys/GameSettings/GDSP78.ini
similarity index 100%
rename from Data/User/GameConfig/GDSP78.ini
rename to Data/Sys/GameSettings/GDSP78.ini
diff --git a/Data/User/GameConfig/GDTE69.ini b/Data/Sys/GameSettings/GDTE69.ini
similarity index 100%
rename from Data/User/GameConfig/GDTE69.ini
rename to Data/Sys/GameSettings/GDTE69.ini
diff --git a/Data/User/GameConfig/GDVE6L.ini b/Data/Sys/GameSettings/GDVE6L.ini
similarity index 100%
rename from Data/User/GameConfig/GDVE6L.ini
rename to Data/Sys/GameSettings/GDVE6L.ini
diff --git a/Data/User/GameConfig/GDVP6L.ini b/Data/Sys/GameSettings/GDVP6L.ini
similarity index 100%
rename from Data/User/GameConfig/GDVP6L.ini
rename to Data/Sys/GameSettings/GDVP6L.ini
diff --git a/Data/User/GameConfig/GDWEA4.ini b/Data/Sys/GameSettings/GDWEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GDWEA4.ini
rename to Data/Sys/GameSettings/GDWEA4.ini
diff --git a/Data/User/GameConfig/GE4E7D.ini b/Data/Sys/GameSettings/GE4E7D.ini
similarity index 100%
rename from Data/User/GameConfig/GE4E7D.ini
rename to Data/Sys/GameSettings/GE4E7D.ini
diff --git a/Data/User/GameConfig/GE5EA4.ini b/Data/Sys/GameSettings/GE5EA4.ini
similarity index 100%
rename from Data/User/GameConfig/GE5EA4.ini
rename to Data/Sys/GameSettings/GE5EA4.ini
diff --git a/Data/User/GameConfig/GE9E5D.ini b/Data/Sys/GameSettings/GE9E5D.ini
similarity index 100%
rename from Data/User/GameConfig/GE9E5D.ini
rename to Data/Sys/GameSettings/GE9E5D.ini
diff --git a/Data/User/GameConfig/GEAE8P.ini b/Data/Sys/GameSettings/GEAE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GEAE8P.ini
rename to Data/Sys/GameSettings/GEAE8P.ini
diff --git a/Data/User/GameConfig/GEAP8P.ini b/Data/Sys/GameSettings/GEAP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GEAP8P.ini
rename to Data/Sys/GameSettings/GEAP8P.ini
diff --git a/Data/User/GameConfig/GEBEA4.ini b/Data/Sys/GameSettings/GEBEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GEBEA4.ini
rename to Data/Sys/GameSettings/GEBEA4.ini
diff --git a/Data/User/GameConfig/GEDE01.ini b/Data/Sys/GameSettings/GEDE01.ini
similarity index 100%
rename from Data/User/GameConfig/GEDE01.ini
rename to Data/Sys/GameSettings/GEDE01.ini
diff --git a/Data/User/GameConfig/GEDP01.ini b/Data/Sys/GameSettings/GEDP01.ini
similarity index 100%
rename from Data/User/GameConfig/GEDP01.ini
rename to Data/Sys/GameSettings/GEDP01.ini
diff --git a/Data/User/GameConfig/GEME7F.ini b/Data/Sys/GameSettings/GEME7F.ini
similarity index 100%
rename from Data/User/GameConfig/GEME7F.ini
rename to Data/Sys/GameSettings/GEME7F.ini
diff --git a/Data/User/GameConfig/GEND69.ini b/Data/Sys/GameSettings/GEND69.ini
similarity index 100%
rename from Data/User/GameConfig/GEND69.ini
rename to Data/Sys/GameSettings/GEND69.ini
diff --git a/Data/User/GameConfig/GENE69.ini b/Data/Sys/GameSettings/GENE69.ini
similarity index 100%
rename from Data/User/GameConfig/GENE69.ini
rename to Data/Sys/GameSettings/GENE69.ini
diff --git a/Data/User/GameConfig/GENP69.ini b/Data/Sys/GameSettings/GENP69.ini
similarity index 100%
rename from Data/User/GameConfig/GENP69.ini
rename to Data/Sys/GameSettings/GENP69.ini
diff --git a/Data/User/GameConfig/GENS69.ini b/Data/Sys/GameSettings/GENS69.ini
similarity index 100%
rename from Data/User/GameConfig/GENS69.ini
rename to Data/Sys/GameSettings/GENS69.ini
diff --git a/Data/User/GameConfig/GEOE08.ini b/Data/Sys/GameSettings/GEOE08.ini
similarity index 100%
rename from Data/User/GameConfig/GEOE08.ini
rename to Data/Sys/GameSettings/GEOE08.ini
diff --git a/Data/User/GameConfig/GEOP08.ini b/Data/Sys/GameSettings/GEOP08.ini
similarity index 100%
rename from Data/User/GameConfig/GEOP08.ini
rename to Data/Sys/GameSettings/GEOP08.ini
diff --git a/Data/User/GameConfig/GESEA4.ini b/Data/Sys/GameSettings/GESEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GESEA4.ini
rename to Data/Sys/GameSettings/GESEA4.ini
diff --git a/Data/User/GameConfig/GEWE41.ini b/Data/Sys/GameSettings/GEWE41.ini
similarity index 100%
rename from Data/User/GameConfig/GEWE41.ini
rename to Data/Sys/GameSettings/GEWE41.ini
diff --git a/Data/User/GameConfig/GEXE52.ini b/Data/Sys/GameSettings/GEXE52.ini
similarity index 100%
rename from Data/User/GameConfig/GEXE52.ini
rename to Data/Sys/GameSettings/GEXE52.ini
diff --git a/Data/User/GameConfig/GEYE69.ini b/Data/Sys/GameSettings/GEYE69.ini
similarity index 100%
rename from Data/User/GameConfig/GEYE69.ini
rename to Data/Sys/GameSettings/GEYE69.ini
diff --git a/Data/User/GameConfig/GEZE8P.ini b/Data/Sys/GameSettings/GEZE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GEZE8P.ini
rename to Data/Sys/GameSettings/GEZE8P.ini
diff --git a/Data/User/GameConfig/GEZP8P.ini b/Data/Sys/GameSettings/GEZP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GEZP8P.ini
rename to Data/Sys/GameSettings/GEZP8P.ini
diff --git a/Data/User/GameConfig/GF2E69.ini b/Data/Sys/GameSettings/GF2E69.ini
similarity index 100%
rename from Data/User/GameConfig/GF2E69.ini
rename to Data/Sys/GameSettings/GF2E69.ini
diff --git a/Data/User/GameConfig/GF4E52.ini b/Data/Sys/GameSettings/GF4E52.ini
similarity index 100%
rename from Data/User/GameConfig/GF4E52.ini
rename to Data/Sys/GameSettings/GF4E52.ini
diff --git a/Data/User/GameConfig/GF4F52.ini b/Data/Sys/GameSettings/GF4F52.ini
similarity index 100%
rename from Data/User/GameConfig/GF4F52.ini
rename to Data/Sys/GameSettings/GF4F52.ini
diff --git a/Data/User/GameConfig/GF4P52.ini b/Data/Sys/GameSettings/GF4P52.ini
similarity index 100%
rename from Data/User/GameConfig/GF4P52.ini
rename to Data/Sys/GameSettings/GF4P52.ini
diff --git a/Data/User/GameConfig/GF5E69.ini b/Data/Sys/GameSettings/GF5E69.ini
similarity index 100%
rename from Data/User/GameConfig/GF5E69.ini
rename to Data/Sys/GameSettings/GF5E69.ini
diff --git a/Data/User/GameConfig/GF6E69.ini b/Data/Sys/GameSettings/GF6E69.ini
similarity index 100%
rename from Data/User/GameConfig/GF6E69.ini
rename to Data/Sys/GameSettings/GF6E69.ini
diff --git a/Data/User/GameConfig/GF6F69.ini b/Data/Sys/GameSettings/GF6F69.ini
similarity index 100%
rename from Data/User/GameConfig/GF6F69.ini
rename to Data/Sys/GameSettings/GF6F69.ini
diff --git a/Data/User/GameConfig/GF7E01.ini b/Data/Sys/GameSettings/GF7E01.ini
similarity index 100%
rename from Data/User/GameConfig/GF7E01.ini
rename to Data/Sys/GameSettings/GF7E01.ini
diff --git a/Data/User/GameConfig/GF7P01.ini b/Data/Sys/GameSettings/GF7P01.ini
similarity index 100%
rename from Data/User/GameConfig/GF7P01.ini
rename to Data/Sys/GameSettings/GF7P01.ini
diff --git a/Data/User/GameConfig/GF8E69.ini b/Data/Sys/GameSettings/GF8E69.ini
similarity index 100%
rename from Data/User/GameConfig/GF8E69.ini
rename to Data/Sys/GameSettings/GF8E69.ini
diff --git a/Data/User/GameConfig/GF8P69.ini b/Data/Sys/GameSettings/GF8P69.ini
similarity index 100%
rename from Data/User/GameConfig/GF8P69.ini
rename to Data/Sys/GameSettings/GF8P69.ini
diff --git a/Data/User/GameConfig/GFAD69.ini b/Data/Sys/GameSettings/GFAD69.ini
similarity index 100%
rename from Data/User/GameConfig/GFAD69.ini
rename to Data/Sys/GameSettings/GFAD69.ini
diff --git a/Data/User/GameConfig/GFAE69.ini b/Data/Sys/GameSettings/GFAE69.ini
similarity index 100%
rename from Data/User/GameConfig/GFAE69.ini
rename to Data/Sys/GameSettings/GFAE69.ini
diff --git a/Data/User/GameConfig/GFAP69.ini b/Data/Sys/GameSettings/GFAP69.ini
similarity index 100%
rename from Data/User/GameConfig/GFAP69.ini
rename to Data/Sys/GameSettings/GFAP69.ini
diff --git a/Data/User/GameConfig/GFAS69.ini b/Data/Sys/GameSettings/GFAS69.ini
similarity index 100%
rename from Data/User/GameConfig/GFAS69.ini
rename to Data/Sys/GameSettings/GFAS69.ini
diff --git a/Data/User/GameConfig/GFBE5D.ini b/Data/Sys/GameSettings/GFBE5D.ini
similarity index 100%
rename from Data/User/GameConfig/GFBE5D.ini
rename to Data/Sys/GameSettings/GFBE5D.ini
diff --git a/Data/User/GameConfig/GFCP69.ini b/Data/Sys/GameSettings/GFCP69.ini
similarity index 100%
rename from Data/User/GameConfig/GFCP69.ini
rename to Data/Sys/GameSettings/GFCP69.ini
diff --git a/Data/User/GameConfig/GFDD69.ini b/Data/Sys/GameSettings/GFDD69.ini
similarity index 100%
rename from Data/User/GameConfig/GFDD69.ini
rename to Data/Sys/GameSettings/GFDD69.ini
diff --git a/Data/User/GameConfig/GFDE69.ini b/Data/Sys/GameSettings/GFDE69.ini
similarity index 100%
rename from Data/User/GameConfig/GFDE69.ini
rename to Data/Sys/GameSettings/GFDE69.ini
diff --git a/Data/User/GameConfig/GFEE01.ini b/Data/Sys/GameSettings/GFEE01.ini
similarity index 100%
rename from Data/User/GameConfig/GFEE01.ini
rename to Data/Sys/GameSettings/GFEE01.ini
diff --git a/Data/User/GameConfig/GFEJ01.ini b/Data/Sys/GameSettings/GFEJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GFEJ01.ini
rename to Data/Sys/GameSettings/GFEJ01.ini
diff --git a/Data/User/GameConfig/GFEP01.ini b/Data/Sys/GameSettings/GFEP01.ini
similarity index 100%
rename from Data/User/GameConfig/GFEP01.ini
rename to Data/Sys/GameSettings/GFEP01.ini
diff --git a/Data/User/GameConfig/GFFE5D.ini b/Data/Sys/GameSettings/GFFE5D.ini
similarity index 100%
rename from Data/User/GameConfig/GFFE5D.ini
rename to Data/Sys/GameSettings/GFFE5D.ini
diff --git a/Data/User/GameConfig/GFGEA4.ini b/Data/Sys/GameSettings/GFGEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GFGEA4.ini
rename to Data/Sys/GameSettings/GFGEA4.ini
diff --git a/Data/User/GameConfig/GFHP6V.ini b/Data/Sys/GameSettings/GFHP6V.ini
similarity index 100%
rename from Data/User/GameConfig/GFHP6V.ini
rename to Data/Sys/GameSettings/GFHP6V.ini
diff --git a/Data/User/GameConfig/GFKE69.ini b/Data/Sys/GameSettings/GFKE69.ini
similarity index 100%
rename from Data/User/GameConfig/GFKE69.ini
rename to Data/Sys/GameSettings/GFKE69.ini
diff --git a/Data/User/GameConfig/GFPEA4.ini b/Data/Sys/GameSettings/GFPEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GFPEA4.ini
rename to Data/Sys/GameSettings/GFPEA4.ini
diff --git a/Data/User/GameConfig/GFQEA4.ini b/Data/Sys/GameSettings/GFQEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GFQEA4.ini
rename to Data/Sys/GameSettings/GFQEA4.ini
diff --git a/Data/User/GameConfig/GFTE01.ini b/Data/Sys/GameSettings/GFTE01.ini
similarity index 100%
rename from Data/User/GameConfig/GFTE01.ini
rename to Data/Sys/GameSettings/GFTE01.ini
diff --git a/Data/User/GameConfig/GFTP01.ini b/Data/Sys/GameSettings/GFTP01.ini
similarity index 100%
rename from Data/User/GameConfig/GFTP01.ini
rename to Data/Sys/GameSettings/GFTP01.ini
diff --git a/Data/User/GameConfig/GFUE4Z.ini b/Data/Sys/GameSettings/GFUE4Z.ini
similarity index 100%
rename from Data/User/GameConfig/GFUE4Z.ini
rename to Data/Sys/GameSettings/GFUE4Z.ini
diff --git a/Data/User/GameConfig/GFYE69.ini b/Data/Sys/GameSettings/GFYE69.ini
similarity index 100%
rename from Data/User/GameConfig/GFYE69.ini
rename to Data/Sys/GameSettings/GFYE69.ini
diff --git a/Data/User/GameConfig/GFYP69.ini b/Data/Sys/GameSettings/GFYP69.ini
similarity index 100%
rename from Data/User/GameConfig/GFYP69.ini
rename to Data/Sys/GameSettings/GFYP69.ini
diff --git a/Data/User/GameConfig/GFZE01.ini b/Data/Sys/GameSettings/GFZE01.ini
similarity index 100%
rename from Data/User/GameConfig/GFZE01.ini
rename to Data/Sys/GameSettings/GFZE01.ini
diff --git a/Data/User/GameConfig/GFZJ01.ini b/Data/Sys/GameSettings/GFZJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GFZJ01.ini
rename to Data/Sys/GameSettings/GFZJ01.ini
diff --git a/Data/User/GameConfig/GFZP01.ini b/Data/Sys/GameSettings/GFZP01.ini
similarity index 100%
rename from Data/User/GameConfig/GFZP01.ini
rename to Data/Sys/GameSettings/GFZP01.ini
diff --git a/Data/User/GameConfig/GG4E08.ini b/Data/Sys/GameSettings/GG4E08.ini
similarity index 100%
rename from Data/User/GameConfig/GG4E08.ini
rename to Data/Sys/GameSettings/GG4E08.ini
diff --git a/Data/User/GameConfig/GG4P08.ini b/Data/Sys/GameSettings/GG4P08.ini
similarity index 100%
rename from Data/User/GameConfig/GG4P08.ini
rename to Data/Sys/GameSettings/GG4P08.ini
diff --git a/Data/User/GameConfig/GG5E52.ini b/Data/Sys/GameSettings/GG5E52.ini
similarity index 100%
rename from Data/User/GameConfig/GG5E52.ini
rename to Data/Sys/GameSettings/GG5E52.ini
diff --git a/Data/User/GameConfig/GGAJB2.ini b/Data/Sys/GameSettings/GGAJB2.ini
similarity index 100%
rename from Data/User/GameConfig/GGAJB2.ini
rename to Data/Sys/GameSettings/GGAJB2.ini
diff --git a/Data/User/GameConfig/GGCE0A.ini b/Data/Sys/GameSettings/GGCE0A.ini
similarity index 100%
rename from Data/User/GameConfig/GGCE0A.ini
rename to Data/Sys/GameSettings/GGCE0A.ini
diff --git a/Data/User/GameConfig/GGCOSD.ini b/Data/Sys/GameSettings/GGCOSD.ini
similarity index 100%
rename from Data/User/GameConfig/GGCOSD.ini
rename to Data/Sys/GameSettings/GGCOSD.ini
diff --git a/Data/User/GameConfig/GGEE41.ini b/Data/Sys/GameSettings/GGEE41.ini
similarity index 100%
rename from Data/User/GameConfig/GGEE41.ini
rename to Data/Sys/GameSettings/GGEE41.ini
diff --git a/Data/User/GameConfig/GGEP41.ini b/Data/Sys/GameSettings/GGEP41.ini
similarity index 100%
rename from Data/User/GameConfig/GGEP41.ini
rename to Data/Sys/GameSettings/GGEP41.ini
diff --git a/Data/User/GameConfig/GGEY41.ini b/Data/Sys/GameSettings/GGEY41.ini
similarity index 100%
rename from Data/User/GameConfig/GGEY41.ini
rename to Data/Sys/GameSettings/GGEY41.ini
diff --git a/Data/User/GameConfig/GGME00.ini b/Data/Sys/GameSettings/GGME00.ini
similarity index 100%
rename from Data/User/GameConfig/GGME00.ini
rename to Data/Sys/GameSettings/GGME00.ini
diff --git a/Data/User/GameConfig/GGPJB2.ini b/Data/Sys/GameSettings/GGPJB2.ini
similarity index 100%
rename from Data/User/GameConfig/GGPJB2.ini
rename to Data/Sys/GameSettings/GGPJB2.ini
diff --git a/Data/User/GameConfig/GGRE41.ini b/Data/Sys/GameSettings/GGRE41.ini
similarity index 100%
rename from Data/User/GameConfig/GGRE41.ini
rename to Data/Sys/GameSettings/GGRE41.ini
diff --git a/Data/User/GameConfig/GGSEA4.ini b/Data/Sys/GameSettings/GGSEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GGSEA4.ini
rename to Data/Sys/GameSettings/GGSEA4.ini
diff --git a/Data/User/GameConfig/GGSJA4.ini b/Data/Sys/GameSettings/GGSJA4.ini
similarity index 100%
rename from Data/User/GameConfig/GGSJA4.ini
rename to Data/Sys/GameSettings/GGSJA4.ini
diff --git a/Data/User/GameConfig/GGSPA4.ini b/Data/Sys/GameSettings/GGSPA4.ini
similarity index 100%
rename from Data/User/GameConfig/GGSPA4.ini
rename to Data/Sys/GameSettings/GGSPA4.ini
diff --git a/Data/User/GameConfig/GGTE01.ini b/Data/Sys/GameSettings/GGTE01.ini
similarity index 100%
rename from Data/User/GameConfig/GGTE01.ini
rename to Data/Sys/GameSettings/GGTE01.ini
diff --git a/Data/User/GameConfig/GGTP01.ini b/Data/Sys/GameSettings/GGTP01.ini
similarity index 100%
rename from Data/User/GameConfig/GGTP01.ini
rename to Data/Sys/GameSettings/GGTP01.ini
diff --git a/Data/User/GameConfig/GGYE41.ini b/Data/Sys/GameSettings/GGYE41.ini
similarity index 100%
rename from Data/User/GameConfig/GGYE41.ini
rename to Data/Sys/GameSettings/GGYE41.ini
diff --git a/Data/User/GameConfig/GGYP41.ini b/Data/Sys/GameSettings/GGYP41.ini
similarity index 100%
rename from Data/User/GameConfig/GGYP41.ini
rename to Data/Sys/GameSettings/GGYP41.ini
diff --git a/Data/User/GameConfig/GGZE52.ini b/Data/Sys/GameSettings/GGZE52.ini
similarity index 100%
rename from Data/User/GameConfig/GGZE52.ini
rename to Data/Sys/GameSettings/GGZE52.ini
diff --git a/Data/User/GameConfig/GGZX52.ini b/Data/Sys/GameSettings/GGZX52.ini
similarity index 100%
rename from Data/User/GameConfig/GGZX52.ini
rename to Data/Sys/GameSettings/GGZX52.ini
diff --git a/Data/User/GameConfig/GH2E69.ini b/Data/Sys/GameSettings/GH2E69.ini
similarity index 100%
rename from Data/User/GameConfig/GH2E69.ini
rename to Data/Sys/GameSettings/GH2E69.ini
diff --git a/Data/User/GameConfig/GH2P69.ini b/Data/Sys/GameSettings/GH2P69.ini
similarity index 100%
rename from Data/User/GameConfig/GH2P69.ini
rename to Data/Sys/GameSettings/GH2P69.ini
diff --git a/Data/User/GameConfig/GH4D69.ini b/Data/Sys/GameSettings/GH4D69.ini
similarity index 100%
rename from Data/User/GameConfig/GH4D69.ini
rename to Data/Sys/GameSettings/GH4D69.ini
diff --git a/Data/User/GameConfig/GH4E69.ini b/Data/Sys/GameSettings/GH4E69.ini
similarity index 100%
rename from Data/User/GameConfig/GH4E69.ini
rename to Data/Sys/GameSettings/GH4E69.ini
diff --git a/Data/User/GameConfig/GH4F69.ini b/Data/Sys/GameSettings/GH4F69.ini
similarity index 100%
rename from Data/User/GameConfig/GH4F69.ini
rename to Data/Sys/GameSettings/GH4F69.ini
diff --git a/Data/User/GameConfig/GH4H69.ini b/Data/Sys/GameSettings/GH4H69.ini
similarity index 100%
rename from Data/User/GameConfig/GH4H69.ini
rename to Data/Sys/GameSettings/GH4H69.ini
diff --git a/Data/User/GameConfig/GH4I69.ini b/Data/Sys/GameSettings/GH4I69.ini
similarity index 100%
rename from Data/User/GameConfig/GH4I69.ini
rename to Data/Sys/GameSettings/GH4I69.ini
diff --git a/Data/User/GameConfig/GH4J69.ini b/Data/Sys/GameSettings/GH4J69.ini
similarity index 100%
rename from Data/User/GameConfig/GH4J69.ini
rename to Data/Sys/GameSettings/GH4J69.ini
diff --git a/Data/User/GameConfig/GH4M69.ini b/Data/Sys/GameSettings/GH4M69.ini
similarity index 100%
rename from Data/User/GameConfig/GH4M69.ini
rename to Data/Sys/GameSettings/GH4M69.ini
diff --git a/Data/User/GameConfig/GH4P69.ini b/Data/Sys/GameSettings/GH4P69.ini
similarity index 100%
rename from Data/User/GameConfig/GH4P69.ini
rename to Data/Sys/GameSettings/GH4P69.ini
diff --git a/Data/User/GameConfig/GH4S69.ini b/Data/Sys/GameSettings/GH4S69.ini
similarity index 100%
rename from Data/User/GameConfig/GH4S69.ini
rename to Data/Sys/GameSettings/GH4S69.ini
diff --git a/Data/User/GameConfig/GH5D52.ini b/Data/Sys/GameSettings/GH5D52.ini
similarity index 100%
rename from Data/User/GameConfig/GH5D52.ini
rename to Data/Sys/GameSettings/GH5D52.ini
diff --git a/Data/User/GameConfig/GH5E52.ini b/Data/Sys/GameSettings/GH5E52.ini
similarity index 100%
rename from Data/User/GameConfig/GH5E52.ini
rename to Data/Sys/GameSettings/GH5E52.ini
diff --git a/Data/User/GameConfig/GH5F52.ini b/Data/Sys/GameSettings/GH5F52.ini
similarity index 100%
rename from Data/User/GameConfig/GH5F52.ini
rename to Data/Sys/GameSettings/GH5F52.ini
diff --git a/Data/User/GameConfig/GH5P52.ini b/Data/Sys/GameSettings/GH5P52.ini
similarity index 100%
rename from Data/User/GameConfig/GH5P52.ini
rename to Data/Sys/GameSettings/GH5P52.ini
diff --git a/Data/User/GameConfig/GH6EAF.ini b/Data/Sys/GameSettings/GH6EAF.ini
similarity index 100%
rename from Data/User/GameConfig/GH6EAF.ini
rename to Data/Sys/GameSettings/GH6EAF.ini
diff --git a/Data/User/GameConfig/GH7E5D.ini b/Data/Sys/GameSettings/GH7E5D.ini
similarity index 100%
rename from Data/User/GameConfig/GH7E5D.ini
rename to Data/Sys/GameSettings/GH7E5D.ini
diff --git a/Data/User/GameConfig/GHAE08.ini b/Data/Sys/GameSettings/GHAE08.ini
similarity index 100%
rename from Data/User/GameConfig/GHAE08.ini
rename to Data/Sys/GameSettings/GHAE08.ini
diff --git a/Data/User/GameConfig/GHAP08.ini b/Data/Sys/GameSettings/GHAP08.ini
similarity index 100%
rename from Data/User/GameConfig/GHAP08.ini
rename to Data/Sys/GameSettings/GHAP08.ini
diff --git a/Data/User/GameConfig/GHBE7D.ini b/Data/Sys/GameSettings/GHBE7D.ini
similarity index 100%
rename from Data/User/GameConfig/GHBE7D.ini
rename to Data/Sys/GameSettings/GHBE7D.ini
diff --git a/Data/User/GameConfig/GHBP7D.ini b/Data/Sys/GameSettings/GHBP7D.ini
similarity index 100%
rename from Data/User/GameConfig/GHBP7D.ini
rename to Data/Sys/GameSettings/GHBP7D.ini
diff --git a/Data/User/GameConfig/GHCE4Q.ini b/Data/Sys/GameSettings/GHCE4Q.ini
similarity index 100%
rename from Data/User/GameConfig/GHCE4Q.ini
rename to Data/Sys/GameSettings/GHCE4Q.ini
diff --git a/Data/User/GameConfig/GHCF4Q.ini b/Data/Sys/GameSettings/GHCF4Q.ini
similarity index 100%
rename from Data/User/GameConfig/GHCF4Q.ini
rename to Data/Sys/GameSettings/GHCF4Q.ini
diff --git a/Data/User/GameConfig/GHGEEB.ini b/Data/Sys/GameSettings/GHGEEB.ini
similarity index 100%
rename from Data/User/GameConfig/GHGEEB.ini
rename to Data/Sys/GameSettings/GHGEEB.ini
diff --git a/Data/User/GameConfig/GHKE7D.ini b/Data/Sys/GameSettings/GHKE7D.ini
similarity index 100%
rename from Data/User/GameConfig/GHKE7D.ini
rename to Data/Sys/GameSettings/GHKE7D.ini
diff --git a/Data/User/GameConfig/GHLE69.ini b/Data/Sys/GameSettings/GHLE69.ini
similarity index 100%
rename from Data/User/GameConfig/GHLE69.ini
rename to Data/Sys/GameSettings/GHLE69.ini
diff --git a/Data/User/GameConfig/GHLJ69.ini b/Data/Sys/GameSettings/GHLJ69.ini
similarity index 100%
rename from Data/User/GameConfig/GHLJ69.ini
rename to Data/Sys/GameSettings/GHLJ69.ini
diff --git a/Data/User/GameConfig/GHLP69.ini b/Data/Sys/GameSettings/GHLP69.ini
similarity index 100%
rename from Data/User/GameConfig/GHLP69.ini
rename to Data/Sys/GameSettings/GHLP69.ini
diff --git a/Data/User/GameConfig/GHLX69.ini b/Data/Sys/GameSettings/GHLX69.ini
similarity index 100%
rename from Data/User/GameConfig/GHLX69.ini
rename to Data/Sys/GameSettings/GHLX69.ini
diff --git a/Data/User/GameConfig/GHLY69.ini b/Data/Sys/GameSettings/GHLY69.ini
similarity index 100%
rename from Data/User/GameConfig/GHLY69.ini
rename to Data/Sys/GameSettings/GHLY69.ini
diff --git a/Data/User/GameConfig/GHLZ69.ini b/Data/Sys/GameSettings/GHLZ69.ini
similarity index 100%
rename from Data/User/GameConfig/GHLZ69.ini
rename to Data/Sys/GameSettings/GHLZ69.ini
diff --git a/Data/User/GameConfig/GHMD4F.ini b/Data/Sys/GameSettings/GHMD4F.ini
similarity index 100%
rename from Data/User/GameConfig/GHMD4F.ini
rename to Data/Sys/GameSettings/GHMD4F.ini
diff --git a/Data/User/GameConfig/GHME4F.ini b/Data/Sys/GameSettings/GHME4F.ini
similarity index 100%
rename from Data/User/GameConfig/GHME4F.ini
rename to Data/Sys/GameSettings/GHME4F.ini
diff --git a/Data/User/GameConfig/GHMF4F.ini b/Data/Sys/GameSettings/GHMF4F.ini
similarity index 100%
rename from Data/User/GameConfig/GHMF4F.ini
rename to Data/Sys/GameSettings/GHMF4F.ini
diff --git a/Data/User/GameConfig/GHMP4F.ini b/Data/Sys/GameSettings/GHMP4F.ini
similarity index 100%
rename from Data/User/GameConfig/GHMP4F.ini
rename to Data/Sys/GameSettings/GHMP4F.ini
diff --git a/Data/User/GameConfig/GHNE71.ini b/Data/Sys/GameSettings/GHNE71.ini
similarity index 100%
rename from Data/User/GameConfig/GHNE71.ini
rename to Data/Sys/GameSettings/GHNE71.ini
diff --git a/Data/User/GameConfig/GHQE7D.ini b/Data/Sys/GameSettings/GHQE7D.ini
similarity index 100%
rename from Data/User/GameConfig/GHQE7D.ini
rename to Data/Sys/GameSettings/GHQE7D.ini
diff --git a/Data/User/GameConfig/GHQP7D.ini b/Data/Sys/GameSettings/GHQP7D.ini
similarity index 100%
rename from Data/User/GameConfig/GHQP7D.ini
rename to Data/Sys/GameSettings/GHQP7D.ini
diff --git a/Data/User/GameConfig/GHRE78.ini b/Data/Sys/GameSettings/GHRE78.ini
similarity index 100%
rename from Data/User/GameConfig/GHRE78.ini
rename to Data/Sys/GameSettings/GHRE78.ini
diff --git a/Data/User/GameConfig/GHSE69.ini b/Data/Sys/GameSettings/GHSE69.ini
similarity index 100%
rename from Data/User/GameConfig/GHSE69.ini
rename to Data/Sys/GameSettings/GHSE69.ini
diff --git a/Data/User/GameConfig/GHSJ69.ini b/Data/Sys/GameSettings/GHSJ69.ini
similarity index 100%
rename from Data/User/GameConfig/GHSJ69.ini
rename to Data/Sys/GameSettings/GHSJ69.ini
diff --git a/Data/User/GameConfig/GHSP69.ini b/Data/Sys/GameSettings/GHSP69.ini
similarity index 100%
rename from Data/User/GameConfig/GHSP69.ini
rename to Data/Sys/GameSettings/GHSP69.ini
diff --git a/Data/User/GameConfig/GHSX69.ini b/Data/Sys/GameSettings/GHSX69.ini
similarity index 100%
rename from Data/User/GameConfig/GHSX69.ini
rename to Data/Sys/GameSettings/GHSX69.ini
diff --git a/Data/User/GameConfig/GHSY69.ini b/Data/Sys/GameSettings/GHSY69.ini
similarity index 100%
rename from Data/User/GameConfig/GHSY69.ini
rename to Data/Sys/GameSettings/GHSY69.ini
diff --git a/Data/User/GameConfig/GHUE7D.ini b/Data/Sys/GameSettings/GHUE7D.ini
similarity index 100%
rename from Data/User/GameConfig/GHUE7D.ini
rename to Data/Sys/GameSettings/GHUE7D.ini
diff --git a/Data/User/GameConfig/GHVE08.ini b/Data/Sys/GameSettings/GHVE08.ini
similarity index 100%
rename from Data/User/GameConfig/GHVE08.ini
rename to Data/Sys/GameSettings/GHVE08.ini
diff --git a/Data/User/GameConfig/GHWE78.ini b/Data/Sys/GameSettings/GHWE78.ini
similarity index 100%
rename from Data/User/GameConfig/GHWE78.ini
rename to Data/Sys/GameSettings/GHWE78.ini
diff --git a/Data/User/GameConfig/GHYE6S.ini b/Data/Sys/GameSettings/GHYE6S.ini
similarity index 100%
rename from Data/User/GameConfig/GHYE6S.ini
rename to Data/Sys/GameSettings/GHYE6S.ini
diff --git a/Data/User/GameConfig/GIAE7D.ini b/Data/Sys/GameSettings/GIAE7D.ini
similarity index 100%
rename from Data/User/GameConfig/GIAE7D.ini
rename to Data/Sys/GameSettings/GIAE7D.ini
diff --git a/Data/User/GameConfig/GIBE4F.ini b/Data/Sys/GameSettings/GIBE4F.ini
similarity index 100%
rename from Data/User/GameConfig/GIBE4F.ini
rename to Data/Sys/GameSettings/GIBE4F.ini
diff --git a/Data/User/GameConfig/GICE78.ini b/Data/Sys/GameSettings/GICE78.ini
similarity index 100%
rename from Data/User/GameConfig/GICE78.ini
rename to Data/Sys/GameSettings/GICE78.ini
diff --git a/Data/User/GameConfig/GIGJ8P.ini b/Data/Sys/GameSettings/GIGJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/GIGJ8P.ini
rename to Data/Sys/GameSettings/GIGJ8P.ini
diff --git a/Data/User/GameConfig/GIKE70.ini b/Data/Sys/GameSettings/GIKE70.ini
similarity index 100%
rename from Data/User/GameConfig/GIKE70.ini
rename to Data/Sys/GameSettings/GIKE70.ini
diff --git a/Data/User/GameConfig/GIKP70.ini b/Data/Sys/GameSettings/GIKP70.ini
similarity index 100%
rename from Data/User/GameConfig/GIKP70.ini
rename to Data/Sys/GameSettings/GIKP70.ini
diff --git a/Data/User/GameConfig/GILE51.ini b/Data/Sys/GameSettings/GILE51.ini
similarity index 100%
rename from Data/User/GameConfig/GILE51.ini
rename to Data/Sys/GameSettings/GILE51.ini
diff --git a/Data/User/GameConfig/GILP51.ini b/Data/Sys/GameSettings/GILP51.ini
similarity index 100%
rename from Data/User/GameConfig/GILP51.ini
rename to Data/Sys/GameSettings/GILP51.ini
diff --git a/Data/User/GameConfig/GINE69.ini b/Data/Sys/GameSettings/GINE69.ini
similarity index 100%
rename from Data/User/GameConfig/GINE69.ini
rename to Data/Sys/GameSettings/GINE69.ini
diff --git a/Data/User/GameConfig/GINX69.ini b/Data/Sys/GameSettings/GINX69.ini
similarity index 100%
rename from Data/User/GameConfig/GINX69.ini
rename to Data/Sys/GameSettings/GINX69.ini
diff --git a/Data/User/GameConfig/GIPEAF.ini b/Data/Sys/GameSettings/GIPEAF.ini
similarity index 100%
rename from Data/User/GameConfig/GIPEAF.ini
rename to Data/Sys/GameSettings/GIPEAF.ini
diff --git a/Data/User/GameConfig/GIQE78.ini b/Data/Sys/GameSettings/GIQE78.ini
similarity index 100%
rename from Data/User/GameConfig/GIQE78.ini
rename to Data/Sys/GameSettings/GIQE78.ini
diff --git a/Data/User/GameConfig/GISE36.ini b/Data/Sys/GameSettings/GISE36.ini
similarity index 100%
rename from Data/User/GameConfig/GISE36.ini
rename to Data/Sys/GameSettings/GISE36.ini
diff --git a/Data/User/GameConfig/GISP36.ini b/Data/Sys/GameSettings/GISP36.ini
similarity index 100%
rename from Data/User/GameConfig/GISP36.ini
rename to Data/Sys/GameSettings/GISP36.ini
diff --git a/Data/User/GameConfig/GITE01.ini b/Data/Sys/GameSettings/GITE01.ini
similarity index 100%
rename from Data/User/GameConfig/GITE01.ini
rename to Data/Sys/GameSettings/GITE01.ini
diff --git a/Data/User/GameConfig/GITP01.ini b/Data/Sys/GameSettings/GITP01.ini
similarity index 100%
rename from Data/User/GameConfig/GITP01.ini
rename to Data/Sys/GameSettings/GITP01.ini
diff --git a/Data/User/GameConfig/GIVE4Z.ini b/Data/Sys/GameSettings/GIVE4Z.ini
similarity index 100%
rename from Data/User/GameConfig/GIVE4Z.ini
rename to Data/Sys/GameSettings/GIVE4Z.ini
diff --git a/Data/User/GameConfig/GIZE52.ini b/Data/Sys/GameSettings/GIZE52.ini
similarity index 100%
rename from Data/User/GameConfig/GIZE52.ini
rename to Data/Sys/GameSettings/GIZE52.ini
diff --git a/Data/User/GameConfig/GJ3PA4.ini b/Data/Sys/GameSettings/GJ3PA4.ini
similarity index 100%
rename from Data/User/GameConfig/GJ3PA4.ini
rename to Data/Sys/GameSettings/GJ3PA4.ini
diff --git a/Data/User/GameConfig/GJBE5G.ini b/Data/Sys/GameSettings/GJBE5G.ini
similarity index 100%
rename from Data/User/GameConfig/GJBE5G.ini
rename to Data/Sys/GameSettings/GJBE5G.ini
diff --git a/Data/User/GameConfig/GJCE8P.ini b/Data/Sys/GameSettings/GJCE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GJCE8P.ini
rename to Data/Sys/GameSettings/GJCE8P.ini
diff --git a/Data/User/GameConfig/GJDE5S.ini b/Data/Sys/GameSettings/GJDE5S.ini
similarity index 100%
rename from Data/User/GameConfig/GJDE5S.ini
rename to Data/Sys/GameSettings/GJDE5S.ini
diff --git a/Data/User/GameConfig/GJKE52.ini b/Data/Sys/GameSettings/GJKE52.ini
similarity index 100%
rename from Data/User/GameConfig/GJKE52.ini
rename to Data/Sys/GameSettings/GJKE52.ini
diff --git a/Data/User/GameConfig/GJNE78.ini b/Data/Sys/GameSettings/GJNE78.ini
similarity index 100%
rename from Data/User/GameConfig/GJNE78.ini
rename to Data/Sys/GameSettings/GJNE78.ini
diff --git a/Data/User/GameConfig/GJSJ18.ini b/Data/Sys/GameSettings/GJSJ18.ini
similarity index 100%
rename from Data/User/GameConfig/GJSJ18.ini
rename to Data/Sys/GameSettings/GJSJ18.ini
diff --git a/Data/User/GameConfig/GJUD78.ini b/Data/Sys/GameSettings/GJUD78.ini
similarity index 100%
rename from Data/User/GameConfig/GJUD78.ini
rename to Data/Sys/GameSettings/GJUD78.ini
diff --git a/Data/User/GameConfig/GJUE78.ini b/Data/Sys/GameSettings/GJUE78.ini
similarity index 100%
rename from Data/User/GameConfig/GJUE78.ini
rename to Data/Sys/GameSettings/GJUE78.ini
diff --git a/Data/User/GameConfig/GJUF78.ini b/Data/Sys/GameSettings/GJUF78.ini
similarity index 100%
rename from Data/User/GameConfig/GJUF78.ini
rename to Data/Sys/GameSettings/GJUF78.ini
diff --git a/Data/User/GameConfig/GJWE78.ini b/Data/Sys/GameSettings/GJWE78.ini
similarity index 100%
rename from Data/User/GameConfig/GJWE78.ini
rename to Data/Sys/GameSettings/GJWE78.ini
diff --git a/Data/User/GameConfig/GJXE51.ini b/Data/Sys/GameSettings/GJXE51.ini
similarity index 100%
rename from Data/User/GameConfig/GJXE51.ini
rename to Data/Sys/GameSettings/GJXE51.ini
diff --git a/Data/User/GameConfig/GJXP51.ini b/Data/Sys/GameSettings/GJXP51.ini
similarity index 100%
rename from Data/User/GameConfig/GJXP51.ini
rename to Data/Sys/GameSettings/GJXP51.ini
diff --git a/Data/User/GameConfig/GJZE52.ini b/Data/Sys/GameSettings/GJZE52.ini
similarity index 100%
rename from Data/User/GameConfig/GJZE52.ini
rename to Data/Sys/GameSettings/GJZE52.ini
diff --git a/Data/User/GameConfig/GK2D52.ini b/Data/Sys/GameSettings/GK2D52.ini
similarity index 100%
rename from Data/User/GameConfig/GK2D52.ini
rename to Data/Sys/GameSettings/GK2D52.ini
diff --git a/Data/User/GameConfig/GK2E52.ini b/Data/Sys/GameSettings/GK2E52.ini
similarity index 100%
rename from Data/User/GameConfig/GK2E52.ini
rename to Data/Sys/GameSettings/GK2E52.ini
diff --git a/Data/User/GameConfig/GK2F52.ini b/Data/Sys/GameSettings/GK2F52.ini
similarity index 100%
rename from Data/User/GameConfig/GK2F52.ini
rename to Data/Sys/GameSettings/GK2F52.ini
diff --git a/Data/User/GameConfig/GK2I52.ini b/Data/Sys/GameSettings/GK2I52.ini
similarity index 100%
rename from Data/User/GameConfig/GK2I52.ini
rename to Data/Sys/GameSettings/GK2I52.ini
diff --git a/Data/User/GameConfig/GK2P52.ini b/Data/Sys/GameSettings/GK2P52.ini
similarity index 100%
rename from Data/User/GameConfig/GK2P52.ini
rename to Data/Sys/GameSettings/GK2P52.ini
diff --git a/Data/User/GameConfig/GK4E01.ini b/Data/Sys/GameSettings/GK4E01.ini
similarity index 100%
rename from Data/User/GameConfig/GK4E01.ini
rename to Data/Sys/GameSettings/GK4E01.ini
diff --git a/Data/User/GameConfig/GK5E78.ini b/Data/Sys/GameSettings/GK5E78.ini
similarity index 100%
rename from Data/User/GameConfig/GK5E78.ini
rename to Data/Sys/GameSettings/GK5E78.ini
diff --git a/Data/User/GameConfig/GK5X78.ini b/Data/Sys/GameSettings/GK5X78.ini
similarity index 100%
rename from Data/User/GameConfig/GK5X78.ini
rename to Data/Sys/GameSettings/GK5X78.ini
diff --git a/Data/User/GameConfig/GK6JA4.ini b/Data/Sys/GameSettings/GK6JA4.ini
similarity index 100%
rename from Data/User/GameConfig/GK6JA4.ini
rename to Data/Sys/GameSettings/GK6JA4.ini
diff --git a/Data/User/GameConfig/GK7E08.ini b/Data/Sys/GameSettings/GK7E08.ini
similarity index 100%
rename from Data/User/GameConfig/GK7E08.ini
rename to Data/Sys/GameSettings/GK7E08.ini
diff --git a/Data/User/GameConfig/GK7P08.ini b/Data/Sys/GameSettings/GK7P08.ini
similarity index 100%
rename from Data/User/GameConfig/GK7P08.ini
rename to Data/Sys/GameSettings/GK7P08.ini
diff --git a/Data/User/GameConfig/GK9EA4.ini b/Data/Sys/GameSettings/GK9EA4.ini
similarity index 100%
rename from Data/User/GameConfig/GK9EA4.ini
rename to Data/Sys/GameSettings/GK9EA4.ini
diff --git a/Data/User/GameConfig/GKAE8P.ini b/Data/Sys/GameSettings/GKAE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GKAE8P.ini
rename to Data/Sys/GameSettings/GKAE8P.ini
diff --git a/Data/User/GameConfig/GKBEAF.ini b/Data/Sys/GameSettings/GKBEAF.ini
similarity index 100%
rename from Data/User/GameConfig/GKBEAF.ini
rename to Data/Sys/GameSettings/GKBEAF.ini
diff --git a/Data/User/GameConfig/GKBPAF.ini b/Data/Sys/GameSettings/GKBPAF.ini
similarity index 100%
rename from Data/User/GameConfig/GKBPAF.ini
rename to Data/Sys/GameSettings/GKBPAF.ini
diff --git a/Data/User/GameConfig/GKDP01.ini b/Data/Sys/GameSettings/GKDP01.ini
similarity index 100%
rename from Data/User/GameConfig/GKDP01.ini
rename to Data/Sys/GameSettings/GKDP01.ini
diff --git a/Data/User/GameConfig/GKFEGG.ini b/Data/Sys/GameSettings/GKFEGG.ini
similarity index 100%
rename from Data/User/GameConfig/GKFEGG.ini
rename to Data/Sys/GameSettings/GKFEGG.ini
diff --git a/Data/User/GameConfig/GKGE01.ini b/Data/Sys/GameSettings/GKGE01.ini
similarity index 100%
rename from Data/User/GameConfig/GKGE01.ini
rename to Data/Sys/GameSettings/GKGE01.ini
diff --git a/Data/User/GameConfig/GKHEA4.ini b/Data/Sys/GameSettings/GKHEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GKHEA4.ini
rename to Data/Sys/GameSettings/GKHEA4.ini
diff --git a/Data/User/GameConfig/GKHPA4.ini b/Data/Sys/GameSettings/GKHPA4.ini
similarity index 100%
rename from Data/User/GameConfig/GKHPA4.ini
rename to Data/Sys/GameSettings/GKHPA4.ini
diff --git a/Data/User/GameConfig/GKJE78.ini b/Data/Sys/GameSettings/GKJE78.ini
similarity index 100%
rename from Data/User/GameConfig/GKJE78.ini
rename to Data/Sys/GameSettings/GKJE78.ini
diff --git a/Data/User/GameConfig/GKKE69.ini b/Data/Sys/GameSettings/GKKE69.ini
similarity index 100%
rename from Data/User/GameConfig/GKKE69.ini
rename to Data/Sys/GameSettings/GKKE69.ini
diff --git a/Data/User/GameConfig/GKLD69.ini b/Data/Sys/GameSettings/GKLD69.ini
similarity index 100%
rename from Data/User/GameConfig/GKLD69.ini
rename to Data/Sys/GameSettings/GKLD69.ini
diff --git a/Data/User/GameConfig/GKLE69.ini b/Data/Sys/GameSettings/GKLE69.ini
similarity index 100%
rename from Data/User/GameConfig/GKLE69.ini
rename to Data/Sys/GameSettings/GKLE69.ini
diff --git a/Data/User/GameConfig/GKLF69.ini b/Data/Sys/GameSettings/GKLF69.ini
similarity index 100%
rename from Data/User/GameConfig/GKLF69.ini
rename to Data/Sys/GameSettings/GKLF69.ini
diff --git a/Data/User/GameConfig/GKLI69.ini b/Data/Sys/GameSettings/GKLI69.ini
similarity index 100%
rename from Data/User/GameConfig/GKLI69.ini
rename to Data/Sys/GameSettings/GKLI69.ini
diff --git a/Data/User/GameConfig/GKLJ69.ini b/Data/Sys/GameSettings/GKLJ69.ini
similarity index 100%
rename from Data/User/GameConfig/GKLJ69.ini
rename to Data/Sys/GameSettings/GKLJ69.ini
diff --git a/Data/User/GameConfig/GKLP69.ini b/Data/Sys/GameSettings/GKLP69.ini
similarity index 100%
rename from Data/User/GameConfig/GKLP69.ini
rename to Data/Sys/GameSettings/GKLP69.ini
diff --git a/Data/User/GameConfig/GKLS69.ini b/Data/Sys/GameSettings/GKLS69.ini
similarity index 100%
rename from Data/User/GameConfig/GKLS69.ini
rename to Data/Sys/GameSettings/GKLS69.ini
diff --git a/Data/User/GameConfig/GKME41.ini b/Data/Sys/GameSettings/GKME41.ini
similarity index 100%
rename from Data/User/GameConfig/GKME41.ini
rename to Data/Sys/GameSettings/GKME41.ini
diff --git a/Data/User/GameConfig/GKMP41.ini b/Data/Sys/GameSettings/GKMP41.ini
similarity index 100%
rename from Data/User/GameConfig/GKMP41.ini
rename to Data/Sys/GameSettings/GKMP41.ini
diff --git a/Data/User/GameConfig/GKNEB2.ini b/Data/Sys/GameSettings/GKNEB2.ini
similarity index 100%
rename from Data/User/GameConfig/GKNEB2.ini
rename to Data/Sys/GameSettings/GKNEB2.ini
diff --git a/Data/User/GameConfig/GKOE70.ini b/Data/Sys/GameSettings/GKOE70.ini
similarity index 100%
rename from Data/User/GameConfig/GKOE70.ini
rename to Data/Sys/GameSettings/GKOE70.ini
diff --git a/Data/User/GameConfig/GKOP6V.ini b/Data/Sys/GameSettings/GKOP6V.ini
similarity index 100%
rename from Data/User/GameConfig/GKOP6V.ini
rename to Data/Sys/GameSettings/GKOP6V.ini
diff --git a/Data/User/GameConfig/GKOP70.ini b/Data/Sys/GameSettings/GKOP70.ini
similarity index 100%
rename from Data/User/GameConfig/GKOP70.ini
rename to Data/Sys/GameSettings/GKOP70.ini
diff --git a/Data/User/GameConfig/GKQJ01.ini b/Data/Sys/GameSettings/GKQJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GKQJ01.ini
rename to Data/Sys/GameSettings/GKQJ01.ini
diff --git a/Data/User/GameConfig/GKSE52.ini b/Data/Sys/GameSettings/GKSE52.ini
similarity index 100%
rename from Data/User/GameConfig/GKSE52.ini
rename to Data/Sys/GameSettings/GKSE52.ini
diff --git a/Data/User/GameConfig/GKTJA4.ini b/Data/Sys/GameSettings/GKTJA4.ini
similarity index 100%
rename from Data/User/GameConfig/GKTJA4.ini
rename to Data/Sys/GameSettings/GKTJA4.ini
diff --git a/Data/User/GameConfig/GKUE9G.ini b/Data/Sys/GameSettings/GKUE9G.ini
similarity index 100%
rename from Data/User/GameConfig/GKUE9G.ini
rename to Data/Sys/GameSettings/GKUE9G.ini
diff --git a/Data/User/GameConfig/GKYE01.ini b/Data/Sys/GameSettings/GKYE01.ini
similarity index 100%
rename from Data/User/GameConfig/GKYE01.ini
rename to Data/Sys/GameSettings/GKYE01.ini
diff --git a/Data/User/GameConfig/GKYJ01.ini b/Data/Sys/GameSettings/GKYJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GKYJ01.ini
rename to Data/Sys/GameSettings/GKYJ01.ini
diff --git a/Data/User/GameConfig/GKYP01.ini b/Data/Sys/GameSettings/GKYP01.ini
similarity index 100%
rename from Data/User/GameConfig/GKYP01.ini
rename to Data/Sys/GameSettings/GKYP01.ini
diff --git a/Data/User/GameConfig/GKZE9G.ini b/Data/Sys/GameSettings/GKZE9G.ini
similarity index 100%
rename from Data/User/GameConfig/GKZE9G.ini
rename to Data/Sys/GameSettings/GKZE9G.ini
diff --git a/Data/User/GameConfig/GL5E4F.ini b/Data/Sys/GameSettings/GL5E4F.ini
similarity index 100%
rename from Data/User/GameConfig/GL5E4F.ini
rename to Data/Sys/GameSettings/GL5E4F.ini
diff --git a/Data/User/GameConfig/GL7E64.ini b/Data/Sys/GameSettings/GL7E64.ini
similarity index 100%
rename from Data/User/GameConfig/GL7E64.ini
rename to Data/Sys/GameSettings/GL7E64.ini
diff --git a/Data/User/GameConfig/GL7P64.ini b/Data/Sys/GameSettings/GL7P64.ini
similarity index 100%
rename from Data/User/GameConfig/GL7P64.ini
rename to Data/Sys/GameSettings/GL7P64.ini
diff --git a/Data/User/GameConfig/GL8E4F.ini b/Data/Sys/GameSettings/GL8E4F.ini
similarity index 100%
rename from Data/User/GameConfig/GL8E4F.ini
rename to Data/Sys/GameSettings/GL8E4F.ini
diff --git a/Data/User/GameConfig/GL8F4F.ini b/Data/Sys/GameSettings/GL8F4F.ini
similarity index 100%
rename from Data/User/GameConfig/GL8F4F.ini
rename to Data/Sys/GameSettings/GL8F4F.ini
diff --git a/Data/User/GameConfig/GLBE8P.ini b/Data/Sys/GameSettings/GLBE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GLBE8P.ini
rename to Data/Sys/GameSettings/GLBE8P.ini
diff --git a/Data/User/GameConfig/GLCE52.ini b/Data/Sys/GameSettings/GLCE52.ini
similarity index 100%
rename from Data/User/GameConfig/GLCE52.ini
rename to Data/Sys/GameSettings/GLCE52.ini
diff --git a/Data/User/GameConfig/GLCF52.ini b/Data/Sys/GameSettings/GLCF52.ini
similarity index 100%
rename from Data/User/GameConfig/GLCF52.ini
rename to Data/Sys/GameSettings/GLCF52.ini
diff --git a/Data/User/GameConfig/GLEE08.ini b/Data/Sys/GameSettings/GLEE08.ini
similarity index 100%
rename from Data/User/GameConfig/GLEE08.ini
rename to Data/Sys/GameSettings/GLEE08.ini
diff --git a/Data/User/GameConfig/GLEP08.ini b/Data/Sys/GameSettings/GLEP08.ini
similarity index 100%
rename from Data/User/GameConfig/GLEP08.ini
rename to Data/Sys/GameSettings/GLEP08.ini
diff --git a/Data/User/GameConfig/GLLE78.ini b/Data/Sys/GameSettings/GLLE78.ini
similarity index 100%
rename from Data/User/GameConfig/GLLE78.ini
rename to Data/Sys/GameSettings/GLLE78.ini
diff --git a/Data/User/GameConfig/GLME01.ini b/Data/Sys/GameSettings/GLME01.ini
similarity index 100%
rename from Data/User/GameConfig/GLME01.ini
rename to Data/Sys/GameSettings/GLME01.ini
diff --git a/Data/User/GameConfig/GLMP01.ini b/Data/Sys/GameSettings/GLMP01.ini
similarity index 100%
rename from Data/User/GameConfig/GLMP01.ini
rename to Data/Sys/GameSettings/GLMP01.ini
diff --git a/Data/User/GameConfig/GLNE69.ini b/Data/Sys/GameSettings/GLNE69.ini
similarity index 100%
rename from Data/User/GameConfig/GLNE69.ini
rename to Data/Sys/GameSettings/GLNE69.ini
diff --git a/Data/User/GameConfig/GLNP69.ini b/Data/Sys/GameSettings/GLNP69.ini
similarity index 100%
rename from Data/User/GameConfig/GLNP69.ini
rename to Data/Sys/GameSettings/GLNP69.ini
diff --git a/Data/User/GameConfig/GLOE69.ini b/Data/Sys/GameSettings/GLOE69.ini
similarity index 100%
rename from Data/User/GameConfig/GLOE69.ini
rename to Data/Sys/GameSettings/GLOE69.ini
diff --git a/Data/User/GameConfig/GLOP69.ini b/Data/Sys/GameSettings/GLOP69.ini
similarity index 100%
rename from Data/User/GameConfig/GLOP69.ini
rename to Data/Sys/GameSettings/GLOP69.ini
diff --git a/Data/User/GameConfig/GLQE41.ini b/Data/Sys/GameSettings/GLQE41.ini
similarity index 100%
rename from Data/User/GameConfig/GLQE41.ini
rename to Data/Sys/GameSettings/GLQE41.ini
diff --git a/Data/User/GameConfig/GLRE64.ini b/Data/Sys/GameSettings/GLRE64.ini
similarity index 100%
rename from Data/User/GameConfig/GLRE64.ini
rename to Data/Sys/GameSettings/GLRE64.ini
diff --git a/Data/User/GameConfig/GLSD64.ini b/Data/Sys/GameSettings/GLSD64.ini
similarity index 100%
rename from Data/User/GameConfig/GLSD64.ini
rename to Data/Sys/GameSettings/GLSD64.ini
diff --git a/Data/User/GameConfig/GLSE64.ini b/Data/Sys/GameSettings/GLSE64.ini
similarity index 100%
rename from Data/User/GameConfig/GLSE64.ini
rename to Data/Sys/GameSettings/GLSE64.ini
diff --git a/Data/User/GameConfig/GLSF64.ini b/Data/Sys/GameSettings/GLSF64.ini
similarity index 100%
rename from Data/User/GameConfig/GLSF64.ini
rename to Data/Sys/GameSettings/GLSF64.ini
diff --git a/Data/User/GameConfig/GLSP64.ini b/Data/Sys/GameSettings/GLSP64.ini
similarity index 100%
rename from Data/User/GameConfig/GLSP64.ini
rename to Data/Sys/GameSettings/GLSP64.ini
diff --git a/Data/User/GameConfig/GLUE7U.ini b/Data/Sys/GameSettings/GLUE7U.ini
similarity index 100%
rename from Data/User/GameConfig/GLUE7U.ini
rename to Data/Sys/GameSettings/GLUE7U.ini
diff --git a/Data/User/GameConfig/GLWE51.ini b/Data/Sys/GameSettings/GLWE51.ini
similarity index 100%
rename from Data/User/GameConfig/GLWE51.ini
rename to Data/Sys/GameSettings/GLWE51.ini
diff --git a/Data/User/GameConfig/GLYE69.ini b/Data/Sys/GameSettings/GLYE69.ini
similarity index 100%
rename from Data/User/GameConfig/GLYE69.ini
rename to Data/Sys/GameSettings/GLYE69.ini
diff --git a/Data/User/GameConfig/GLYP69.ini b/Data/Sys/GameSettings/GLYP69.ini
similarity index 100%
rename from Data/User/GameConfig/GLYP69.ini
rename to Data/Sys/GameSettings/GLYP69.ini
diff --git a/Data/User/GameConfig/GLZE69.ini b/Data/Sys/GameSettings/GLZE69.ini
similarity index 100%
rename from Data/User/GameConfig/GLZE69.ini
rename to Data/Sys/GameSettings/GLZE69.ini
diff --git a/Data/User/GameConfig/GLZF69.ini b/Data/Sys/GameSettings/GLZF69.ini
similarity index 100%
rename from Data/User/GameConfig/GLZF69.ini
rename to Data/Sys/GameSettings/GLZF69.ini
diff --git a/Data/User/GameConfig/GM2E8P.ini b/Data/Sys/GameSettings/GM2E8P.ini
similarity index 100%
rename from Data/User/GameConfig/GM2E8P.ini
rename to Data/Sys/GameSettings/GM2E8P.ini
diff --git a/Data/User/GameConfig/GM2P8P.ini b/Data/Sys/GameSettings/GM2P8P.ini
similarity index 100%
rename from Data/User/GameConfig/GM2P8P.ini
rename to Data/Sys/GameSettings/GM2P8P.ini
diff --git a/Data/User/GameConfig/GM3E69.ini b/Data/Sys/GameSettings/GM3E69.ini
similarity index 100%
rename from Data/User/GameConfig/GM3E69.ini
rename to Data/Sys/GameSettings/GM3E69.ini
diff --git a/Data/User/GameConfig/GM4E01.ini b/Data/Sys/GameSettings/GM4E01.ini
similarity index 100%
rename from Data/User/GameConfig/GM4E01.ini
rename to Data/Sys/GameSettings/GM4E01.ini
diff --git a/Data/User/GameConfig/GM4J01.ini b/Data/Sys/GameSettings/GM4J01.ini
similarity index 100%
rename from Data/User/GameConfig/GM4J01.ini
rename to Data/Sys/GameSettings/GM4J01.ini
diff --git a/Data/User/GameConfig/GM4P01.ini b/Data/Sys/GameSettings/GM4P01.ini
similarity index 100%
rename from Data/User/GameConfig/GM4P01.ini
rename to Data/Sys/GameSettings/GM4P01.ini
diff --git a/Data/User/GameConfig/GM5E7D.ini b/Data/Sys/GameSettings/GM5E7D.ini
similarity index 100%
rename from Data/User/GameConfig/GM5E7D.ini
rename to Data/Sys/GameSettings/GM5E7D.ini
diff --git a/Data/User/GameConfig/GM5F7D.ini b/Data/Sys/GameSettings/GM5F7D.ini
similarity index 100%
rename from Data/User/GameConfig/GM5F7D.ini
rename to Data/Sys/GameSettings/GM5F7D.ini
diff --git a/Data/User/GameConfig/GM5P7D.ini b/Data/Sys/GameSettings/GM5P7D.ini
similarity index 100%
rename from Data/User/GameConfig/GM5P7D.ini
rename to Data/Sys/GameSettings/GM5P7D.ini
diff --git a/Data/User/GameConfig/GM6EE9.ini b/Data/Sys/GameSettings/GM6EE9.ini
similarity index 100%
rename from Data/User/GameConfig/GM6EE9.ini
rename to Data/Sys/GameSettings/GM6EE9.ini
diff --git a/Data/User/GameConfig/GM6PE9.ini b/Data/Sys/GameSettings/GM6PE9.ini
similarity index 100%
rename from Data/User/GameConfig/GM6PE9.ini
rename to Data/Sys/GameSettings/GM6PE9.ini
diff --git a/Data/User/GameConfig/GM8E01.ini b/Data/Sys/GameSettings/GM8E01.ini
similarity index 100%
rename from Data/User/GameConfig/GM8E01.ini
rename to Data/Sys/GameSettings/GM8E01.ini
diff --git a/Data/User/GameConfig/GM8J01.ini b/Data/Sys/GameSettings/GM8J01.ini
similarity index 100%
rename from Data/User/GameConfig/GM8J01.ini
rename to Data/Sys/GameSettings/GM8J01.ini
diff --git a/Data/User/GameConfig/GM8P01.ini b/Data/Sys/GameSettings/GM8P01.ini
similarity index 100%
rename from Data/User/GameConfig/GM8P01.ini
rename to Data/Sys/GameSettings/GM8P01.ini
diff --git a/Data/User/GameConfig/GMBE8P.ini b/Data/Sys/GameSettings/GMBE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GMBE8P.ini
rename to Data/Sys/GameSettings/GMBE8P.ini
diff --git a/Data/User/GameConfig/GMBP8P.ini b/Data/Sys/GameSettings/GMBP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GMBP8P.ini
rename to Data/Sys/GameSettings/GMBP8P.ini
diff --git a/Data/User/GameConfig/GMFS69.ini b/Data/Sys/GameSettings/GMFS69.ini
similarity index 100%
rename from Data/User/GameConfig/GMFS69.ini
rename to Data/Sys/GameSettings/GMFS69.ini
diff --git a/Data/User/GameConfig/GMHE52.ini b/Data/Sys/GameSettings/GMHE52.ini
similarity index 100%
rename from Data/User/GameConfig/GMHE52.ini
rename to Data/Sys/GameSettings/GMHE52.ini
diff --git a/Data/User/GameConfig/GMHF52.ini b/Data/Sys/GameSettings/GMHF52.ini
similarity index 100%
rename from Data/User/GameConfig/GMHF52.ini
rename to Data/Sys/GameSettings/GMHF52.ini
diff --git a/Data/User/GameConfig/GMHP52.ini b/Data/Sys/GameSettings/GMHP52.ini
similarity index 100%
rename from Data/User/GameConfig/GMHP52.ini
rename to Data/Sys/GameSettings/GMHP52.ini
diff --git a/Data/User/GameConfig/GMIE70.ini b/Data/Sys/GameSettings/GMIE70.ini
similarity index 100%
rename from Data/User/GameConfig/GMIE70.ini
rename to Data/Sys/GameSettings/GMIE70.ini
diff --git a/Data/User/GameConfig/GMIP70.ini b/Data/Sys/GameSettings/GMIP70.ini
similarity index 100%
rename from Data/User/GameConfig/GMIP70.ini
rename to Data/Sys/GameSettings/GMIP70.ini
diff --git a/Data/User/GameConfig/GMKD5D.ini b/Data/Sys/GameSettings/GMKD5D.ini
similarity index 100%
rename from Data/User/GameConfig/GMKD5D.ini
rename to Data/Sys/GameSettings/GMKD5D.ini
diff --git a/Data/User/GameConfig/GMLEA4.ini b/Data/Sys/GameSettings/GMLEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GMLEA4.ini
rename to Data/Sys/GameSettings/GMLEA4.ini
diff --git a/Data/User/GameConfig/GMNE78.ini b/Data/Sys/GameSettings/GMNE78.ini
similarity index 100%
rename from Data/User/GameConfig/GMNE78.ini
rename to Data/Sys/GameSettings/GMNE78.ini
diff --git a/Data/User/GameConfig/GMPE01.ini b/Data/Sys/GameSettings/GMPE01.ini
similarity index 100%
rename from Data/User/GameConfig/GMPE01.ini
rename to Data/Sys/GameSettings/GMPE01.ini
diff --git a/Data/User/GameConfig/GMPP01.ini b/Data/Sys/GameSettings/GMPP01.ini
similarity index 100%
rename from Data/User/GameConfig/GMPP01.ini
rename to Data/Sys/GameSettings/GMPP01.ini
diff --git a/Data/User/GameConfig/GMSE01.ini b/Data/Sys/GameSettings/GMSE01.ini
similarity index 100%
rename from Data/User/GameConfig/GMSE01.ini
rename to Data/Sys/GameSettings/GMSE01.ini
diff --git a/Data/User/GameConfig/GMSJ01.ini b/Data/Sys/GameSettings/GMSJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GMSJ01.ini
rename to Data/Sys/GameSettings/GMSJ01.ini
diff --git a/Data/User/GameConfig/GMSP01.ini b/Data/Sys/GameSettings/GMSP01.ini
similarity index 100%
rename from Data/User/GameConfig/GMSP01.ini
rename to Data/Sys/GameSettings/GMSP01.ini
diff --git a/Data/User/GameConfig/GMTP69.ini b/Data/Sys/GameSettings/GMTP69.ini
similarity index 100%
rename from Data/User/GameConfig/GMTP69.ini
rename to Data/Sys/GameSettings/GMTP69.ini
diff --git a/Data/User/GameConfig/GMUE5D.ini b/Data/Sys/GameSettings/GMUE5D.ini
similarity index 100%
rename from Data/User/GameConfig/GMUE5D.ini
rename to Data/Sys/GameSettings/GMUE5D.ini
diff --git a/Data/User/GameConfig/GMXE70.ini b/Data/Sys/GameSettings/GMXE70.ini
similarity index 100%
rename from Data/User/GameConfig/GMXE70.ini
rename to Data/Sys/GameSettings/GMXE70.ini
diff --git a/Data/User/GameConfig/GN6E69.ini b/Data/Sys/GameSettings/GN6E69.ini
similarity index 100%
rename from Data/User/GameConfig/GN6E69.ini
rename to Data/Sys/GameSettings/GN6E69.ini
diff --git a/Data/User/GameConfig/GN8E69.ini b/Data/Sys/GameSettings/GN8E69.ini
similarity index 100%
rename from Data/User/GameConfig/GN8E69.ini
rename to Data/Sys/GameSettings/GN8E69.ini
diff --git a/Data/User/GameConfig/GN8P69.ini b/Data/Sys/GameSettings/GN8P69.ini
similarity index 100%
rename from Data/User/GameConfig/GN8P69.ini
rename to Data/Sys/GameSettings/GN8P69.ini
diff --git a/Data/User/GameConfig/GNDE69.ini b/Data/Sys/GameSettings/GNDE69.ini
similarity index 100%
rename from Data/User/GameConfig/GNDE69.ini
rename to Data/Sys/GameSettings/GNDE69.ini
diff --git a/Data/User/GameConfig/GNHE5d.ini b/Data/Sys/GameSettings/GNHE5d.ini
similarity index 97%
rename from Data/User/GameConfig/GNHE5d.ini
rename to Data/Sys/GameSettings/GNHE5d.ini
index 17ee4b8008..8c54af0a1e 100644
--- a/Data/User/GameConfig/GNHE5d.ini
+++ b/Data/Sys/GameSettings/GNHE5d.ini
@@ -13,7 +13,7 @@ EmulationIssues = Enable the GameCube BIOS to allow the game to boot.
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$Nop Hack
+$Nop Hack
 0x80025BA0:dword:0x60000000
 
 [ActionReplay]
diff --git a/Data/User/GameConfig/GNJEAF.ini b/Data/Sys/GameSettings/GNJEAF.ini
similarity index 100%
rename from Data/User/GameConfig/GNJEAF.ini
rename to Data/Sys/GameSettings/GNJEAF.ini
diff --git a/Data/User/GameConfig/GNLE69.ini b/Data/Sys/GameSettings/GNLE69.ini
similarity index 100%
rename from Data/User/GameConfig/GNLE69.ini
rename to Data/Sys/GameSettings/GNLE69.ini
diff --git a/Data/User/GameConfig/GNNE69.ini b/Data/Sys/GameSettings/GNNE69.ini
similarity index 100%
rename from Data/User/GameConfig/GNNE69.ini
rename to Data/Sys/GameSettings/GNNE69.ini
diff --git a/Data/User/GameConfig/GNOE78.ini b/Data/Sys/GameSettings/GNOE78.ini
similarity index 100%
rename from Data/User/GameConfig/GNOE78.ini
rename to Data/Sys/GameSettings/GNOE78.ini
diff --git a/Data/User/GameConfig/GNQE69.ini b/Data/Sys/GameSettings/GNQE69.ini
similarity index 100%
rename from Data/User/GameConfig/GNQE69.ini
rename to Data/Sys/GameSettings/GNQE69.ini
diff --git a/Data/User/GameConfig/GNRJDA.ini b/Data/Sys/GameSettings/GNRJDA.ini
similarity index 100%
rename from Data/User/GameConfig/GNRJDA.ini
rename to Data/Sys/GameSettings/GNRJDA.ini
diff --git a/Data/User/GameConfig/GNUEDA.ini b/Data/Sys/GameSettings/GNUEDA.ini
similarity index 100%
rename from Data/User/GameConfig/GNUEDA.ini
rename to Data/Sys/GameSettings/GNUEDA.ini
diff --git a/Data/User/GameConfig/GNWE69.ini b/Data/Sys/GameSettings/GNWE69.ini
similarity index 100%
rename from Data/User/GameConfig/GNWE69.ini
rename to Data/Sys/GameSettings/GNWE69.ini
diff --git a/Data/User/GameConfig/GNWP69.ini b/Data/Sys/GameSettings/GNWP69.ini
similarity index 100%
rename from Data/User/GameConfig/GNWP69.ini
rename to Data/Sys/GameSettings/GNWP69.ini
diff --git a/Data/User/GameConfig/GO2E4F.ini b/Data/Sys/GameSettings/GO2E4F.ini
similarity index 100%
rename from Data/User/GameConfig/GO2E4F.ini
rename to Data/Sys/GameSettings/GO2E4F.ini
diff --git a/Data/User/GameConfig/GO7E69.ini b/Data/Sys/GameSettings/GO7E69.ini
similarity index 100%
rename from Data/User/GameConfig/GO7E69.ini
rename to Data/Sys/GameSettings/GO7E69.ini
diff --git a/Data/User/GameConfig/GO7F69.ini b/Data/Sys/GameSettings/GO7F69.ini
similarity index 100%
rename from Data/User/GameConfig/GO7F69.ini
rename to Data/Sys/GameSettings/GO7F69.ini
diff --git a/Data/User/GameConfig/GO7P69.ini b/Data/Sys/GameSettings/GO7P69.ini
similarity index 100%
rename from Data/User/GameConfig/GO7P69.ini
rename to Data/Sys/GameSettings/GO7P69.ini
diff --git a/Data/User/GameConfig/GOAE52.ini b/Data/Sys/GameSettings/GOAE52.ini
similarity index 100%
rename from Data/User/GameConfig/GOAE52.ini
rename to Data/Sys/GameSettings/GOAE52.ini
diff --git a/Data/User/GameConfig/GOBE4Z.ini b/Data/Sys/GameSettings/GOBE4Z.ini
similarity index 100%
rename from Data/User/GameConfig/GOBE4Z.ini
rename to Data/Sys/GameSettings/GOBE4Z.ini
diff --git a/Data/User/GameConfig/GOCE5D.ini b/Data/Sys/GameSettings/GOCE5D.ini
similarity index 100%
rename from Data/User/GameConfig/GOCE5D.ini
rename to Data/Sys/GameSettings/GOCE5D.ini
diff --git a/Data/User/GameConfig/GOGJB2.ini b/Data/Sys/GameSettings/GOGJB2.ini
similarity index 100%
rename from Data/User/GameConfig/GOGJB2.ini
rename to Data/Sys/GameSettings/GOGJB2.ini
diff --git a/Data/User/GameConfig/GOME01.ini b/Data/Sys/GameSettings/GOME01.ini
similarity index 100%
rename from Data/User/GameConfig/GOME01.ini
rename to Data/Sys/GameSettings/GOME01.ini
diff --git a/Data/User/GameConfig/GOMP01.ini b/Data/Sys/GameSettings/GOMP01.ini
similarity index 100%
rename from Data/User/GameConfig/GOMP01.ini
rename to Data/Sys/GameSettings/GOMP01.ini
diff --git a/Data/User/GameConfig/GONE69.ini b/Data/Sys/GameSettings/GONE69.ini
similarity index 100%
rename from Data/User/GameConfig/GONE69.ini
rename to Data/Sys/GameSettings/GONE69.ini
diff --git a/Data/User/GameConfig/GOOE01.ini b/Data/Sys/GameSettings/GOOE01.ini
similarity index 100%
rename from Data/User/GameConfig/GOOE01.ini
rename to Data/Sys/GameSettings/GOOE01.ini
diff --git a/Data/User/GameConfig/GOPEB2.ini b/Data/Sys/GameSettings/GOPEB2.ini
similarity index 100%
rename from Data/User/GameConfig/GOPEB2.ini
rename to Data/Sys/GameSettings/GOPEB2.ini
diff --git a/Data/User/GameConfig/GOPJB2.ini b/Data/Sys/GameSettings/GOPJB2.ini
similarity index 100%
rename from Data/User/GameConfig/GOPJB2.ini
rename to Data/Sys/GameSettings/GOPJB2.ini
diff --git a/Data/User/GameConfig/GOQEAF.ini b/Data/Sys/GameSettings/GOQEAF.ini
similarity index 100%
rename from Data/User/GameConfig/GOQEAF.ini
rename to Data/Sys/GameSettings/GOQEAF.ini
diff --git a/Data/User/GameConfig/GOSE41.ini b/Data/Sys/GameSettings/GOSE41.ini
similarity index 100%
rename from Data/User/GameConfig/GOSE41.ini
rename to Data/Sys/GameSettings/GOSE41.ini
diff --git a/Data/User/GameConfig/GOSP41.ini b/Data/Sys/GameSettings/GOSP41.ini
similarity index 100%
rename from Data/User/GameConfig/GOSP41.ini
rename to Data/Sys/GameSettings/GOSP41.ini
diff --git a/Data/User/GameConfig/GOSX41.ini b/Data/Sys/GameSettings/GOSX41.ini
similarity index 100%
rename from Data/User/GameConfig/GOSX41.ini
rename to Data/Sys/GameSettings/GOSX41.ini
diff --git a/Data/User/GameConfig/GOWD69.ini b/Data/Sys/GameSettings/GOWD69.ini
similarity index 100%
rename from Data/User/GameConfig/GOWD69.ini
rename to Data/Sys/GameSettings/GOWD69.ini
diff --git a/Data/User/GameConfig/GOWE69.ini b/Data/Sys/GameSettings/GOWE69.ini
similarity index 100%
rename from Data/User/GameConfig/GOWE69.ini
rename to Data/Sys/GameSettings/GOWE69.ini
diff --git a/Data/User/GameConfig/GOWF69.ini b/Data/Sys/GameSettings/GOWF69.ini
similarity index 100%
rename from Data/User/GameConfig/GOWF69.ini
rename to Data/Sys/GameSettings/GOWF69.ini
diff --git a/Data/User/GameConfig/GOWJ69.ini b/Data/Sys/GameSettings/GOWJ69.ini
similarity index 100%
rename from Data/User/GameConfig/GOWJ69.ini
rename to Data/Sys/GameSettings/GOWJ69.ini
diff --git a/Data/User/GameConfig/GOWP69.ini b/Data/Sys/GameSettings/GOWP69.ini
similarity index 100%
rename from Data/User/GameConfig/GOWP69.ini
rename to Data/Sys/GameSettings/GOWP69.ini
diff --git a/Data/User/GameConfig/GOYD69.ini b/Data/Sys/GameSettings/GOYD69.ini
similarity index 100%
rename from Data/User/GameConfig/GOYD69.ini
rename to Data/Sys/GameSettings/GOYD69.ini
diff --git a/Data/User/GameConfig/GOYE69.ini b/Data/Sys/GameSettings/GOYE69.ini
similarity index 100%
rename from Data/User/GameConfig/GOYE69.ini
rename to Data/Sys/GameSettings/GOYE69.ini
diff --git a/Data/User/GameConfig/GOYF69.ini b/Data/Sys/GameSettings/GOYF69.ini
similarity index 100%
rename from Data/User/GameConfig/GOYF69.ini
rename to Data/Sys/GameSettings/GOYF69.ini
diff --git a/Data/User/GameConfig/GOYP69.ini b/Data/Sys/GameSettings/GOYP69.ini
similarity index 100%
rename from Data/User/GameConfig/GOYP69.ini
rename to Data/Sys/GameSettings/GOYP69.ini
diff --git a/Data/User/GameConfig/GOYS69.ini b/Data/Sys/GameSettings/GOYS69.ini
similarity index 100%
rename from Data/User/GameConfig/GOYS69.ini
rename to Data/Sys/GameSettings/GOYS69.ini
diff --git a/Data/User/GameConfig/GP2E82.ini b/Data/Sys/GameSettings/GP2E82.ini
similarity index 100%
rename from Data/User/GameConfig/GP2E82.ini
rename to Data/Sys/GameSettings/GP2E82.ini
diff --git a/Data/User/GameConfig/GP2EAF.ini b/Data/Sys/GameSettings/GP2EAF.ini
similarity index 100%
rename from Data/User/GameConfig/GP2EAF.ini
rename to Data/Sys/GameSettings/GP2EAF.ini
diff --git a/Data/User/GameConfig/GP4J18.ini b/Data/Sys/GameSettings/GP4J18.ini
similarity index 100%
rename from Data/User/GameConfig/GP4J18.ini
rename to Data/Sys/GameSettings/GP4J18.ini
diff --git a/Data/User/GameConfig/GP5E01.ini b/Data/Sys/GameSettings/GP5E01.ini
similarity index 100%
rename from Data/User/GameConfig/GP5E01.ini
rename to Data/Sys/GameSettings/GP5E01.ini
diff --git a/Data/User/GameConfig/GP5J01.ini b/Data/Sys/GameSettings/GP5J01.ini
similarity index 100%
rename from Data/User/GameConfig/GP5J01.ini
rename to Data/Sys/GameSettings/GP5J01.ini
diff --git a/Data/User/GameConfig/GP5P01.ini b/Data/Sys/GameSettings/GP5P01.ini
similarity index 100%
rename from Data/User/GameConfig/GP5P01.ini
rename to Data/Sys/GameSettings/GP5P01.ini
diff --git a/Data/User/GameConfig/GP6E01.ini b/Data/Sys/GameSettings/GP6E01.ini
similarity index 100%
rename from Data/User/GameConfig/GP6E01.ini
rename to Data/Sys/GameSettings/GP6E01.ini
diff --git a/Data/User/GameConfig/GP6J01.ini b/Data/Sys/GameSettings/GP6J01.ini
similarity index 100%
rename from Data/User/GameConfig/GP6J01.ini
rename to Data/Sys/GameSettings/GP6J01.ini
diff --git a/Data/User/GameConfig/GP6P01.ini b/Data/Sys/GameSettings/GP6P01.ini
similarity index 100%
rename from Data/User/GameConfig/GP6P01.ini
rename to Data/Sys/GameSettings/GP6P01.ini
diff --git a/Data/User/GameConfig/GP7E01.ini b/Data/Sys/GameSettings/GP7E01.ini
similarity index 100%
rename from Data/User/GameConfig/GP7E01.ini
rename to Data/Sys/GameSettings/GP7E01.ini
diff --git a/Data/User/GameConfig/GP7J01.ini b/Data/Sys/GameSettings/GP7J01.ini
similarity index 100%
rename from Data/User/GameConfig/GP7J01.ini
rename to Data/Sys/GameSettings/GP7J01.ini
diff --git a/Data/User/GameConfig/GP7P01.ini b/Data/Sys/GameSettings/GP7P01.ini
similarity index 100%
rename from Data/User/GameConfig/GP7P01.ini
rename to Data/Sys/GameSettings/GP7P01.ini
diff --git a/Data/User/GameConfig/GP8EAF.ini b/Data/Sys/GameSettings/GP8EAF.ini
similarity index 100%
rename from Data/User/GameConfig/GP8EAF.ini
rename to Data/Sys/GameSettings/GP8EAF.ini
diff --git a/Data/User/GameConfig/GPAE01.ini b/Data/Sys/GameSettings/GPAE01.ini
similarity index 100%
rename from Data/User/GameConfig/GPAE01.ini
rename to Data/Sys/GameSettings/GPAE01.ini
diff --git a/Data/User/GameConfig/GPAJ01.ini b/Data/Sys/GameSettings/GPAJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GPAJ01.ini
rename to Data/Sys/GameSettings/GPAJ01.ini
diff --git a/Data/User/GameConfig/GPAP01.ini b/Data/Sys/GameSettings/GPAP01.ini
similarity index 100%
rename from Data/User/GameConfig/GPAP01.ini
rename to Data/Sys/GameSettings/GPAP01.ini
diff --git a/Data/User/GameConfig/GPAU01.ini b/Data/Sys/GameSettings/GPAU01.ini
similarity index 100%
rename from Data/User/GameConfig/GPAU01.ini
rename to Data/Sys/GameSettings/GPAU01.ini
diff --git a/Data/User/GameConfig/GPDE51.ini b/Data/Sys/GameSettings/GPDE51.ini
similarity index 100%
rename from Data/User/GameConfig/GPDE51.ini
rename to Data/Sys/GameSettings/GPDE51.ini
diff --git a/Data/User/GameConfig/GPEJ2Q.ini b/Data/Sys/GameSettings/GPEJ2Q.ini
similarity index 100%
rename from Data/User/GameConfig/GPEJ2Q.ini
rename to Data/Sys/GameSettings/GPEJ2Q.ini
diff --git a/Data/User/GameConfig/GPHD52.ini b/Data/Sys/GameSettings/GPHD52.ini
similarity index 100%
rename from Data/User/GameConfig/GPHD52.ini
rename to Data/Sys/GameSettings/GPHD52.ini
diff --git a/Data/User/GameConfig/GPHE52.ini b/Data/Sys/GameSettings/GPHE52.ini
similarity index 100%
rename from Data/User/GameConfig/GPHE52.ini
rename to Data/Sys/GameSettings/GPHE52.ini
diff --git a/Data/User/GameConfig/GPHP52.ini b/Data/Sys/GameSettings/GPHP52.ini
similarity index 100%
rename from Data/User/GameConfig/GPHP52.ini
rename to Data/Sys/GameSettings/GPHP52.ini
diff --git a/Data/User/GameConfig/GPIE01.ini b/Data/Sys/GameSettings/GPIE01.ini
similarity index 100%
rename from Data/User/GameConfig/GPIE01.ini
rename to Data/Sys/GameSettings/GPIE01.ini
diff --git a/Data/User/GameConfig/GPIP01.ini b/Data/Sys/GameSettings/GPIP01.ini
similarity index 100%
rename from Data/User/GameConfig/GPIP01.ini
rename to Data/Sys/GameSettings/GPIP01.ini
diff --git a/Data/User/GameConfig/GPKE41.ini b/Data/Sys/GameSettings/GPKE41.ini
similarity index 100%
rename from Data/User/GameConfig/GPKE41.ini
rename to Data/Sys/GameSettings/GPKE41.ini
diff --git a/Data/User/GameConfig/GPNE08.ini b/Data/Sys/GameSettings/GPNE08.ini
similarity index 100%
rename from Data/User/GameConfig/GPNE08.ini
rename to Data/Sys/GameSettings/GPNE08.ini
diff --git a/Data/User/GameConfig/GPNP08.ini b/Data/Sys/GameSettings/GPNP08.ini
similarity index 100%
rename from Data/User/GameConfig/GPNP08.ini
rename to Data/Sys/GameSettings/GPNP08.ini
diff --git a/Data/User/GameConfig/GPOE8P.ini b/Data/Sys/GameSettings/GPOE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GPOE8P.ini
rename to Data/Sys/GameSettings/GPOE8P.ini
diff --git a/Data/User/GameConfig/GPOP8P.ini b/Data/Sys/GameSettings/GPOP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GPOP8P.ini
rename to Data/Sys/GameSettings/GPOP8P.ini
diff --git a/Data/User/GameConfig/GPSE8P.ini b/Data/Sys/GameSettings/GPSE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GPSE8P.ini
rename to Data/Sys/GameSettings/GPSE8P.ini
diff --git a/Data/User/GameConfig/GPSP8P.ini b/Data/Sys/GameSettings/GPSP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GPSP8P.ini
rename to Data/Sys/GameSettings/GPSP8P.ini
diff --git a/Data/User/GameConfig/GPTE41.ini b/Data/Sys/GameSettings/GPTE41.ini
similarity index 100%
rename from Data/User/GameConfig/GPTE41.ini
rename to Data/Sys/GameSettings/GPTE41.ini
diff --git a/Data/User/GameConfig/GPTP41.ini b/Data/Sys/GameSettings/GPTP41.ini
similarity index 100%
rename from Data/User/GameConfig/GPTP41.ini
rename to Data/Sys/GameSettings/GPTP41.ini
diff --git a/Data/User/GameConfig/GPVE01.ini b/Data/Sys/GameSettings/GPVE01.ini
similarity index 100%
rename from Data/User/GameConfig/GPVE01.ini
rename to Data/Sys/GameSettings/GPVE01.ini
diff --git a/Data/User/GameConfig/GPVP01.ini b/Data/Sys/GameSettings/GPVP01.ini
similarity index 100%
rename from Data/User/GameConfig/GPVP01.ini
rename to Data/Sys/GameSettings/GPVP01.ini
diff --git a/Data/User/GameConfig/GPXP01.ini b/Data/Sys/GameSettings/GPXP01.ini
similarity index 100%
rename from Data/User/GameConfig/GPXP01.ini
rename to Data/Sys/GameSettings/GPXP01.ini
diff --git a/Data/User/GameConfig/GPZJ01.ini b/Data/Sys/GameSettings/GPZJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GPZJ01.ini
rename to Data/Sys/GameSettings/GPZJ01.ini
diff --git a/Data/User/GameConfig/GQ8E69.ini b/Data/Sys/GameSettings/GQ8E69.ini
similarity index 100%
rename from Data/User/GameConfig/GQ8E69.ini
rename to Data/Sys/GameSettings/GQ8E69.ini
diff --git a/Data/User/GameConfig/GQCD52.ini b/Data/Sys/GameSettings/GQCD52.ini
similarity index 98%
rename from Data/User/GameConfig/GQCD52.ini
rename to Data/Sys/GameSettings/GQCD52.ini
index bed0ef720c..e69adf6d19 100644
--- a/Data/User/GameConfig/GQCD52.ini
+++ b/Data/Sys/GameSettings/GQCD52.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
\ No newline at end of file
diff --git a/Data/User/GameConfig/GQCE52.ini b/Data/Sys/GameSettings/GQCE52.ini
similarity index 98%
rename from Data/User/GameConfig/GQCE52.ini
rename to Data/Sys/GameSettings/GQCE52.ini
index 4d7a73a134..8f3452a597 100644
--- a/Data/User/GameConfig/GQCE52.ini
+++ b/Data/Sys/GameSettings/GQCE52.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/GQCF52.ini b/Data/Sys/GameSettings/GQCF52.ini
similarity index 98%
rename from Data/User/GameConfig/GQCF52.ini
rename to Data/Sys/GameSettings/GQCF52.ini
index 29e4d50f68..da55f72b96 100644
--- a/Data/User/GameConfig/GQCF52.ini
+++ b/Data/Sys/GameSettings/GQCF52.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
\ No newline at end of file
diff --git a/Data/User/GameConfig/GQCI52.ini b/Data/Sys/GameSettings/GQCI52.ini
similarity index 100%
rename from Data/User/GameConfig/GQCI52.ini
rename to Data/Sys/GameSettings/GQCI52.ini
diff --git a/Data/User/GameConfig/GQCP52.ini b/Data/Sys/GameSettings/GQCP52.ini
similarity index 98%
rename from Data/User/GameConfig/GQCP52.ini
rename to Data/Sys/GameSettings/GQCP52.ini
index 68e6d65851..6c8850c4f1 100644
--- a/Data/User/GameConfig/GQCP52.ini
+++ b/Data/Sys/GameSettings/GQCP52.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
\ No newline at end of file
diff --git a/Data/User/GameConfig/GQCS52.ini b/Data/Sys/GameSettings/GQCS52.ini
similarity index 98%
rename from Data/User/GameConfig/GQCS52.ini
rename to Data/Sys/GameSettings/GQCS52.ini
index 54fdb0d90b..1da24daea4 100644
--- a/Data/User/GameConfig/GQCS52.ini
+++ b/Data/Sys/GameSettings/GQCS52.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/GQLE9G.ini b/Data/Sys/GameSettings/GQLE9G.ini
similarity index 100%
rename from Data/User/GameConfig/GQLE9G.ini
rename to Data/Sys/GameSettings/GQLE9G.ini
diff --git a/Data/User/GameConfig/GQNE5D.ini b/Data/Sys/GameSettings/GQNE5D.ini
similarity index 100%
rename from Data/User/GameConfig/GQNE5D.ini
rename to Data/Sys/GameSettings/GQNE5D.ini
diff --git a/Data/User/GameConfig/GQSDAF.ini b/Data/Sys/GameSettings/GQSDAF.ini
similarity index 100%
rename from Data/User/GameConfig/GQSDAF.ini
rename to Data/Sys/GameSettings/GQSDAF.ini
diff --git a/Data/User/GameConfig/GQSEAF.ini b/Data/Sys/GameSettings/GQSEAF.ini
similarity index 100%
rename from Data/User/GameConfig/GQSEAF.ini
rename to Data/Sys/GameSettings/GQSEAF.ini
diff --git a/Data/User/GameConfig/GQSFAF.ini b/Data/Sys/GameSettings/GQSFAF.ini
similarity index 100%
rename from Data/User/GameConfig/GQSFAF.ini
rename to Data/Sys/GameSettings/GQSFAF.ini
diff --git a/Data/User/GameConfig/GQSPAF.ini b/Data/Sys/GameSettings/GQSPAF.ini
similarity index 100%
rename from Data/User/GameConfig/GQSPAF.ini
rename to Data/Sys/GameSettings/GQSPAF.ini
diff --git a/Data/User/GameConfig/GQTE4Q.ini b/Data/Sys/GameSettings/GQTE4Q.ini
similarity index 100%
rename from Data/User/GameConfig/GQTE4Q.ini
rename to Data/Sys/GameSettings/GQTE4Q.ini
diff --git a/Data/User/GameConfig/GQWE69.ini b/Data/Sys/GameSettings/GQWE69.ini
similarity index 100%
rename from Data/User/GameConfig/GQWE69.ini
rename to Data/Sys/GameSettings/GQWE69.ini
diff --git a/Data/User/GameConfig/GQWJ69.ini b/Data/Sys/GameSettings/GQWJ69.ini
similarity index 100%
rename from Data/User/GameConfig/GQWJ69.ini
rename to Data/Sys/GameSettings/GQWJ69.ini
diff --git a/Data/User/GameConfig/GQWP69.ini b/Data/Sys/GameSettings/GQWP69.ini
similarity index 100%
rename from Data/User/GameConfig/GQWP69.ini
rename to Data/Sys/GameSettings/GQWP69.ini
diff --git a/Data/User/GameConfig/GQWX69.ini b/Data/Sys/GameSettings/GQWX69.ini
similarity index 100%
rename from Data/User/GameConfig/GQWX69.ini
rename to Data/Sys/GameSettings/GQWX69.ini
diff --git a/Data/User/GameConfig/GQXE69.ini b/Data/Sys/GameSettings/GQXE69.ini
similarity index 100%
rename from Data/User/GameConfig/GQXE69.ini
rename to Data/Sys/GameSettings/GQXE69.ini
diff --git a/Data/User/GameConfig/GR2E52.ini b/Data/Sys/GameSettings/GR2E52.ini
similarity index 100%
rename from Data/User/GameConfig/GR2E52.ini
rename to Data/Sys/GameSettings/GR2E52.ini
diff --git a/Data/User/GameConfig/GR6E78.ini b/Data/Sys/GameSettings/GR6E78.ini
similarity index 100%
rename from Data/User/GameConfig/GR6E78.ini
rename to Data/Sys/GameSettings/GR6E78.ini
diff --git a/Data/User/GameConfig/GR8D69.ini b/Data/Sys/GameSettings/GR8D69.ini
similarity index 98%
rename from Data/User/GameConfig/GR8D69.ini
rename to Data/Sys/GameSettings/GR8D69.ini
index e314d09dc9..9137bd8be8 100644
--- a/Data/User/GameConfig/GR8D69.ini
+++ b/Data/Sys/GameSettings/GR8D69.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/GR8E69.ini b/Data/Sys/GameSettings/GR8E69.ini
similarity index 98%
rename from Data/User/GameConfig/GR8E69.ini
rename to Data/Sys/GameSettings/GR8E69.ini
index 9114a39003..616f8db8c0 100644
--- a/Data/User/GameConfig/GR8E69.ini
+++ b/Data/Sys/GameSettings/GR8E69.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/GR8F69.ini b/Data/Sys/GameSettings/GR8F69.ini
similarity index 98%
rename from Data/User/GameConfig/GR8F69.ini
rename to Data/Sys/GameSettings/GR8F69.ini
index 4bf6f432ab..738cd33de7 100644
--- a/Data/User/GameConfig/GR8F69.ini
+++ b/Data/Sys/GameSettings/GR8F69.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/GR8J69.ini b/Data/Sys/GameSettings/GR8J69.ini
similarity index 98%
rename from Data/User/GameConfig/GR8J69.ini
rename to Data/Sys/GameSettings/GR8J69.ini
index 7b3a2e8d96..c66e915d6f 100644
--- a/Data/User/GameConfig/GR8J69.ini
+++ b/Data/Sys/GameSettings/GR8J69.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/GR8P69.ini b/Data/Sys/GameSettings/GR8P69.ini
similarity index 98%
rename from Data/User/GameConfig/GR8P69.ini
rename to Data/Sys/GameSettings/GR8P69.ini
index 47e646f884..f9845f3af2 100644
--- a/Data/User/GameConfig/GR8P69.ini
+++ b/Data/Sys/GameSettings/GR8P69.ini
@@ -17,4 +17,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/GRAE5Z.ini b/Data/Sys/GameSettings/GRAE5Z.ini
similarity index 100%
rename from Data/User/GameConfig/GRAE5Z.ini
rename to Data/Sys/GameSettings/GRAE5Z.ini
diff --git a/Data/User/GameConfig/GRBE6S.ini b/Data/Sys/GameSettings/GRBE6S.ini
similarity index 100%
rename from Data/User/GameConfig/GRBE6S.ini
rename to Data/Sys/GameSettings/GRBE6S.ini
diff --git a/Data/User/GameConfig/GRBP6S.ini b/Data/Sys/GameSettings/GRBP6S.ini
similarity index 100%
rename from Data/User/GameConfig/GRBP6S.ini
rename to Data/Sys/GameSettings/GRBP6S.ini
diff --git a/Data/User/GameConfig/GREE08.ini b/Data/Sys/GameSettings/GREE08.ini
similarity index 100%
rename from Data/User/GameConfig/GREE08.ini
rename to Data/Sys/GameSettings/GREE08.ini
diff --git a/Data/User/GameConfig/GREP08.ini b/Data/Sys/GameSettings/GREP08.ini
similarity index 100%
rename from Data/User/GameConfig/GREP08.ini
rename to Data/Sys/GameSettings/GREP08.ini
diff --git a/Data/User/GameConfig/GRFE78.ini b/Data/Sys/GameSettings/GRFE78.ini
similarity index 100%
rename from Data/User/GameConfig/GRFE78.ini
rename to Data/Sys/GameSettings/GRFE78.ini
diff --git a/Data/User/GameConfig/GRHE41.ini b/Data/Sys/GameSettings/GRHE41.ini
similarity index 100%
rename from Data/User/GameConfig/GRHE41.ini
rename to Data/Sys/GameSettings/GRHE41.ini
diff --git a/Data/User/GameConfig/GRHP41.ini b/Data/Sys/GameSettings/GRHP41.ini
similarity index 100%
rename from Data/User/GameConfig/GRHP41.ini
rename to Data/Sys/GameSettings/GRHP41.ini
diff --git a/Data/User/GameConfig/GRJEAF.ini b/Data/Sys/GameSettings/GRJEAF.ini
similarity index 100%
rename from Data/User/GameConfig/GRJEAF.ini
rename to Data/Sys/GameSettings/GRJEAF.ini
diff --git a/Data/User/GameConfig/GRKE41.ini b/Data/Sys/GameSettings/GRKE41.ini
similarity index 100%
rename from Data/User/GameConfig/GRKE41.ini
rename to Data/Sys/GameSettings/GRKE41.ini
diff --git a/Data/User/GameConfig/GRKP7G.ini b/Data/Sys/GameSettings/GRKP7G.ini
similarity index 100%
rename from Data/User/GameConfig/GRKP7G.ini
rename to Data/Sys/GameSettings/GRKP7G.ini
diff --git a/Data/User/GameConfig/GRLE41.ini b/Data/Sys/GameSettings/GRLE41.ini
similarity index 100%
rename from Data/User/GameConfig/GRLE41.ini
rename to Data/Sys/GameSettings/GRLE41.ini
diff --git a/Data/User/GameConfig/GRNE52.ini b/Data/Sys/GameSettings/GRNE52.ini
similarity index 100%
rename from Data/User/GameConfig/GRNE52.ini
rename to Data/Sys/GameSettings/GRNE52.ini
diff --git a/Data/User/GameConfig/GROP7J.ini b/Data/Sys/GameSettings/GROP7J.ini
similarity index 100%
rename from Data/User/GameConfig/GROP7J.ini
rename to Data/Sys/GameSettings/GROP7J.ini
diff --git a/Data/User/GameConfig/GRQE41.ini b/Data/Sys/GameSettings/GRQE41.ini
similarity index 100%
rename from Data/User/GameConfig/GRQE41.ini
rename to Data/Sys/GameSettings/GRQE41.ini
diff --git a/Data/User/GameConfig/GRSEAF.ini b/Data/Sys/GameSettings/GRSEAF.ini
similarity index 100%
rename from Data/User/GameConfig/GRSEAF.ini
rename to Data/Sys/GameSettings/GRSEAF.ini
diff --git a/Data/User/GameConfig/GRSPAF.ini b/Data/Sys/GameSettings/GRSPAF.ini
similarity index 100%
rename from Data/User/GameConfig/GRSPAF.ini
rename to Data/Sys/GameSettings/GRSPAF.ini
diff --git a/Data/User/GameConfig/GRUE78.ini b/Data/Sys/GameSettings/GRUE78.ini
similarity index 100%
rename from Data/User/GameConfig/GRUE78.ini
rename to Data/Sys/GameSettings/GRUE78.ini
diff --git a/Data/User/GameConfig/GRVEA4.ini b/Data/Sys/GameSettings/GRVEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GRVEA4.ini
rename to Data/Sys/GameSettings/GRVEA4.ini
diff --git a/Data/User/GameConfig/GRYE41.ini b/Data/Sys/GameSettings/GRYE41.ini
similarity index 100%
rename from Data/User/GameConfig/GRYE41.ini
rename to Data/Sys/GameSettings/GRYE41.ini
diff --git a/Data/User/GameConfig/GS2D78.ini b/Data/Sys/GameSettings/GS2D78.ini
similarity index 100%
rename from Data/User/GameConfig/GS2D78.ini
rename to Data/Sys/GameSettings/GS2D78.ini
diff --git a/Data/User/GameConfig/GS2E78.ini b/Data/Sys/GameSettings/GS2E78.ini
similarity index 100%
rename from Data/User/GameConfig/GS2E78.ini
rename to Data/Sys/GameSettings/GS2E78.ini
diff --git a/Data/User/GameConfig/GS2F78.ini b/Data/Sys/GameSettings/GS2F78.ini
similarity index 100%
rename from Data/User/GameConfig/GS2F78.ini
rename to Data/Sys/GameSettings/GS2F78.ini
diff --git a/Data/User/GameConfig/GS2P78.ini b/Data/Sys/GameSettings/GS2P78.ini
similarity index 100%
rename from Data/User/GameConfig/GS2P78.ini
rename to Data/Sys/GameSettings/GS2P78.ini
diff --git a/Data/User/GameConfig/GS8P7D.ini b/Data/Sys/GameSettings/GS8P7D.ini
similarity index 100%
rename from Data/User/GameConfig/GS8P7D.ini
rename to Data/Sys/GameSettings/GS8P7D.ini
diff --git a/Data/User/GameConfig/GSAE01.ini b/Data/Sys/GameSettings/GSAE01.ini
similarity index 100%
rename from Data/User/GameConfig/GSAE01.ini
rename to Data/Sys/GameSettings/GSAE01.ini
diff --git a/Data/User/GameConfig/GSAP01.ini b/Data/Sys/GameSettings/GSAP01.ini
similarity index 100%
rename from Data/User/GameConfig/GSAP01.ini
rename to Data/Sys/GameSettings/GSAP01.ini
diff --git a/Data/User/GameConfig/GSCE51.ini b/Data/Sys/GameSettings/GSCE51.ini
similarity index 100%
rename from Data/User/GameConfig/GSCE51.ini
rename to Data/Sys/GameSettings/GSCE51.ini
diff --git a/Data/User/GameConfig/GSEJB2.ini b/Data/Sys/GameSettings/GSEJB2.ini
similarity index 100%
rename from Data/User/GameConfig/GSEJB2.ini
rename to Data/Sys/GameSettings/GSEJB2.ini
diff --git a/Data/User/GameConfig/GSMP52.ini b/Data/Sys/GameSettings/GSMP52.ini
similarity index 100%
rename from Data/User/GameConfig/GSMP52.ini
rename to Data/Sys/GameSettings/GSMP52.ini
diff --git a/Data/User/GameConfig/GSNE8P.ini b/Data/Sys/GameSettings/GSNE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GSNE8P.ini
rename to Data/Sys/GameSettings/GSNE8P.ini
diff --git a/Data/User/GameConfig/GSNP8P.ini b/Data/Sys/GameSettings/GSNP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GSNP8P.ini
rename to Data/Sys/GameSettings/GSNP8P.ini
diff --git a/Data/User/GameConfig/GSOE8P.ini b/Data/Sys/GameSettings/GSOE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GSOE8P.ini
rename to Data/Sys/GameSettings/GSOE8P.ini
diff --git a/Data/User/GameConfig/GSOP8P.ini b/Data/Sys/GameSettings/GSOP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GSOP8P.ini
rename to Data/Sys/GameSettings/GSOP8P.ini
diff --git a/Data/User/GameConfig/GSPE69.ini b/Data/Sys/GameSettings/GSPE69.ini
similarity index 100%
rename from Data/User/GameConfig/GSPE69.ini
rename to Data/Sys/GameSettings/GSPE69.ini
diff --git a/Data/User/GameConfig/GSSE8P.ini b/Data/Sys/GameSettings/GSSE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GSSE8P.ini
rename to Data/Sys/GameSettings/GSSE8P.ini
diff --git a/Data/User/GameConfig/GSSJ8P.ini b/Data/Sys/GameSettings/GSSJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/GSSJ8P.ini
rename to Data/Sys/GameSettings/GSSJ8P.ini
diff --git a/Data/User/GameConfig/GSSP70.ini b/Data/Sys/GameSettings/GSSP70.ini
similarity index 100%
rename from Data/User/GameConfig/GSSP70.ini
rename to Data/Sys/GameSettings/GSSP70.ini
diff --git a/Data/User/GameConfig/GSSP8P.ini b/Data/Sys/GameSettings/GSSP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GSSP8P.ini
rename to Data/Sys/GameSettings/GSSP8P.ini
diff --git a/Data/User/GameConfig/GSTE69.ini b/Data/Sys/GameSettings/GSTE69.ini
similarity index 100%
rename from Data/User/GameConfig/GSTE69.ini
rename to Data/Sys/GameSettings/GSTE69.ini
diff --git a/Data/User/GameConfig/GSTP69.ini b/Data/Sys/GameSettings/GSTP69.ini
similarity index 100%
rename from Data/User/GameConfig/GSTP69.ini
rename to Data/Sys/GameSettings/GSTP69.ini
diff --git a/Data/User/GameConfig/GSWE64.ini b/Data/Sys/GameSettings/GSWE64.ini
similarity index 100%
rename from Data/User/GameConfig/GSWE64.ini
rename to Data/Sys/GameSettings/GSWE64.ini
diff --git a/Data/User/GameConfig/GSWP64.ini b/Data/Sys/GameSettings/GSWP64.ini
similarity index 100%
rename from Data/User/GameConfig/GSWP64.ini
rename to Data/Sys/GameSettings/GSWP64.ini
diff --git a/Data/User/GameConfig/GSWS64.ini b/Data/Sys/GameSettings/GSWS64.ini
similarity index 100%
rename from Data/User/GameConfig/GSWS64.ini
rename to Data/Sys/GameSettings/GSWS64.ini
diff --git a/Data/User/GameConfig/GSZP41.ini b/Data/Sys/GameSettings/GSZP41.ini
similarity index 100%
rename from Data/User/GameConfig/GSZP41.ini
rename to Data/Sys/GameSettings/GSZP41.ini
diff --git a/Data/User/GameConfig/GT3D52.ini b/Data/Sys/GameSettings/GT3D52.ini
similarity index 100%
rename from Data/User/GameConfig/GT3D52.ini
rename to Data/Sys/GameSettings/GT3D52.ini
diff --git a/Data/User/GameConfig/GT3E52.ini b/Data/Sys/GameSettings/GT3E52.ini
similarity index 100%
rename from Data/User/GameConfig/GT3E52.ini
rename to Data/Sys/GameSettings/GT3E52.ini
diff --git a/Data/User/GameConfig/GT3F52.ini b/Data/Sys/GameSettings/GT3F52.ini
similarity index 100%
rename from Data/User/GameConfig/GT3F52.ini
rename to Data/Sys/GameSettings/GT3F52.ini
diff --git a/Data/User/GameConfig/GT3P52.ini b/Data/Sys/GameSettings/GT3P52.ini
similarity index 100%
rename from Data/User/GameConfig/GT3P52.ini
rename to Data/Sys/GameSettings/GT3P52.ini
diff --git a/Data/User/GameConfig/GT6E70.ini b/Data/Sys/GameSettings/GT6E70.ini
similarity index 100%
rename from Data/User/GameConfig/GT6E70.ini
rename to Data/Sys/GameSettings/GT6E70.ini
diff --git a/Data/User/GameConfig/GT7E41.ini b/Data/Sys/GameSettings/GT7E41.ini
similarity index 100%
rename from Data/User/GameConfig/GT7E41.ini
rename to Data/Sys/GameSettings/GT7E41.ini
diff --git a/Data/User/GameConfig/GT7P41.ini b/Data/Sys/GameSettings/GT7P41.ini
similarity index 100%
rename from Data/User/GameConfig/GT7P41.ini
rename to Data/Sys/GameSettings/GT7P41.ini
diff --git a/Data/User/GameConfig/GT7X41.ini b/Data/Sys/GameSettings/GT7X41.ini
similarity index 100%
rename from Data/User/GameConfig/GT7X41.ini
rename to Data/Sys/GameSettings/GT7X41.ini
diff --git a/Data/User/GameConfig/GT8E78.ini b/Data/Sys/GameSettings/GT8E78.ini
similarity index 100%
rename from Data/User/GameConfig/GT8E78.ini
rename to Data/Sys/GameSettings/GT8E78.ini
diff --git a/Data/User/GameConfig/GTCJBL.ini b/Data/Sys/GameSettings/GTCJBL.ini
similarity index 100%
rename from Data/User/GameConfig/GTCJBL.ini
rename to Data/Sys/GameSettings/GTCJBL.ini
diff --git a/Data/User/GameConfig/GTEE01.ini b/Data/Sys/GameSettings/GTEE01.ini
similarity index 100%
rename from Data/User/GameConfig/GTEE01.ini
rename to Data/Sys/GameSettings/GTEE01.ini
diff --git a/Data/User/GameConfig/GTEP01.ini b/Data/Sys/GameSettings/GTEP01.ini
similarity index 100%
rename from Data/User/GameConfig/GTEP01.ini
rename to Data/Sys/GameSettings/GTEP01.ini
diff --git a/Data/User/GameConfig/GTFEA4.ini b/Data/Sys/GameSettings/GTFEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GTFEA4.ini
rename to Data/Sys/GameSettings/GTFEA4.ini
diff --git a/Data/User/GameConfig/GTKE51.ini b/Data/Sys/GameSettings/GTKE51.ini
similarity index 100%
rename from Data/User/GameConfig/GTKE51.ini
rename to Data/Sys/GameSettings/GTKE51.ini
diff --git a/Data/User/GameConfig/GTKP51.ini b/Data/Sys/GameSettings/GTKP51.ini
similarity index 100%
rename from Data/User/GameConfig/GTKP51.ini
rename to Data/Sys/GameSettings/GTKP51.ini
diff --git a/Data/User/GameConfig/GTLE52.ini b/Data/Sys/GameSettings/GTLE52.ini
similarity index 100%
rename from Data/User/GameConfig/GTLE52.ini
rename to Data/Sys/GameSettings/GTLE52.ini
diff --git a/Data/User/GameConfig/GTLP52.ini b/Data/Sys/GameSettings/GTLP52.ini
similarity index 100%
rename from Data/User/GameConfig/GTLP52.ini
rename to Data/Sys/GameSettings/GTLP52.ini
diff --git a/Data/User/GameConfig/GTLX52.ini b/Data/Sys/GameSettings/GTLX52.ini
similarity index 100%
rename from Data/User/GameConfig/GTLX52.ini
rename to Data/Sys/GameSettings/GTLX52.ini
diff --git a/Data/User/GameConfig/GTSE4F.ini b/Data/Sys/GameSettings/GTSE4F.ini
similarity index 100%
rename from Data/User/GameConfig/GTSE4F.ini
rename to Data/Sys/GameSettings/GTSE4F.ini
diff --git a/Data/User/GameConfig/GTSP4F.ini b/Data/Sys/GameSettings/GTSP4F.ini
similarity index 100%
rename from Data/User/GameConfig/GTSP4F.ini
rename to Data/Sys/GameSettings/GTSP4F.ini
diff --git a/Data/User/GameConfig/GTUE8G.ini b/Data/Sys/GameSettings/GTUE8G.ini
similarity index 100%
rename from Data/User/GameConfig/GTUE8G.ini
rename to Data/Sys/GameSettings/GTUE8G.ini
diff --git a/Data/User/GameConfig/GTWE70.ini b/Data/Sys/GameSettings/GTWE70.ini
similarity index 100%
rename from Data/User/GameConfig/GTWE70.ini
rename to Data/Sys/GameSettings/GTWE70.ini
diff --git a/Data/User/GameConfig/GTWP70.ini b/Data/Sys/GameSettings/GTWP70.ini
similarity index 100%
rename from Data/User/GameConfig/GTWP70.ini
rename to Data/Sys/GameSettings/GTWP70.ini
diff --git a/Data/User/GameConfig/GTYE69.ini b/Data/Sys/GameSettings/GTYE69.ini
similarity index 100%
rename from Data/User/GameConfig/GTYE69.ini
rename to Data/Sys/GameSettings/GTYE69.ini
diff --git a/Data/User/GameConfig/GTYP69.ini b/Data/Sys/GameSettings/GTYP69.ini
similarity index 100%
rename from Data/User/GameConfig/GTYP69.ini
rename to Data/Sys/GameSettings/GTYP69.ini
diff --git a/Data/User/GameConfig/GTZE41.ini b/Data/Sys/GameSettings/GTZE41.ini
similarity index 100%
rename from Data/User/GameConfig/GTZE41.ini
rename to Data/Sys/GameSettings/GTZE41.ini
diff --git a/Data/User/GameConfig/GTZP41.ini b/Data/Sys/GameSettings/GTZP41.ini
similarity index 100%
rename from Data/User/GameConfig/GTZP41.ini
rename to Data/Sys/GameSettings/GTZP41.ini
diff --git a/Data/User/GameConfig/GUBE69.ini b/Data/Sys/GameSettings/GUBE69.ini
similarity index 100%
rename from Data/User/GameConfig/GUBE69.ini
rename to Data/Sys/GameSettings/GUBE69.ini
diff --git a/Data/User/GameConfig/GUBP69.ini b/Data/Sys/GameSettings/GUBP69.ini
similarity index 100%
rename from Data/User/GameConfig/GUBP69.ini
rename to Data/Sys/GameSettings/GUBP69.ini
diff --git a/Data/User/GameConfig/GUCP69.ini b/Data/Sys/GameSettings/GUCP69.ini
similarity index 100%
rename from Data/User/GameConfig/GUCP69.ini
rename to Data/Sys/GameSettings/GUCP69.ini
diff --git a/Data/User/GameConfig/GUFE4Z.ini b/Data/Sys/GameSettings/GUFE4Z.ini
similarity index 100%
rename from Data/User/GameConfig/GUFE4Z.ini
rename to Data/Sys/GameSettings/GUFE4Z.ini
diff --git a/Data/User/GameConfig/GUGE69.ini b/Data/Sys/GameSettings/GUGE69.ini
similarity index 100%
rename from Data/User/GameConfig/GUGE69.ini
rename to Data/Sys/GameSettings/GUGE69.ini
diff --git a/Data/User/GameConfig/GUME52.ini b/Data/Sys/GameSettings/GUME52.ini
similarity index 100%
rename from Data/User/GameConfig/GUME52.ini
rename to Data/Sys/GameSettings/GUME52.ini
diff --git a/Data/User/GameConfig/GUMP52.ini b/Data/Sys/GameSettings/GUMP52.ini
similarity index 100%
rename from Data/User/GameConfig/GUMP52.ini
rename to Data/Sys/GameSettings/GUMP52.ini
diff --git a/Data/User/GameConfig/GUNE5D.ini b/Data/Sys/GameSettings/GUNE5D.ini
similarity index 100%
rename from Data/User/GameConfig/GUNE5D.ini
rename to Data/Sys/GameSettings/GUNE5D.ini
diff --git a/Data/User/GameConfig/GUPE8P.ini b/Data/Sys/GameSettings/GUPE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GUPE8P.ini
rename to Data/Sys/GameSettings/GUPE8P.ini
diff --git a/Data/User/GameConfig/GUPP8P.ini b/Data/Sys/GameSettings/GUPP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GUPP8P.ini
rename to Data/Sys/GameSettings/GUPP8P.ini
diff --git a/Data/User/GameConfig/GUTE52.ini b/Data/Sys/GameSettings/GUTE52.ini
similarity index 100%
rename from Data/User/GameConfig/GUTE52.ini
rename to Data/Sys/GameSettings/GUTE52.ini
diff --git a/Data/User/GameConfig/GUVE51.ini b/Data/Sys/GameSettings/GUVE51.ini
similarity index 100%
rename from Data/User/GameConfig/GUVE51.ini
rename to Data/Sys/GameSettings/GUVE51.ini
diff --git a/Data/User/GameConfig/GUZE41.ini b/Data/Sys/GameSettings/GUZE41.ini
similarity index 100%
rename from Data/User/GameConfig/GUZE41.ini
rename to Data/Sys/GameSettings/GUZE41.ini
diff --git a/Data/User/GameConfig/GUZP41.ini b/Data/Sys/GameSettings/GUZP41.ini
similarity index 100%
rename from Data/User/GameConfig/GUZP41.ini
rename to Data/Sys/GameSettings/GUZP41.ini
diff --git a/Data/User/GameConfig/GV3E70.ini b/Data/Sys/GameSettings/GV3E70.ini
similarity index 100%
rename from Data/User/GameConfig/GV3E70.ini
rename to Data/Sys/GameSettings/GV3E70.ini
diff --git a/Data/User/GameConfig/GV3P70.ini b/Data/Sys/GameSettings/GV3P70.ini
similarity index 100%
rename from Data/User/GameConfig/GV3P70.ini
rename to Data/Sys/GameSettings/GV3P70.ini
diff --git a/Data/User/GameConfig/GVCE08.ini b/Data/Sys/GameSettings/GVCE08.ini
similarity index 100%
rename from Data/User/GameConfig/GVCE08.ini
rename to Data/Sys/GameSettings/GVCE08.ini
diff --git a/Data/User/GameConfig/GVCP08.ini b/Data/Sys/GameSettings/GVCP08.ini
similarity index 100%
rename from Data/User/GameConfig/GVCP08.ini
rename to Data/Sys/GameSettings/GVCP08.ini
diff --git a/Data/User/GameConfig/GVDE78.ini b/Data/Sys/GameSettings/GVDE78.ini
similarity index 100%
rename from Data/User/GameConfig/GVDE78.ini
rename to Data/Sys/GameSettings/GVDE78.ini
diff --git a/Data/User/GameConfig/GVHE4F.ini b/Data/Sys/GameSettings/GVHE4F.ini
similarity index 100%
rename from Data/User/GameConfig/GVHE4F.ini
rename to Data/Sys/GameSettings/GVHE4F.ini
diff --git a/Data/User/GameConfig/GVJE08.ini b/Data/Sys/GameSettings/GVJE08.ini
similarity index 100%
rename from Data/User/GameConfig/GVJE08.ini
rename to Data/Sys/GameSettings/GVJE08.ini
diff --git a/Data/User/GameConfig/GVJJ08.ini b/Data/Sys/GameSettings/GVJJ08.ini
similarity index 100%
rename from Data/User/GameConfig/GVJJ08.ini
rename to Data/Sys/GameSettings/GVJJ08.ini
diff --git a/Data/User/GameConfig/GVJP08.ini b/Data/Sys/GameSettings/GVJP08.ini
similarity index 100%
rename from Data/User/GameConfig/GVJP08.ini
rename to Data/Sys/GameSettings/GVJP08.ini
diff --git a/Data/User/GameConfig/GVKE52.ini b/Data/Sys/GameSettings/GVKE52.ini
similarity index 100%
rename from Data/User/GameConfig/GVKE52.ini
rename to Data/Sys/GameSettings/GVKE52.ini
diff --git a/Data/User/GameConfig/GVLD69.ini b/Data/Sys/GameSettings/GVLD69.ini
similarity index 100%
rename from Data/User/GameConfig/GVLD69.ini
rename to Data/Sys/GameSettings/GVLD69.ini
diff --git a/Data/User/GameConfig/GVLE69.ini b/Data/Sys/GameSettings/GVLE69.ini
similarity index 100%
rename from Data/User/GameConfig/GVLE69.ini
rename to Data/Sys/GameSettings/GVLE69.ini
diff --git a/Data/User/GameConfig/GVLF69.ini b/Data/Sys/GameSettings/GVLF69.ini
similarity index 100%
rename from Data/User/GameConfig/GVLF69.ini
rename to Data/Sys/GameSettings/GVLF69.ini
diff --git a/Data/User/GameConfig/GVLP69.ini b/Data/Sys/GameSettings/GVLP69.ini
similarity index 100%
rename from Data/User/GameConfig/GVLP69.ini
rename to Data/Sys/GameSettings/GVLP69.ini
diff --git a/Data/User/GameConfig/GVRE7H.ini b/Data/Sys/GameSettings/GVRE7H.ini
similarity index 100%
rename from Data/User/GameConfig/GVRE7H.ini
rename to Data/Sys/GameSettings/GVRE7H.ini
diff --git a/Data/User/GameConfig/GVSE8P.ini b/Data/Sys/GameSettings/GVSE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GVSE8P.ini
rename to Data/Sys/GameSettings/GVSE8P.ini
diff --git a/Data/User/GameConfig/GVSP8P.ini b/Data/Sys/GameSettings/GVSP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GVSP8P.ini
rename to Data/Sys/GameSettings/GVSP8P.ini
diff --git a/Data/User/GameConfig/GW2E78.ini b/Data/Sys/GameSettings/GW2E78.ini
similarity index 100%
rename from Data/User/GameConfig/GW2E78.ini
rename to Data/Sys/GameSettings/GW2E78.ini
diff --git a/Data/User/GameConfig/GW2P78.ini b/Data/Sys/GameSettings/GW2P78.ini
similarity index 100%
rename from Data/User/GameConfig/GW2P78.ini
rename to Data/Sys/GameSettings/GW2P78.ini
diff --git a/Data/User/GameConfig/GW3E78.ini b/Data/Sys/GameSettings/GW3E78.ini
similarity index 100%
rename from Data/User/GameConfig/GW3E78.ini
rename to Data/Sys/GameSettings/GW3E78.ini
diff --git a/Data/User/GameConfig/GW3P78.ini b/Data/Sys/GameSettings/GW3P78.ini
similarity index 100%
rename from Data/User/GameConfig/GW3P78.ini
rename to Data/Sys/GameSettings/GW3P78.ini
diff --git a/Data/User/GameConfig/GW5E69.ini b/Data/Sys/GameSettings/GW5E69.ini
similarity index 100%
rename from Data/User/GameConfig/GW5E69.ini
rename to Data/Sys/GameSettings/GW5E69.ini
diff --git a/Data/User/GameConfig/GW7E69.ini b/Data/Sys/GameSettings/GW7E69.ini
similarity index 100%
rename from Data/User/GameConfig/GW7E69.ini
rename to Data/Sys/GameSettings/GW7E69.ini
diff --git a/Data/User/GameConfig/GW7P69.ini b/Data/Sys/GameSettings/GW7P69.ini
similarity index 100%
rename from Data/User/GameConfig/GW7P69.ini
rename to Data/Sys/GameSettings/GW7P69.ini
diff --git a/Data/User/GameConfig/GW8E52.ini b/Data/Sys/GameSettings/GW8E52.ini
similarity index 100%
rename from Data/User/GameConfig/GW8E52.ini
rename to Data/Sys/GameSettings/GW8E52.ini
diff --git a/Data/User/GameConfig/GW9E78.ini b/Data/Sys/GameSettings/GW9E78.ini
similarity index 100%
rename from Data/User/GameConfig/GW9E78.ini
rename to Data/Sys/GameSettings/GW9E78.ini
diff --git a/Data/User/GameConfig/GWAE8P.ini b/Data/Sys/GameSettings/GWAE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GWAE8P.ini
rename to Data/Sys/GameSettings/GWAE8P.ini
diff --git a/Data/User/GameConfig/GWAF8P.ini b/Data/Sys/GameSettings/GWAF8P.ini
similarity index 100%
rename from Data/User/GameConfig/GWAF8P.ini
rename to Data/Sys/GameSettings/GWAF8P.ini
diff --git a/Data/User/GameConfig/GWAP8P.ini b/Data/Sys/GameSettings/GWAP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GWAP8P.ini
rename to Data/Sys/GameSettings/GWAP8P.ini
diff --git a/Data/User/GameConfig/GWBP41.ini b/Data/Sys/GameSettings/GWBP41.ini
similarity index 100%
rename from Data/User/GameConfig/GWBP41.ini
rename to Data/Sys/GameSettings/GWBP41.ini
diff --git a/Data/User/GameConfig/GWEE51.ini b/Data/Sys/GameSettings/GWEE51.ini
similarity index 100%
rename from Data/User/GameConfig/GWEE51.ini
rename to Data/Sys/GameSettings/GWEE51.ini
diff --git a/Data/User/GameConfig/GWEJB0.ini b/Data/Sys/GameSettings/GWEJB0.ini
similarity index 100%
rename from Data/User/GameConfig/GWEJB0.ini
rename to Data/Sys/GameSettings/GWEJB0.ini
diff --git a/Data/User/GameConfig/GWEP8P.ini b/Data/Sys/GameSettings/GWEP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GWEP8P.ini
rename to Data/Sys/GameSettings/GWEP8P.ini
diff --git a/Data/User/GameConfig/GWGP4F.ini b/Data/Sys/GameSettings/GWGP4F.ini
similarity index 100%
rename from Data/User/GameConfig/GWGP4F.ini
rename to Data/Sys/GameSettings/GWGP4F.ini
diff --git a/Data/User/GameConfig/GWJE52.ini b/Data/Sys/GameSettings/GWJE52.ini
similarity index 98%
rename from Data/User/GameConfig/GWJE52.ini
rename to Data/Sys/GameSettings/GWJE52.ini
index 02db0d617d..a00c124b47 100644
--- a/Data/User/GameConfig/GWJE52.ini
+++ b/Data/Sys/GameSettings/GWJE52.ini
@@ -18,4 +18,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/GWKE41.ini b/Data/Sys/GameSettings/GWKE41.ini
similarity index 100%
rename from Data/User/GameConfig/GWKE41.ini
rename to Data/Sys/GameSettings/GWKE41.ini
diff --git a/Data/User/GameConfig/GWKP41.ini b/Data/Sys/GameSettings/GWKP41.ini
similarity index 100%
rename from Data/User/GameConfig/GWKP41.ini
rename to Data/Sys/GameSettings/GWKP41.ini
diff --git a/Data/User/GameConfig/GWLE6L.ini b/Data/Sys/GameSettings/GWLE6L.ini
similarity index 96%
rename from Data/User/GameConfig/GWLE6L.ini
rename to Data/Sys/GameSettings/GWLE6L.ini
index 9b7610a605..1c0d8321e2 100644
--- a/Data/User/GameConfig/GWLE6L.ini
+++ b/Data/Sys/GameSettings/GWLE6L.ini
@@ -14,7 +14,7 @@ EmulationIssues =
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$Bypass FIFO reset
+$Bypass FIFO reset
 0x8028EF00:dword:0x48000638
 
 [ActionReplay]
diff --git a/Data/User/GameConfig/GWLX6L.ini b/Data/Sys/GameSettings/GWLX6L.ini
similarity index 95%
rename from Data/User/GameConfig/GWLX6L.ini
rename to Data/Sys/GameSettings/GWLX6L.ini
index 835182b36f..45f0910d95 100644
--- a/Data/User/GameConfig/GWLX6L.ini
+++ b/Data/Sys/GameSettings/GWLX6L.ini
@@ -14,7 +14,7 @@ EmulationIssues =
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$Bypass FIFO reset
+$Bypass FIFO reset
 0x8028EE80:dword:0x48000638
 
 [ActionReplay]
diff --git a/Data/User/GameConfig/GWME51.ini b/Data/Sys/GameSettings/GWME51.ini
similarity index 100%
rename from Data/User/GameConfig/GWME51.ini
rename to Data/Sys/GameSettings/GWME51.ini
diff --git a/Data/User/GameConfig/GWOE5G.ini b/Data/Sys/GameSettings/GWOE5G.ini
similarity index 100%
rename from Data/User/GameConfig/GWOE5G.ini
rename to Data/Sys/GameSettings/GWOE5G.ini
diff --git a/Data/User/GameConfig/GWPE78.ini b/Data/Sys/GameSettings/GWPE78.ini
similarity index 100%
rename from Data/User/GameConfig/GWPE78.ini
rename to Data/Sys/GameSettings/GWPE78.ini
diff --git a/Data/User/GameConfig/GWPJG2.ini b/Data/Sys/GameSettings/GWPJG2.ini
similarity index 100%
rename from Data/User/GameConfig/GWPJG2.ini
rename to Data/Sys/GameSettings/GWPJG2.ini
diff --git a/Data/User/GameConfig/GWPP78.ini b/Data/Sys/GameSettings/GWPP78.ini
similarity index 100%
rename from Data/User/GameConfig/GWPP78.ini
rename to Data/Sys/GameSettings/GWPP78.ini
diff --git a/Data/User/GameConfig/GWQE52.ini b/Data/Sys/GameSettings/GWQE52.ini
similarity index 100%
rename from Data/User/GameConfig/GWQE52.ini
rename to Data/Sys/GameSettings/GWQE52.ini
diff --git a/Data/User/GameConfig/GWRE01.ini b/Data/Sys/GameSettings/GWRE01.ini
similarity index 100%
rename from Data/User/GameConfig/GWRE01.ini
rename to Data/Sys/GameSettings/GWRE01.ini
diff --git a/Data/User/GameConfig/GWRP01.ini b/Data/Sys/GameSettings/GWRP01.ini
similarity index 100%
rename from Data/User/GameConfig/GWRP01.ini
rename to Data/Sys/GameSettings/GWRP01.ini
diff --git a/Data/User/GameConfig/GWSEA4.ini b/Data/Sys/GameSettings/GWSEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GWSEA4.ini
rename to Data/Sys/GameSettings/GWSEA4.ini
diff --git a/Data/User/GameConfig/GWTEA4.ini b/Data/Sys/GameSettings/GWTEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GWTEA4.ini
rename to Data/Sys/GameSettings/GWTEA4.ini
diff --git a/Data/User/GameConfig/GWVE52.ini b/Data/Sys/GameSettings/GWVE52.ini
similarity index 100%
rename from Data/User/GameConfig/GWVE52.ini
rename to Data/Sys/GameSettings/GWVE52.ini
diff --git a/Data/User/GameConfig/GWWE01.ini b/Data/Sys/GameSettings/GWWE01.ini
similarity index 100%
rename from Data/User/GameConfig/GWWE01.ini
rename to Data/Sys/GameSettings/GWWE01.ini
diff --git a/Data/User/GameConfig/GWWP01.ini b/Data/Sys/GameSettings/GWWP01.ini
similarity index 100%
rename from Data/User/GameConfig/GWWP01.ini
rename to Data/Sys/GameSettings/GWWP01.ini
diff --git a/Data/User/GameConfig/GWYE41.ini b/Data/Sys/GameSettings/GWYE41.ini
similarity index 100%
rename from Data/User/GameConfig/GWYE41.ini
rename to Data/Sys/GameSettings/GWYE41.ini
diff --git a/Data/User/GameConfig/GWYX41.ini b/Data/Sys/GameSettings/GWYX41.ini
similarity index 100%
rename from Data/User/GameConfig/GWYX41.ini
rename to Data/Sys/GameSettings/GWYX41.ini
diff --git a/Data/User/GameConfig/GWZE01.ini b/Data/Sys/GameSettings/GWZE01.ini
similarity index 100%
rename from Data/User/GameConfig/GWZE01.ini
rename to Data/Sys/GameSettings/GWZE01.ini
diff --git a/Data/User/GameConfig/GWZP01.ini b/Data/Sys/GameSettings/GWZP01.ini
similarity index 100%
rename from Data/User/GameConfig/GWZP01.ini
rename to Data/Sys/GameSettings/GWZP01.ini
diff --git a/Data/User/GameConfig/GX2E52.ini b/Data/Sys/GameSettings/GX2E52.ini
similarity index 100%
rename from Data/User/GameConfig/GX2E52.ini
rename to Data/Sys/GameSettings/GX2E52.ini
diff --git a/Data/User/GameConfig/GX2P52.ini b/Data/Sys/GameSettings/GX2P52.ini
similarity index 100%
rename from Data/User/GameConfig/GX2P52.ini
rename to Data/Sys/GameSettings/GX2P52.ini
diff --git a/Data/User/GameConfig/GX3E41.ini b/Data/Sys/GameSettings/GX3E41.ini
similarity index 100%
rename from Data/User/GameConfig/GX3E41.ini
rename to Data/Sys/GameSettings/GX3E41.ini
diff --git a/Data/User/GameConfig/GX3P41.ini b/Data/Sys/GameSettings/GX3P41.ini
similarity index 100%
rename from Data/User/GameConfig/GX3P41.ini
rename to Data/Sys/GameSettings/GX3P41.ini
diff --git a/Data/User/GameConfig/GX3X41.ini b/Data/Sys/GameSettings/GX3X41.ini
similarity index 100%
rename from Data/User/GameConfig/GX3X41.ini
rename to Data/Sys/GameSettings/GX3X41.ini
diff --git a/Data/User/GameConfig/GXBE69.ini b/Data/Sys/GameSettings/GXBE69.ini
similarity index 100%
rename from Data/User/GameConfig/GXBE69.ini
rename to Data/Sys/GameSettings/GXBE69.ini
diff --git a/Data/User/GameConfig/GXBP69.ini b/Data/Sys/GameSettings/GXBP69.ini
similarity index 100%
rename from Data/User/GameConfig/GXBP69.ini
rename to Data/Sys/GameSettings/GXBP69.ini
diff --git a/Data/User/GameConfig/GXCE01.ini b/Data/Sys/GameSettings/GXCE01.ini
similarity index 100%
rename from Data/User/GameConfig/GXCE01.ini
rename to Data/Sys/GameSettings/GXCE01.ini
diff --git a/Data/User/GameConfig/GXEE8P.ini b/Data/Sys/GameSettings/GXEE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GXEE8P.ini
rename to Data/Sys/GameSettings/GXEE8P.ini
diff --git a/Data/User/GameConfig/GXEP8P.ini b/Data/Sys/GameSettings/GXEP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GXEP8P.ini
rename to Data/Sys/GameSettings/GXEP8P.ini
diff --git a/Data/User/GameConfig/GXFE69.ini b/Data/Sys/GameSettings/GXFE69.ini
similarity index 100%
rename from Data/User/GameConfig/GXFE69.ini
rename to Data/Sys/GameSettings/GXFE69.ini
diff --git a/Data/User/GameConfig/GXFF69.ini b/Data/Sys/GameSettings/GXFF69.ini
similarity index 100%
rename from Data/User/GameConfig/GXFF69.ini
rename to Data/Sys/GameSettings/GXFF69.ini
diff --git a/Data/User/GameConfig/GXFP69.ini b/Data/Sys/GameSettings/GXFP69.ini
similarity index 100%
rename from Data/User/GameConfig/GXFP69.ini
rename to Data/Sys/GameSettings/GXFP69.ini
diff --git a/Data/User/GameConfig/GXGE08.ini b/Data/Sys/GameSettings/GXGE08.ini
similarity index 98%
rename from Data/User/GameConfig/GXGE08.ini
rename to Data/Sys/GameSettings/GXGE08.ini
index 8c65c67c22..b5d46d19f4 100644
--- a/Data/User/GameConfig/GXGE08.ini
+++ b/Data/Sys/GameSettings/GXGE08.ini
@@ -16,6 +16,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/GXLE52.ini b/Data/Sys/GameSettings/GXLE52.ini
similarity index 100%
rename from Data/User/GameConfig/GXLE52.ini
rename to Data/Sys/GameSettings/GXLE52.ini
diff --git a/Data/User/GameConfig/GXLP52.ini b/Data/Sys/GameSettings/GXLP52.ini
similarity index 100%
rename from Data/User/GameConfig/GXLP52.ini
rename to Data/Sys/GameSettings/GXLP52.ini
diff --git a/Data/User/GameConfig/GXME52.ini b/Data/Sys/GameSettings/GXME52.ini
similarity index 100%
rename from Data/User/GameConfig/GXME52.ini
rename to Data/Sys/GameSettings/GXME52.ini
diff --git a/Data/User/GameConfig/GXNE5D.ini b/Data/Sys/GameSettings/GXNE5D.ini
similarity index 100%
rename from Data/User/GameConfig/GXNE5D.ini
rename to Data/Sys/GameSettings/GXNE5D.ini
diff --git a/Data/User/GameConfig/GXOE69.ini b/Data/Sys/GameSettings/GXOE69.ini
similarity index 100%
rename from Data/User/GameConfig/GXOE69.ini
rename to Data/Sys/GameSettings/GXOE69.ini
diff --git a/Data/User/GameConfig/GXOX69.ini b/Data/Sys/GameSettings/GXOX69.ini
similarity index 100%
rename from Data/User/GameConfig/GXOX69.ini
rename to Data/Sys/GameSettings/GXOX69.ini
diff --git a/Data/User/GameConfig/GXRE08.ini b/Data/Sys/GameSettings/GXRE08.ini
similarity index 100%
rename from Data/User/GameConfig/GXRE08.ini
rename to Data/Sys/GameSettings/GXRE08.ini
diff --git a/Data/User/GameConfig/GXSE8P.ini b/Data/Sys/GameSettings/GXSE8P.ini
similarity index 100%
rename from Data/User/GameConfig/GXSE8P.ini
rename to Data/Sys/GameSettings/GXSE8P.ini
diff --git a/Data/User/GameConfig/GXSP8P.ini b/Data/Sys/GameSettings/GXSP8P.ini
similarity index 100%
rename from Data/User/GameConfig/GXSP8P.ini
rename to Data/Sys/GameSettings/GXSP8P.ini
diff --git a/Data/User/GameConfig/GXXE01.ini b/Data/Sys/GameSettings/GXXE01.ini
similarity index 100%
rename from Data/User/GameConfig/GXXE01.ini
rename to Data/Sys/GameSettings/GXXE01.ini
diff --git a/Data/User/GameConfig/GXXP01.ini b/Data/Sys/GameSettings/GXXP01.ini
similarity index 100%
rename from Data/User/GameConfig/GXXP01.ini
rename to Data/Sys/GameSettings/GXXP01.ini
diff --git a/Data/User/GameConfig/GY2E01.ini b/Data/Sys/GameSettings/GY2E01.ini
similarity index 100%
rename from Data/User/GameConfig/GY2E01.ini
rename to Data/Sys/GameSettings/GY2E01.ini
diff --git a/Data/User/GameConfig/GYAE78.ini b/Data/Sys/GameSettings/GYAE78.ini
similarity index 100%
rename from Data/User/GameConfig/GYAE78.ini
rename to Data/Sys/GameSettings/GYAE78.ini
diff --git a/Data/User/GameConfig/GYBP01.ini b/Data/Sys/GameSettings/GYBP01.ini
similarity index 100%
rename from Data/User/GameConfig/GYBP01.ini
rename to Data/Sys/GameSettings/GYBP01.ini
diff --git a/Data/User/GameConfig/GYFEA4.ini b/Data/Sys/GameSettings/GYFEA4.ini
similarity index 100%
rename from Data/User/GameConfig/GYFEA4.ini
rename to Data/Sys/GameSettings/GYFEA4.ini
diff --git a/Data/User/GameConfig/GYKEB2.ini b/Data/Sys/GameSettings/GYKEB2.ini
similarity index 100%
rename from Data/User/GameConfig/GYKEB2.ini
rename to Data/Sys/GameSettings/GYKEB2.ini
diff --git a/Data/User/GameConfig/GYQP01.ini b/Data/Sys/GameSettings/GYQP01.ini
similarity index 100%
rename from Data/User/GameConfig/GYQP01.ini
rename to Data/Sys/GameSettings/GYQP01.ini
diff --git a/Data/User/GameConfig/GYRE41.ini b/Data/Sys/GameSettings/GYRE41.ini
similarity index 100%
rename from Data/User/GameConfig/GYRE41.ini
rename to Data/Sys/GameSettings/GYRE41.ini
diff --git a/Data/User/GameConfig/GYWD41.ini b/Data/Sys/GameSettings/GYWD41.ini
similarity index 100%
rename from Data/User/GameConfig/GYWD41.ini
rename to Data/Sys/GameSettings/GYWD41.ini
diff --git a/Data/User/GameConfig/GYWEE9.ini b/Data/Sys/GameSettings/GYWEE9.ini
similarity index 100%
rename from Data/User/GameConfig/GYWEE9.ini
rename to Data/Sys/GameSettings/GYWEE9.ini
diff --git a/Data/User/GameConfig/GYWP41.ini b/Data/Sys/GameSettings/GYWP41.ini
similarity index 100%
rename from Data/User/GameConfig/GYWP41.ini
rename to Data/Sys/GameSettings/GYWP41.ini
diff --git a/Data/User/GameConfig/GZ2E01.ini b/Data/Sys/GameSettings/GZ2E01.ini
similarity index 100%
rename from Data/User/GameConfig/GZ2E01.ini
rename to Data/Sys/GameSettings/GZ2E01.ini
diff --git a/Data/User/GameConfig/GZ2J01.ini b/Data/Sys/GameSettings/GZ2J01.ini
similarity index 100%
rename from Data/User/GameConfig/GZ2J01.ini
rename to Data/Sys/GameSettings/GZ2J01.ini
diff --git a/Data/User/GameConfig/GZ2P01.ini b/Data/Sys/GameSettings/GZ2P01.ini
similarity index 100%
rename from Data/User/GameConfig/GZ2P01.ini
rename to Data/Sys/GameSettings/GZ2P01.ini
diff --git a/Data/User/GameConfig/GZ3E70.ini b/Data/Sys/GameSettings/GZ3E70.ini
similarity index 100%
rename from Data/User/GameConfig/GZ3E70.ini
rename to Data/Sys/GameSettings/GZ3E70.ini
diff --git a/Data/User/GameConfig/GZ3PB2.ini b/Data/Sys/GameSettings/GZ3PB2.ini
similarity index 100%
rename from Data/User/GameConfig/GZ3PB2.ini
rename to Data/Sys/GameSettings/GZ3PB2.ini
diff --git a/Data/User/GameConfig/GZEE70.ini b/Data/Sys/GameSettings/GZEE70.ini
similarity index 100%
rename from Data/User/GameConfig/GZEE70.ini
rename to Data/Sys/GameSettings/GZEE70.ini
diff --git a/Data/User/GameConfig/GZLE01.ini b/Data/Sys/GameSettings/GZLE01.ini
similarity index 100%
rename from Data/User/GameConfig/GZLE01.ini
rename to Data/Sys/GameSettings/GZLE01.ini
diff --git a/Data/User/GameConfig/GZLJ01.ini b/Data/Sys/GameSettings/GZLJ01.ini
similarity index 100%
rename from Data/User/GameConfig/GZLJ01.ini
rename to Data/Sys/GameSettings/GZLJ01.ini
diff --git a/Data/User/GameConfig/GZLP01.ini b/Data/Sys/GameSettings/GZLP01.ini
similarity index 100%
rename from Data/User/GameConfig/GZLP01.ini
rename to Data/Sys/GameSettings/GZLP01.ini
diff --git a/Data/User/GameConfig/GZMP7D.ini b/Data/Sys/GameSettings/GZMP7D.ini
similarity index 100%
rename from Data/User/GameConfig/GZMP7D.ini
rename to Data/Sys/GameSettings/GZMP7D.ini
diff --git a/Data/User/GameConfig/GZPE70.ini b/Data/Sys/GameSettings/GZPE70.ini
similarity index 100%
rename from Data/User/GameConfig/GZPE70.ini
rename to Data/Sys/GameSettings/GZPE70.ini
diff --git a/Data/User/GameConfig/GZPP70.ini b/Data/Sys/GameSettings/GZPP70.ini
similarity index 100%
rename from Data/User/GameConfig/GZPP70.ini
rename to Data/Sys/GameSettings/GZPP70.ini
diff --git a/Data/User/GameConfig/GZSE70.ini b/Data/Sys/GameSettings/GZSE70.ini
similarity index 100%
rename from Data/User/GameConfig/GZSE70.ini
rename to Data/Sys/GameSettings/GZSE70.ini
diff --git a/Data/User/GameConfig/GZWE01.ini b/Data/Sys/GameSettings/GZWE01.ini
similarity index 100%
rename from Data/User/GameConfig/GZWE01.ini
rename to Data/Sys/GameSettings/GZWE01.ini
diff --git a/Data/User/GameConfig/GZWP01.ini b/Data/Sys/GameSettings/GZWP01.ini
similarity index 100%
rename from Data/User/GameConfig/GZWP01.ini
rename to Data/Sys/GameSettings/GZWP01.ini
diff --git a/Data/User/GameConfig/HAAA01.ini b/Data/Sys/GameSettings/HAAA01.ini
similarity index 100%
rename from Data/User/GameConfig/HAAA01.ini
rename to Data/Sys/GameSettings/HAAA01.ini
diff --git a/Data/User/GameConfig/HACA01.ini b/Data/Sys/GameSettings/HACA01.ini
similarity index 100%
rename from Data/User/GameConfig/HACA01.ini
rename to Data/Sys/GameSettings/HACA01.ini
diff --git a/Data/User/GameConfig/HADE01.ini b/Data/Sys/GameSettings/HADE01.ini
similarity index 100%
rename from Data/User/GameConfig/HADE01.ini
rename to Data/Sys/GameSettings/HADE01.ini
diff --git a/Data/User/GameConfig/HAXXHB.ini b/Data/Sys/GameSettings/HAXXHB.ini
similarity index 100%
rename from Data/User/GameConfig/HAXXHB.ini
rename to Data/Sys/GameSettings/HAXXHB.ini
diff --git a/Data/User/GameConfig/HAYA01.ini b/Data/Sys/GameSettings/HAYA01.ini
similarity index 100%
rename from Data/User/GameConfig/HAYA01.ini
rename to Data/Sys/GameSettings/HAYA01.ini
diff --git a/Data/User/GameConfig/HCFE01.ini b/Data/Sys/GameSettings/HCFE01.ini
similarity index 100%
rename from Data/User/GameConfig/HCFE01.ini
rename to Data/Sys/GameSettings/HCFE01.ini
diff --git a/Data/User/GameConfig/JAAE01.ini b/Data/Sys/GameSettings/JAAE01.ini
similarity index 100%
rename from Data/User/GameConfig/JAAE01.ini
rename to Data/Sys/GameSettings/JAAE01.ini
diff --git a/Data/User/GameConfig/JACP01.ini b/Data/Sys/GameSettings/JACP01.ini
similarity index 100%
rename from Data/User/GameConfig/JACP01.ini
rename to Data/Sys/GameSettings/JACP01.ini
diff --git a/Data/User/GameConfig/JADE01.ini b/Data/Sys/GameSettings/JADE01.ini
similarity index 100%
rename from Data/User/GameConfig/JADE01.ini
rename to Data/Sys/GameSettings/JADE01.ini
diff --git a/Data/User/GameConfig/JAEE01.ini b/Data/Sys/GameSettings/JAEE01.ini
similarity index 98%
rename from Data/User/GameConfig/JAEE01.ini
rename to Data/Sys/GameSettings/JAEE01.ini
index d5cab7b346..405011ff35 100644
--- a/Data/User/GameConfig/JAEE01.ini
+++ b/Data/Sys/GameSettings/JAEE01.ini
@@ -16,6 +16,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/JBKE01.ini b/Data/Sys/GameSettings/JBKE01.ini
similarity index 97%
rename from Data/User/GameConfig/JBKE01.ini
rename to Data/Sys/GameSettings/JBKE01.ini
index 84f693cf41..17841b583d 100644
--- a/Data/User/GameConfig/JBKE01.ini
+++ b/Data/Sys/GameSettings/JBKE01.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
 [Video_Hacks]
diff --git a/Data/User/GameConfig/JBKP01.ini b/Data/Sys/GameSettings/JBKP01.ini
similarity index 100%
rename from Data/User/GameConfig/JBKP01.ini
rename to Data/Sys/GameSettings/JBKP01.ini
diff --git a/Data/User/GameConfig/JCBE01.ini b/Data/Sys/GameSettings/JCBE01.ini
similarity index 97%
rename from Data/User/GameConfig/JCBE01.ini
rename to Data/Sys/GameSettings/JCBE01.ini
index d50d7125b1..fefd63b950 100644
--- a/Data/User/GameConfig/JCBE01.ini
+++ b/Data/Sys/GameSettings/JCBE01.ini
@@ -12,6 +12,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/JCWE01.ini b/Data/Sys/GameSettings/JCWE01.ini
similarity index 96%
rename from Data/User/GameConfig/JCWE01.ini
rename to Data/Sys/GameSettings/JCWE01.ini
index d2cc9084f5..cf0410c0be 100644
--- a/Data/User/GameConfig/JCWE01.ini
+++ b/Data/Sys/GameSettings/JCWE01.ini
@@ -12,4 +12,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/JODIHB.ini b/Data/Sys/GameSettings/JODIHB.ini
similarity index 100%
rename from Data/User/GameConfig/JODIHB.ini
rename to Data/Sys/GameSettings/JODIHB.ini
diff --git a/Data/User/GameConfig/NAAE01.ini b/Data/Sys/GameSettings/NAAE01.ini
similarity index 100%
rename from Data/User/GameConfig/NAAE01.ini
rename to Data/Sys/GameSettings/NAAE01.ini
diff --git a/Data/User/GameConfig/NAAP01.ini b/Data/Sys/GameSettings/NAAP01.ini
similarity index 100%
rename from Data/User/GameConfig/NAAP01.ini
rename to Data/Sys/GameSettings/NAAP01.ini
diff --git a/Data/User/GameConfig/NABE01.ini b/Data/Sys/GameSettings/NABE01.ini
similarity index 98%
rename from Data/User/GameConfig/NABE01.ini
rename to Data/Sys/GameSettings/NABE01.ini
index aeb4d2fd8e..400b022798 100644
--- a/Data/User/GameConfig/NABE01.ini
+++ b/Data/Sys/GameSettings/NABE01.ini
@@ -17,7 +17,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/NACE01.ini b/Data/Sys/GameSettings/NACE01.ini
similarity index 100%
rename from Data/User/GameConfig/NACE01.ini
rename to Data/Sys/GameSettings/NACE01.ini
diff --git a/Data/User/GameConfig/NAEE01.ini b/Data/Sys/GameSettings/NAEE01.ini
similarity index 100%
rename from Data/User/GameConfig/NAEE01.ini
rename to Data/Sys/GameSettings/NAEE01.ini
diff --git a/Data/User/GameConfig/NAFP01.ini b/Data/Sys/GameSettings/NAFP01.ini
similarity index 100%
rename from Data/User/GameConfig/NAFP01.ini
rename to Data/Sys/GameSettings/NAFP01.ini
diff --git a/Data/User/GameConfig/NAHE01.ini b/Data/Sys/GameSettings/NAHE01.ini
similarity index 96%
rename from Data/User/GameConfig/NAHE01.ini
rename to Data/Sys/GameSettings/NAHE01.ini
index 413d20a790..cb50d481dd 100644
--- a/Data/User/GameConfig/NAHE01.ini
+++ b/Data/Sys/GameSettings/NAHE01.ini
@@ -12,6 +12,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/NAKE01.ini b/Data/Sys/GameSettings/NAKE01.ini
similarity index 97%
rename from Data/User/GameConfig/NAKE01.ini
rename to Data/Sys/GameSettings/NAKE01.ini
index d169bc28f6..7ce4540355 100644
--- a/Data/User/GameConfig/NAKE01.ini
+++ b/Data/Sys/GameSettings/NAKE01.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/NAKP01.ini b/Data/Sys/GameSettings/NAKP01.ini
similarity index 100%
rename from Data/User/GameConfig/NAKP01.ini
rename to Data/Sys/GameSettings/NAKP01.ini
diff --git a/Data/User/GameConfig/NANE01.ini b/Data/Sys/GameSettings/NANE01.ini
similarity index 100%
rename from Data/User/GameConfig/NANE01.ini
rename to Data/Sys/GameSettings/NANE01.ini
diff --git a/Data/User/GameConfig/NARP01.ini b/Data/Sys/GameSettings/NARP01.ini
similarity index 100%
rename from Data/User/GameConfig/NARP01.ini
rename to Data/Sys/GameSettings/NARP01.ini
diff --git a/Data/User/GameConfig/PC6E01.ini b/Data/Sys/GameSettings/PC6E01.ini
similarity index 100%
rename from Data/User/GameConfig/PC6E01.ini
rename to Data/Sys/GameSettings/PC6E01.ini
diff --git a/Data/User/GameConfig/PH_PRESETS.ini b/Data/Sys/GameSettings/PH_PRESETS.ini
similarity index 100%
rename from Data/User/GameConfig/PH_PRESETS.ini
rename to Data/Sys/GameSettings/PH_PRESETS.ini
diff --git a/Data/User/GameConfig/PM4E01.ini b/Data/Sys/GameSettings/PM4E01.ini
similarity index 100%
rename from Data/User/GameConfig/PM4E01.ini
rename to Data/Sys/GameSettings/PM4E01.ini
diff --git a/Data/User/GameConfig/PRJE01.ini b/Data/Sys/GameSettings/PRJE01.ini
similarity index 100%
rename from Data/User/GameConfig/PRJE01.ini
rename to Data/Sys/GameSettings/PRJE01.ini
diff --git a/Data/User/GameConfig/PZLE01.ini b/Data/Sys/GameSettings/PZLE01.ini
similarity index 100%
rename from Data/User/GameConfig/PZLE01.ini
rename to Data/Sys/GameSettings/PZLE01.ini
diff --git a/Data/User/GameConfig/PZLJ01.ini b/Data/Sys/GameSettings/PZLJ01.ini
similarity index 100%
rename from Data/User/GameConfig/PZLJ01.ini
rename to Data/Sys/GameSettings/PZLJ01.ini
diff --git a/Data/User/GameConfig/PZLP01.ini b/Data/Sys/GameSettings/PZLP01.ini
similarity index 100%
rename from Data/User/GameConfig/PZLP01.ini
rename to Data/Sys/GameSettings/PZLP01.ini
diff --git a/Data/User/GameConfig/R22E01.ini b/Data/Sys/GameSettings/R22E01.ini
similarity index 100%
rename from Data/User/GameConfig/R22E01.ini
rename to Data/Sys/GameSettings/R22E01.ini
diff --git a/Data/User/GameConfig/R22J01.ini b/Data/Sys/GameSettings/R22J01.ini
similarity index 100%
rename from Data/User/GameConfig/R22J01.ini
rename to Data/Sys/GameSettings/R22J01.ini
diff --git a/Data/User/GameConfig/R22P01.ini b/Data/Sys/GameSettings/R22P01.ini
similarity index 100%
rename from Data/User/GameConfig/R22P01.ini
rename to Data/Sys/GameSettings/R22P01.ini
diff --git a/Data/User/GameConfig/R29P52.ini b/Data/Sys/GameSettings/R29P52.ini
similarity index 100%
rename from Data/User/GameConfig/R29P52.ini
rename to Data/Sys/GameSettings/R29P52.ini
diff --git a/Data/User/GameConfig/R2GEXJ.ini b/Data/Sys/GameSettings/R2GEXJ.ini
similarity index 100%
rename from Data/User/GameConfig/R2GEXJ.ini
rename to Data/Sys/GameSettings/R2GEXJ.ini
diff --git a/Data/User/GameConfig/R2GJAF.ini b/Data/Sys/GameSettings/R2GJAF.ini
similarity index 100%
rename from Data/User/GameConfig/R2GJAF.ini
rename to Data/Sys/GameSettings/R2GJAF.ini
diff --git a/Data/User/GameConfig/R2GP99.ini b/Data/Sys/GameSettings/R2GP99.ini
similarity index 100%
rename from Data/User/GameConfig/R2GP99.ini
rename to Data/Sys/GameSettings/R2GP99.ini
diff --git a/Data/User/GameConfig/R2JJAF.ini b/Data/Sys/GameSettings/R2JJAF.ini
similarity index 100%
rename from Data/User/GameConfig/R2JJAF.ini
rename to Data/Sys/GameSettings/R2JJAF.ini
diff --git a/Data/User/GameConfig/R2KP54.ini b/Data/Sys/GameSettings/R2KP54.ini
similarity index 100%
rename from Data/User/GameConfig/R2KP54.ini
rename to Data/Sys/GameSettings/R2KP54.ini
diff --git a/Data/User/GameConfig/R2TE41.ini b/Data/Sys/GameSettings/R2TE41.ini
similarity index 100%
rename from Data/User/GameConfig/R2TE41.ini
rename to Data/Sys/GameSettings/R2TE41.ini
diff --git a/Data/User/GameConfig/R2UE8P.ini b/Data/Sys/GameSettings/R2UE8P.ini
similarity index 100%
rename from Data/User/GameConfig/R2UE8P.ini
rename to Data/Sys/GameSettings/R2UE8P.ini
diff --git a/Data/User/GameConfig/R2VJ01.ini b/Data/Sys/GameSettings/R2VJ01.ini
similarity index 100%
rename from Data/User/GameConfig/R2VJ01.ini
rename to Data/Sys/GameSettings/R2VJ01.ini
diff --git a/Data/User/GameConfig/R2VP01.ini b/Data/Sys/GameSettings/R2VP01.ini
similarity index 100%
rename from Data/User/GameConfig/R2VP01.ini
rename to Data/Sys/GameSettings/R2VP01.ini
diff --git a/Data/User/GameConfig/R3BE8P.ini b/Data/Sys/GameSettings/R3BE8P.ini
similarity index 100%
rename from Data/User/GameConfig/R3BE8P.ini
rename to Data/Sys/GameSettings/R3BE8P.ini
diff --git a/Data/User/GameConfig/R3BJ8P.ini b/Data/Sys/GameSettings/R3BJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/R3BJ8P.ini
rename to Data/Sys/GameSettings/R3BJ8P.ini
diff --git a/Data/User/GameConfig/R3BP8P.ini b/Data/Sys/GameSettings/R3BP8P.ini
similarity index 100%
rename from Data/User/GameConfig/R3BP8P.ini
rename to Data/Sys/GameSettings/R3BP8P.ini
diff --git a/Data/User/GameConfig/R3CE20.ini b/Data/Sys/GameSettings/R3CE20.ini
similarity index 100%
rename from Data/User/GameConfig/R3CE20.ini
rename to Data/Sys/GameSettings/R3CE20.ini
diff --git a/Data/User/GameConfig/R3DES5.ini b/Data/Sys/GameSettings/R3DES5.ini
similarity index 100%
rename from Data/User/GameConfig/R3DES5.ini
rename to Data/Sys/GameSettings/R3DES5.ini
diff --git a/Data/User/GameConfig/R3DPS5.ini b/Data/Sys/GameSettings/R3DPS5.ini
similarity index 100%
rename from Data/User/GameConfig/R3DPS5.ini
rename to Data/Sys/GameSettings/R3DPS5.ini
diff --git a/Data/User/GameConfig/R3GXUG.ini b/Data/Sys/GameSettings/R3GXUG.ini
similarity index 100%
rename from Data/User/GameConfig/R3GXUG.ini
rename to Data/Sys/GameSettings/R3GXUG.ini
diff --git a/Data/User/GameConfig/R3ME01.ini b/Data/Sys/GameSettings/R3ME01.ini
similarity index 100%
rename from Data/User/GameConfig/R3ME01.ini
rename to Data/Sys/GameSettings/R3ME01.ini
diff --git a/Data/User/GameConfig/R3MP01.ini b/Data/Sys/GameSettings/R3MP01.ini
similarity index 100%
rename from Data/User/GameConfig/R3MP01.ini
rename to Data/Sys/GameSettings/R3MP01.ini
diff --git a/Data/User/GameConfig/R3NEXS.ini b/Data/Sys/GameSettings/R3NEXS.ini
similarity index 100%
rename from Data/User/GameConfig/R3NEXS.ini
rename to Data/Sys/GameSettings/R3NEXS.ini
diff --git a/Data/User/GameConfig/R3NPH3.ini b/Data/Sys/GameSettings/R3NPH3.ini
similarity index 100%
rename from Data/User/GameConfig/R3NPH3.ini
rename to Data/Sys/GameSettings/R3NPH3.ini
diff --git a/Data/User/GameConfig/R3OE01.ini b/Data/Sys/GameSettings/R3OE01.ini
similarity index 100%
rename from Data/User/GameConfig/R3OE01.ini
rename to Data/Sys/GameSettings/R3OE01.ini
diff --git a/Data/User/GameConfig/R3OJ01.ini b/Data/Sys/GameSettings/R3OJ01.ini
similarity index 100%
rename from Data/User/GameConfig/R3OJ01.ini
rename to Data/Sys/GameSettings/R3OJ01.ini
diff --git a/Data/User/GameConfig/R3OP01.ini b/Data/Sys/GameSettings/R3OP01.ini
similarity index 100%
rename from Data/User/GameConfig/R3OP01.ini
rename to Data/Sys/GameSettings/R3OP01.ini
diff --git a/Data/User/GameConfig/R3RE8P.ini b/Data/Sys/GameSettings/R3RE8P.ini
similarity index 98%
rename from Data/User/GameConfig/R3RE8P.ini
rename to Data/Sys/GameSettings/R3RE8P.ini
index 92146e50c6..422735babf 100644
--- a/Data/User/GameConfig/R3RE8P.ini
+++ b/Data/Sys/GameSettings/R3RE8P.ini
@@ -16,7 +16,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/R3RP8P.ini b/Data/Sys/GameSettings/R3RP8P.ini
similarity index 98%
rename from Data/User/GameConfig/R3RP8P.ini
rename to Data/Sys/GameSettings/R3RP8P.ini
index c32c9bc7cf..b49762b0f4 100644
--- a/Data/User/GameConfig/R3RP8P.ini
+++ b/Data/Sys/GameSettings/R3RP8P.ini
@@ -16,7 +16,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/R3SP52.ini b/Data/Sys/GameSettings/R3SP52.ini
similarity index 100%
rename from Data/User/GameConfig/R3SP52.ini
rename to Data/Sys/GameSettings/R3SP52.ini
diff --git a/Data/User/GameConfig/R3TP54.ini b/Data/Sys/GameSettings/R3TP54.ini
similarity index 100%
rename from Data/User/GameConfig/R3TP54.ini
rename to Data/Sys/GameSettings/R3TP54.ini
diff --git a/Data/User/GameConfig/R46ENS.ini b/Data/Sys/GameSettings/R46ENS.ini
similarity index 100%
rename from Data/User/GameConfig/R46ENS.ini
rename to Data/Sys/GameSettings/R46ENS.ini
diff --git a/Data/User/GameConfig/R49P01.ini b/Data/Sys/GameSettings/R49P01.ini
similarity index 100%
rename from Data/User/GameConfig/R49P01.ini
rename to Data/Sys/GameSettings/R49P01.ini
diff --git a/Data/User/GameConfig/R4BPGT.ini b/Data/Sys/GameSettings/R4BPGT.ini
similarity index 100%
rename from Data/User/GameConfig/R4BPGT.ini
rename to Data/Sys/GameSettings/R4BPGT.ini
diff --git a/Data/User/GameConfig/R4EE01.ini b/Data/Sys/GameSettings/R4EE01.ini
similarity index 100%
rename from Data/User/GameConfig/R4EE01.ini
rename to Data/Sys/GameSettings/R4EE01.ini
diff --git a/Data/User/GameConfig/R4EJ01.ini b/Data/Sys/GameSettings/R4EJ01.ini
similarity index 100%
rename from Data/User/GameConfig/R4EJ01.ini
rename to Data/Sys/GameSettings/R4EJ01.ini
diff --git a/Data/User/GameConfig/R4EP01.ini b/Data/Sys/GameSettings/R4EP01.ini
similarity index 100%
rename from Data/User/GameConfig/R4EP01.ini
rename to Data/Sys/GameSettings/R4EP01.ini
diff --git a/Data/User/GameConfig/R4QE01.ini b/Data/Sys/GameSettings/R4QE01.ini
similarity index 100%
rename from Data/User/GameConfig/R4QE01.ini
rename to Data/Sys/GameSettings/R4QE01.ini
diff --git a/Data/User/GameConfig/R4QJ01.ini b/Data/Sys/GameSettings/R4QJ01.ini
similarity index 100%
rename from Data/User/GameConfig/R4QJ01.ini
rename to Data/Sys/GameSettings/R4QJ01.ini
diff --git a/Data/User/GameConfig/R4QK01.ini b/Data/Sys/GameSettings/R4QK01.ini
similarity index 100%
rename from Data/User/GameConfig/R4QK01.ini
rename to Data/Sys/GameSettings/R4QK01.ini
diff --git a/Data/User/GameConfig/R4QP01.ini b/Data/Sys/GameSettings/R4QP01.ini
similarity index 100%
rename from Data/User/GameConfig/R4QP01.ini
rename to Data/Sys/GameSettings/R4QP01.ini
diff --git a/Data/User/GameConfig/R4RP69.ini b/Data/Sys/GameSettings/R4RP69.ini
similarity index 100%
rename from Data/User/GameConfig/R4RP69.ini
rename to Data/Sys/GameSettings/R4RP69.ini
diff --git a/Data/User/GameConfig/R4ZJ01.ini b/Data/Sys/GameSettings/R4ZJ01.ini
similarity index 100%
rename from Data/User/GameConfig/R4ZJ01.ini
rename to Data/Sys/GameSettings/R4ZJ01.ini
diff --git a/Data/User/GameConfig/R5DE5G.ini b/Data/Sys/GameSettings/R5DE5G.ini
similarity index 100%
rename from Data/User/GameConfig/R5DE5G.ini
rename to Data/Sys/GameSettings/R5DE5G.ini
diff --git a/Data/User/GameConfig/R5IE4Q.ini b/Data/Sys/GameSettings/R5IE4Q.ini
similarity index 100%
rename from Data/User/GameConfig/R5IE4Q.ini
rename to Data/Sys/GameSettings/R5IE4Q.ini
diff --git a/Data/User/GameConfig/R5IP4Q.ini b/Data/Sys/GameSettings/R5IP4Q.ini
similarity index 100%
rename from Data/User/GameConfig/R5IP4Q.ini
rename to Data/Sys/GameSettings/R5IP4Q.ini
diff --git a/Data/User/GameConfig/R5IX4Q.ini b/Data/Sys/GameSettings/R5IX4Q.ini
similarity index 100%
rename from Data/User/GameConfig/R5IX4Q.ini
rename to Data/Sys/GameSettings/R5IX4Q.ini
diff --git a/Data/User/GameConfig/R5VE41.ini b/Data/Sys/GameSettings/R5VE41.ini
similarity index 100%
rename from Data/User/GameConfig/R5VE41.ini
rename to Data/Sys/GameSettings/R5VE41.ini
diff --git a/Data/User/GameConfig/R5VP41.ini b/Data/Sys/GameSettings/R5VP41.ini
similarity index 100%
rename from Data/User/GameConfig/R5VP41.ini
rename to Data/Sys/GameSettings/R5VP41.ini
diff --git a/Data/User/GameConfig/R5VX41.ini b/Data/Sys/GameSettings/R5VX41.ini
similarity index 100%
rename from Data/User/GameConfig/R5VX41.ini
rename to Data/Sys/GameSettings/R5VX41.ini
diff --git a/Data/User/GameConfig/R5WEA4.ini b/Data/Sys/GameSettings/R5WEA4.ini
similarity index 100%
rename from Data/User/GameConfig/R5WEA4.ini
rename to Data/Sys/GameSettings/R5WEA4.ini
diff --git a/Data/User/GameConfig/R5WJA4.ini b/Data/Sys/GameSettings/R5WJA4.ini
similarity index 100%
rename from Data/User/GameConfig/R5WJA4.ini
rename to Data/Sys/GameSettings/R5WJA4.ini
diff --git a/Data/User/GameConfig/R64E01.ini b/Data/Sys/GameSettings/R64E01.ini
similarity index 100%
rename from Data/User/GameConfig/R64E01.ini
rename to Data/Sys/GameSettings/R64E01.ini
diff --git a/Data/User/GameConfig/R64J01.ini b/Data/Sys/GameSettings/R64J01.ini
similarity index 100%
rename from Data/User/GameConfig/R64J01.ini
rename to Data/Sys/GameSettings/R64J01.ini
diff --git a/Data/User/GameConfig/R64K01.ini b/Data/Sys/GameSettings/R64K01.ini
similarity index 100%
rename from Data/User/GameConfig/R64K01.ini
rename to Data/Sys/GameSettings/R64K01.ini
diff --git a/Data/User/GameConfig/R64P01.ini b/Data/Sys/GameSettings/R64P01.ini
similarity index 100%
rename from Data/User/GameConfig/R64P01.ini
rename to Data/Sys/GameSettings/R64P01.ini
diff --git a/Data/User/GameConfig/R69E36.ini b/Data/Sys/GameSettings/R69E36.ini
similarity index 100%
rename from Data/User/GameConfig/R69E36.ini
rename to Data/Sys/GameSettings/R69E36.ini
diff --git a/Data/User/GameConfig/R6BE78.ini b/Data/Sys/GameSettings/R6BE78.ini
similarity index 100%
rename from Data/User/GameConfig/R6BE78.ini
rename to Data/Sys/GameSettings/R6BE78.ini
diff --git a/Data/User/GameConfig/R6BJ78.ini b/Data/Sys/GameSettings/R6BJ78.ini
similarity index 100%
rename from Data/User/GameConfig/R6BJ78.ini
rename to Data/Sys/GameSettings/R6BJ78.ini
diff --git a/Data/User/GameConfig/R6BK78.ini b/Data/Sys/GameSettings/R6BK78.ini
similarity index 100%
rename from Data/User/GameConfig/R6BK78.ini
rename to Data/Sys/GameSettings/R6BK78.ini
diff --git a/Data/User/GameConfig/R6BP78.ini b/Data/Sys/GameSettings/R6BP78.ini
similarity index 100%
rename from Data/User/GameConfig/R6BP78.ini
rename to Data/Sys/GameSettings/R6BP78.ini
diff --git a/Data/User/GameConfig/R6BX78.ini b/Data/Sys/GameSettings/R6BX78.ini
similarity index 100%
rename from Data/User/GameConfig/R6BX78.ini
rename to Data/Sys/GameSettings/R6BX78.ini
diff --git a/Data/User/GameConfig/R6NY41.ini b/Data/Sys/GameSettings/R6NY41.ini
similarity index 100%
rename from Data/User/GameConfig/R6NY41.ini
rename to Data/Sys/GameSettings/R6NY41.ini
diff --git a/Data/User/GameConfig/R6TEA4.ini b/Data/Sys/GameSettings/R6TEA4.ini
similarity index 100%
rename from Data/User/GameConfig/R6TEA4.ini
rename to Data/Sys/GameSettings/R6TEA4.ini
diff --git a/Data/User/GameConfig/R6YEXS.ini b/Data/Sys/GameSettings/R6YEXS.ini
similarity index 100%
rename from Data/User/GameConfig/R6YEXS.ini
rename to Data/Sys/GameSettings/R6YEXS.ini
diff --git a/Data/User/GameConfig/R6YPH3.ini b/Data/Sys/GameSettings/R6YPH3.ini
similarity index 100%
rename from Data/User/GameConfig/R6YPH3.ini
rename to Data/Sys/GameSettings/R6YPH3.ini
diff --git a/Data/User/GameConfig/R7EE8P.ini b/Data/Sys/GameSettings/R7EE8P.ini
similarity index 100%
rename from Data/User/GameConfig/R7EE8P.ini
rename to Data/Sys/GameSettings/R7EE8P.ini
diff --git a/Data/User/GameConfig/R7EJ8P.ini b/Data/Sys/GameSettings/R7EJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/R7EJ8P.ini
rename to Data/Sys/GameSettings/R7EJ8P.ini
diff --git a/Data/User/GameConfig/R7EP8P.ini b/Data/Sys/GameSettings/R7EP8P.ini
similarity index 100%
rename from Data/User/GameConfig/R7EP8P.ini
rename to Data/Sys/GameSettings/R7EP8P.ini
diff --git a/Data/User/GameConfig/R7FEGD.ini b/Data/Sys/GameSettings/R7FEGD.ini
similarity index 100%
rename from Data/User/GameConfig/R7FEGD.ini
rename to Data/Sys/GameSettings/R7FEGD.ini
diff --git a/Data/User/GameConfig/R7FJGD.ini b/Data/Sys/GameSettings/R7FJGD.ini
similarity index 100%
rename from Data/User/GameConfig/R7FJGD.ini
rename to Data/Sys/GameSettings/R7FJGD.ini
diff --git a/Data/User/GameConfig/R7FPGD.ini b/Data/Sys/GameSettings/R7FPGD.ini
similarity index 100%
rename from Data/User/GameConfig/R7FPGD.ini
rename to Data/Sys/GameSettings/R7FPGD.ini
diff --git a/Data/User/GameConfig/R7GEAF.ini b/Data/Sys/GameSettings/R7GEAF.ini
similarity index 100%
rename from Data/User/GameConfig/R7GEAF.ini
rename to Data/Sys/GameSettings/R7GEAF.ini
diff --git a/Data/User/GameConfig/R7GJAF.ini b/Data/Sys/GameSettings/R7GJAF.ini
similarity index 100%
rename from Data/User/GameConfig/R7GJAF.ini
rename to Data/Sys/GameSettings/R7GJAF.ini
diff --git a/Data/User/GameConfig/R7GPAF.ini b/Data/Sys/GameSettings/R7GPAF.ini
similarity index 100%
rename from Data/User/GameConfig/R7GPAF.ini
rename to Data/Sys/GameSettings/R7GPAF.ini
diff --git a/Data/User/GameConfig/R7PE01.ini b/Data/Sys/GameSettings/R7PE01.ini
similarity index 98%
rename from Data/User/GameConfig/R7PE01.ini
rename to Data/Sys/GameSettings/R7PE01.ini
index 61af3f2c24..55e049a612 100644
--- a/Data/User/GameConfig/R7PE01.ini
+++ b/Data/Sys/GameSettings/R7PE01.ini
@@ -13,7 +13,7 @@ EmulationIssues = Disable "Use EuRGB60 (PAL60) mode" in the wii configuration ta
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$Patch
+$Patch
 0x8011E0F8:dword:0x4E800020
 
 [ActionReplay]
diff --git a/Data/User/GameConfig/R7PP01.ini b/Data/Sys/GameSettings/R7PP01.ini
similarity index 98%
rename from Data/User/GameConfig/R7PP01.ini
rename to Data/Sys/GameSettings/R7PP01.ini
index dcd66b20f5..ee000f624d 100644
--- a/Data/User/GameConfig/R7PP01.ini
+++ b/Data/Sys/GameSettings/R7PP01.ini
@@ -13,7 +13,7 @@ EmulationStateId = 4
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$Patch
+$Patch
 0x8011F1CC:dword:0x4E800020
 
 [ActionReplay]
diff --git a/Data/User/GameConfig/R7XE69.ini b/Data/Sys/GameSettings/R7XE69.ini
similarity index 100%
rename from Data/User/GameConfig/R7XE69.ini
rename to Data/Sys/GameSettings/R7XE69.ini
diff --git a/Data/User/GameConfig/R7XJ13.ini b/Data/Sys/GameSettings/R7XJ13.ini
similarity index 100%
rename from Data/User/GameConfig/R7XJ13.ini
rename to Data/Sys/GameSettings/R7XJ13.ini
diff --git a/Data/User/GameConfig/R7XP69.ini b/Data/Sys/GameSettings/R7XP69.ini
similarity index 100%
rename from Data/User/GameConfig/R7XP69.ini
rename to Data/Sys/GameSettings/R7XP69.ini
diff --git a/Data/User/GameConfig/R84EE9.ini b/Data/Sys/GameSettings/R84EE9.ini
similarity index 100%
rename from Data/User/GameConfig/R84EE9.ini
rename to Data/Sys/GameSettings/R84EE9.ini
diff --git a/Data/User/GameConfig/R84J99.ini b/Data/Sys/GameSettings/R84J99.ini
similarity index 100%
rename from Data/User/GameConfig/R84J99.ini
rename to Data/Sys/GameSettings/R84J99.ini
diff --git a/Data/User/GameConfig/R84P99.ini b/Data/Sys/GameSettings/R84P99.ini
similarity index 100%
rename from Data/User/GameConfig/R84P99.ini
rename to Data/Sys/GameSettings/R84P99.ini
diff --git a/Data/User/GameConfig/R8AE01.ini b/Data/Sys/GameSettings/R8AE01.ini
similarity index 100%
rename from Data/User/GameConfig/R8AE01.ini
rename to Data/Sys/GameSettings/R8AE01.ini
diff --git a/Data/User/GameConfig/R8AJ01.ini b/Data/Sys/GameSettings/R8AJ01.ini
similarity index 100%
rename from Data/User/GameConfig/R8AJ01.ini
rename to Data/Sys/GameSettings/R8AJ01.ini
diff --git a/Data/User/GameConfig/R8AP01.ini b/Data/Sys/GameSettings/R8AP01.ini
similarity index 100%
rename from Data/User/GameConfig/R8AP01.ini
rename to Data/Sys/GameSettings/R8AP01.ini
diff --git a/Data/User/GameConfig/R8DEA4.ini b/Data/Sys/GameSettings/R8DEA4.ini
similarity index 100%
rename from Data/User/GameConfig/R8DEA4.ini
rename to Data/Sys/GameSettings/R8DEA4.ini
diff --git a/Data/User/GameConfig/R8DJA4.ini b/Data/Sys/GameSettings/R8DJA4.ini
similarity index 100%
rename from Data/User/GameConfig/R8DJA4.ini
rename to Data/Sys/GameSettings/R8DJA4.ini
diff --git a/Data/User/GameConfig/R8DPA4.ini b/Data/Sys/GameSettings/R8DPA4.ini
similarity index 100%
rename from Data/User/GameConfig/R8DPA4.ini
rename to Data/Sys/GameSettings/R8DPA4.ini
diff --git a/Data/User/GameConfig/R8JEWR.ini b/Data/Sys/GameSettings/R8JEWR.ini
similarity index 100%
rename from Data/User/GameConfig/R8JEWR.ini
rename to Data/Sys/GameSettings/R8JEWR.ini
diff --git a/Data/User/GameConfig/R8JPWR.ini b/Data/Sys/GameSettings/R8JPWR.ini
similarity index 100%
rename from Data/User/GameConfig/R8JPWR.ini
rename to Data/Sys/GameSettings/R8JPWR.ini
diff --git a/Data/User/GameConfig/R8LE20.ini b/Data/Sys/GameSettings/R8LE20.ini
similarity index 100%
rename from Data/User/GameConfig/R8LE20.ini
rename to Data/Sys/GameSettings/R8LE20.ini
diff --git a/Data/User/GameConfig/R8LP7J.ini b/Data/Sys/GameSettings/R8LP7J.ini
similarity index 100%
rename from Data/User/GameConfig/R8LP7J.ini
rename to Data/Sys/GameSettings/R8LP7J.ini
diff --git a/Data/User/GameConfig/R8PE01.ini b/Data/Sys/GameSettings/R8PE01.ini
similarity index 100%
rename from Data/User/GameConfig/R8PE01.ini
rename to Data/Sys/GameSettings/R8PE01.ini
diff --git a/Data/User/GameConfig/R8PJ01.ini b/Data/Sys/GameSettings/R8PJ01.ini
similarity index 100%
rename from Data/User/GameConfig/R8PJ01.ini
rename to Data/Sys/GameSettings/R8PJ01.ini
diff --git a/Data/User/GameConfig/R8PK01.ini b/Data/Sys/GameSettings/R8PK01.ini
similarity index 100%
rename from Data/User/GameConfig/R8PK01.ini
rename to Data/Sys/GameSettings/R8PK01.ini
diff --git a/Data/User/GameConfig/R8PP01.ini b/Data/Sys/GameSettings/R8PP01.ini
similarity index 100%
rename from Data/User/GameConfig/R8PP01.ini
rename to Data/Sys/GameSettings/R8PP01.ini
diff --git a/Data/User/GameConfig/R8XE52.ini b/Data/Sys/GameSettings/R8XE52.ini
similarity index 100%
rename from Data/User/GameConfig/R8XE52.ini
rename to Data/Sys/GameSettings/R8XE52.ini
diff --git a/Data/User/GameConfig/R96EAF.ini b/Data/Sys/GameSettings/R96EAF.ini
similarity index 100%
rename from Data/User/GameConfig/R96EAF.ini
rename to Data/Sys/GameSettings/R96EAF.ini
diff --git a/Data/User/GameConfig/R9FP36.ini b/Data/Sys/GameSettings/R9FP36.ini
similarity index 100%
rename from Data/User/GameConfig/R9FP36.ini
rename to Data/Sys/GameSettings/R9FP36.ini
diff --git a/Data/User/GameConfig/R9IE01.ini b/Data/Sys/GameSettings/R9IE01.ini
similarity index 100%
rename from Data/User/GameConfig/R9IE01.ini
rename to Data/Sys/GameSettings/R9IE01.ini
diff --git a/Data/User/GameConfig/RB4E08.ini b/Data/Sys/GameSettings/RB4E08.ini
similarity index 100%
rename from Data/User/GameConfig/RB4E08.ini
rename to Data/Sys/GameSettings/RB4E08.ini
diff --git a/Data/User/GameConfig/RB4P08.ini b/Data/Sys/GameSettings/RB4P08.ini
similarity index 100%
rename from Data/User/GameConfig/RB4P08.ini
rename to Data/Sys/GameSettings/RB4P08.ini
diff --git a/Data/User/GameConfig/RBBE18.ini b/Data/Sys/GameSettings/RBBE18.ini
similarity index 100%
rename from Data/User/GameConfig/RBBE18.ini
rename to Data/Sys/GameSettings/RBBE18.ini
diff --git a/Data/User/GameConfig/RBBJ18.ini b/Data/Sys/GameSettings/RBBJ18.ini
similarity index 100%
rename from Data/User/GameConfig/RBBJ18.ini
rename to Data/Sys/GameSettings/RBBJ18.ini
diff --git a/Data/User/GameConfig/RBBP99.ini b/Data/Sys/GameSettings/RBBP99.ini
similarity index 100%
rename from Data/User/GameConfig/RBBP99.ini
rename to Data/Sys/GameSettings/RBBP99.ini
diff --git a/Data/User/GameConfig/RBHE08.ini b/Data/Sys/GameSettings/RBHE08.ini
similarity index 100%
rename from Data/User/GameConfig/RBHE08.ini
rename to Data/Sys/GameSettings/RBHE08.ini
diff --git a/Data/User/GameConfig/RBHJ08.ini b/Data/Sys/GameSettings/RBHJ08.ini
similarity index 100%
rename from Data/User/GameConfig/RBHJ08.ini
rename to Data/Sys/GameSettings/RBHJ08.ini
diff --git a/Data/User/GameConfig/RBHP08.ini b/Data/Sys/GameSettings/RBHP08.ini
similarity index 100%
rename from Data/User/GameConfig/RBHP08.ini
rename to Data/Sys/GameSettings/RBHP08.ini
diff --git a/Data/User/GameConfig/RBIEE9.ini b/Data/Sys/GameSettings/RBIEE9.ini
similarity index 100%
rename from Data/User/GameConfig/RBIEE9.ini
rename to Data/Sys/GameSettings/RBIEE9.ini
diff --git a/Data/User/GameConfig/RBIJ99.ini b/Data/Sys/GameSettings/RBIJ99.ini
similarity index 100%
rename from Data/User/GameConfig/RBIJ99.ini
rename to Data/Sys/GameSettings/RBIJ99.ini
diff --git a/Data/User/GameConfig/RBIP99.ini b/Data/Sys/GameSettings/RBIP99.ini
similarity index 100%
rename from Data/User/GameConfig/RBIP99.ini
rename to Data/Sys/GameSettings/RBIP99.ini
diff --git a/Data/User/GameConfig/RBKE69.ini b/Data/Sys/GameSettings/RBKE69.ini
similarity index 100%
rename from Data/User/GameConfig/RBKE69.ini
rename to Data/Sys/GameSettings/RBKE69.ini
diff --git a/Data/User/GameConfig/RBME5G.ini b/Data/Sys/GameSettings/RBME5G.ini
similarity index 100%
rename from Data/User/GameConfig/RBME5G.ini
rename to Data/Sys/GameSettings/RBME5G.ini
diff --git a/Data/User/GameConfig/RBQPUG.ini b/Data/Sys/GameSettings/RBQPUG.ini
similarity index 100%
rename from Data/User/GameConfig/RBQPUG.ini
rename to Data/Sys/GameSettings/RBQPUG.ini
diff --git a/Data/User/GameConfig/RBTP8P.ini b/Data/Sys/GameSettings/RBTP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RBTP8P.ini
rename to Data/Sys/GameSettings/RBTP8P.ini
diff --git a/Data/User/GameConfig/RBUE08.ini b/Data/Sys/GameSettings/RBUE08.ini
similarity index 100%
rename from Data/User/GameConfig/RBUE08.ini
rename to Data/Sys/GameSettings/RBUE08.ini
diff --git a/Data/User/GameConfig/RBUP08.ini b/Data/Sys/GameSettings/RBUP08.ini
similarity index 100%
rename from Data/User/GameConfig/RBUP08.ini
rename to Data/Sys/GameSettings/RBUP08.ini
diff --git a/Data/User/GameConfig/RBWE01.ini b/Data/Sys/GameSettings/RBWE01.ini
similarity index 100%
rename from Data/User/GameConfig/RBWE01.ini
rename to Data/Sys/GameSettings/RBWE01.ini
diff --git a/Data/User/GameConfig/RBWJ01.ini b/Data/Sys/GameSettings/RBWJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RBWJ01.ini
rename to Data/Sys/GameSettings/RBWJ01.ini
diff --git a/Data/User/GameConfig/RBWP01.ini b/Data/Sys/GameSettings/RBWP01.ini
similarity index 100%
rename from Data/User/GameConfig/RBWP01.ini
rename to Data/Sys/GameSettings/RBWP01.ini
diff --git a/Data/User/GameConfig/RBXJ8P.ini b/Data/Sys/GameSettings/RBXJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/RBXJ8P.ini
rename to Data/Sys/GameSettings/RBXJ8P.ini
diff --git a/Data/User/GameConfig/RBZXUG.ini b/Data/Sys/GameSettings/RBZXUG.ini
similarity index 100%
rename from Data/User/GameConfig/RBZXUG.ini
rename to Data/Sys/GameSettings/RBZXUG.ini
diff --git a/Data/User/GameConfig/RCJE8P.ini b/Data/Sys/GameSettings/RCJE8P.ini
similarity index 100%
rename from Data/User/GameConfig/RCJE8P.ini
rename to Data/Sys/GameSettings/RCJE8P.ini
diff --git a/Data/User/GameConfig/RCJP8P.ini b/Data/Sys/GameSettings/RCJP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RCJP8P.ini
rename to Data/Sys/GameSettings/RCJP8P.ini
diff --git a/Data/User/GameConfig/RCKPGN.ini b/Data/Sys/GameSettings/RCKPGN.ini
similarity index 100%
rename from Data/User/GameConfig/RCKPGN.ini
rename to Data/Sys/GameSettings/RCKPGN.ini
diff --git a/Data/User/GameConfig/RCPE18.ini b/Data/Sys/GameSettings/RCPE18.ini
similarity index 100%
rename from Data/User/GameConfig/RCPE18.ini
rename to Data/Sys/GameSettings/RCPE18.ini
diff --git a/Data/User/GameConfig/RD2E41.ini b/Data/Sys/GameSettings/RD2E41.ini
similarity index 100%
rename from Data/User/GameConfig/RD2E41.ini
rename to Data/Sys/GameSettings/RD2E41.ini
diff --git a/Data/User/GameConfig/RD2J41.ini b/Data/Sys/GameSettings/RD2J41.ini
similarity index 100%
rename from Data/User/GameConfig/RD2J41.ini
rename to Data/Sys/GameSettings/RD2J41.ini
diff --git a/Data/User/GameConfig/RD2K41.ini b/Data/Sys/GameSettings/RD2K41.ini
similarity index 100%
rename from Data/User/GameConfig/RD2K41.ini
rename to Data/Sys/GameSettings/RD2K41.ini
diff --git a/Data/User/GameConfig/RD2P41.ini b/Data/Sys/GameSettings/RD2P41.ini
similarity index 100%
rename from Data/User/GameConfig/RD2P41.ini
rename to Data/Sys/GameSettings/RD2P41.ini
diff --git a/Data/User/GameConfig/RD2X41.ini b/Data/Sys/GameSettings/RD2X41.ini
similarity index 100%
rename from Data/User/GameConfig/RD2X41.ini
rename to Data/Sys/GameSettings/RD2X41.ini
diff --git a/Data/User/GameConfig/RDBPAF.ini b/Data/Sys/GameSettings/RDBPAF.ini
similarity index 100%
rename from Data/User/GameConfig/RDBPAF.ini
rename to Data/Sys/GameSettings/RDBPAF.ini
diff --git a/Data/User/GameConfig/RDFP41.ini b/Data/Sys/GameSettings/RDFP41.ini
similarity index 100%
rename from Data/User/GameConfig/RDFP41.ini
rename to Data/Sys/GameSettings/RDFP41.ini
diff --git a/Data/User/GameConfig/RDGPA4.ini b/Data/Sys/GameSettings/RDGPA4.ini
similarity index 100%
rename from Data/User/GameConfig/RDGPA4.ini
rename to Data/Sys/GameSettings/RDGPA4.ini
diff --git a/Data/User/GameConfig/RDHP78.ini b/Data/Sys/GameSettings/RDHP78.ini
similarity index 100%
rename from Data/User/GameConfig/RDHP78.ini
rename to Data/Sys/GameSettings/RDHP78.ini
diff --git a/Data/User/GameConfig/RDIE41.ini b/Data/Sys/GameSettings/RDIE41.ini
similarity index 100%
rename from Data/User/GameConfig/RDIE41.ini
rename to Data/Sys/GameSettings/RDIE41.ini
diff --git a/Data/User/GameConfig/RDKE01.ini b/Data/Sys/GameSettings/RDKE01.ini
similarity index 100%
rename from Data/User/GameConfig/RDKE01.ini
rename to Data/Sys/GameSettings/RDKE01.ini
diff --git a/Data/User/GameConfig/RDQEGD.ini b/Data/Sys/GameSettings/RDQEGD.ini
similarity index 100%
rename from Data/User/GameConfig/RDQEGD.ini
rename to Data/Sys/GameSettings/RDQEGD.ini
diff --git a/Data/User/GameConfig/RDSE70.ini b/Data/Sys/GameSettings/RDSE70.ini
similarity index 100%
rename from Data/User/GameConfig/RDSE70.ini
rename to Data/Sys/GameSettings/RDSE70.ini
diff --git a/Data/User/GameConfig/RDSJAF.ini b/Data/Sys/GameSettings/RDSJAF.ini
similarity index 100%
rename from Data/User/GameConfig/RDSJAF.ini
rename to Data/Sys/GameSettings/RDSJAF.ini
diff --git a/Data/User/GameConfig/RDSPAF.ini b/Data/Sys/GameSettings/RDSPAF.ini
similarity index 100%
rename from Data/User/GameConfig/RDSPAF.ini
rename to Data/Sys/GameSettings/RDSPAF.ini
diff --git a/Data/User/GameConfig/RDVE41.ini b/Data/Sys/GameSettings/RDVE41.ini
similarity index 100%
rename from Data/User/GameConfig/RDVE41.ini
rename to Data/Sys/GameSettings/RDVE41.ini
diff --git a/Data/User/GameConfig/RDXP18.ini b/Data/Sys/GameSettings/RDXP18.ini
similarity index 100%
rename from Data/User/GameConfig/RDXP18.ini
rename to Data/Sys/GameSettings/RDXP18.ini
diff --git a/Data/User/GameConfig/RDZJ01.ini b/Data/Sys/GameSettings/RDZJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RDZJ01.ini
rename to Data/Sys/GameSettings/RDZJ01.ini
diff --git a/Data/User/GameConfig/RDZP01.ini b/Data/Sys/GameSettings/RDZP01.ini
similarity index 100%
rename from Data/User/GameConfig/RDZP01.ini
rename to Data/Sys/GameSettings/RDZP01.ini
diff --git a/Data/User/GameConfig/RE4E08.ini b/Data/Sys/GameSettings/RE4E08.ini
similarity index 100%
rename from Data/User/GameConfig/RE4E08.ini
rename to Data/Sys/GameSettings/RE4E08.ini
diff --git a/Data/User/GameConfig/RE4J08.ini b/Data/Sys/GameSettings/RE4J08.ini
similarity index 100%
rename from Data/User/GameConfig/RE4J08.ini
rename to Data/Sys/GameSettings/RE4J08.ini
diff --git a/Data/User/GameConfig/RE4P08.ini b/Data/Sys/GameSettings/RE4P08.ini
similarity index 100%
rename from Data/User/GameConfig/RE4P08.ini
rename to Data/Sys/GameSettings/RE4P08.ini
diff --git a/Data/User/GameConfig/REDE41.ini b/Data/Sys/GameSettings/REDE41.ini
similarity index 100%
rename from Data/User/GameConfig/REDE41.ini
rename to Data/Sys/GameSettings/REDE41.ini
diff --git a/Data/User/GameConfig/REDJ41.ini b/Data/Sys/GameSettings/REDJ41.ini
similarity index 100%
rename from Data/User/GameConfig/REDJ41.ini
rename to Data/Sys/GameSettings/REDJ41.ini
diff --git a/Data/User/GameConfig/REDP41.ini b/Data/Sys/GameSettings/REDP41.ini
similarity index 100%
rename from Data/User/GameConfig/REDP41.ini
rename to Data/Sys/GameSettings/REDP41.ini
diff --git a/Data/User/GameConfig/RELJAB.ini b/Data/Sys/GameSettings/RELJAB.ini
similarity index 96%
rename from Data/User/GameConfig/RELJAB.ini
rename to Data/Sys/GameSettings/RELJAB.ini
index d8ad85b990..08e0560eb5 100644
--- a/Data/User/GameConfig/RELJAB.ini
+++ b/Data/Sys/GameSettings/RELJAB.ini
@@ -12,7 +12,7 @@ EmulationIssues =
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$DI Seed Blanker
+$DI Seed Blanker
 0x80000000:dword:0x00000000
 0x80000004:dword:0x00000000
 0x80000008:dword:0x00000000
diff --git a/Data/User/GameConfig/RELS01.ini b/Data/Sys/GameSettings/RELS01.ini
similarity index 97%
rename from Data/User/GameConfig/RELS01.ini
rename to Data/Sys/GameSettings/RELS01.ini
index 43ee5a4c01..32d3a27c07 100644
--- a/Data/User/GameConfig/RELS01.ini
+++ b/Data/Sys/GameSettings/RELS01.ini
@@ -14,7 +14,7 @@ EmulationIssues =
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$loophack_ZOOT
+$loophack_ZOOT
 0x80683804:word:0x60000000
 $loophack_ZMM
 0x8068C324:word:0x60000000
diff --git a/Data/User/GameConfig/RENE8P.ini b/Data/Sys/GameSettings/RENE8P.ini
similarity index 100%
rename from Data/User/GameConfig/RENE8P.ini
rename to Data/Sys/GameSettings/RENE8P.ini
diff --git a/Data/User/GameConfig/RENJ8P.ini b/Data/Sys/GameSettings/RENJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/RENJ8P.ini
rename to Data/Sys/GameSettings/RENJ8P.ini
diff --git a/Data/User/GameConfig/RENP8P.ini b/Data/Sys/GameSettings/RENP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RENP8P.ini
rename to Data/Sys/GameSettings/RENP8P.ini
diff --git a/Data/User/GameConfig/REXP01.ini b/Data/Sys/GameSettings/REXP01.ini
similarity index 100%
rename from Data/User/GameConfig/REXP01.ini
rename to Data/Sys/GameSettings/REXP01.ini
diff --git a/Data/User/GameConfig/RF4P6M.ini b/Data/Sys/GameSettings/RF4P6M.ini
similarity index 100%
rename from Data/User/GameConfig/RF4P6M.ini
rename to Data/Sys/GameSettings/RF4P6M.ini
diff --git a/Data/User/GameConfig/RF7J08.ini b/Data/Sys/GameSettings/RF7J08.ini
similarity index 100%
rename from Data/User/GameConfig/RF7J08.ini
rename to Data/Sys/GameSettings/RF7J08.ini
diff --git a/Data/User/GameConfig/RFBE01.ini b/Data/Sys/GameSettings/RFBE01.ini
similarity index 100%
rename from Data/User/GameConfig/RFBE01.ini
rename to Data/Sys/GameSettings/RFBE01.ini
diff --git a/Data/User/GameConfig/RFBJ01.ini b/Data/Sys/GameSettings/RFBJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RFBJ01.ini
rename to Data/Sys/GameSettings/RFBJ01.ini
diff --git a/Data/User/GameConfig/RFBP01.ini b/Data/Sys/GameSettings/RFBP01.ini
similarity index 100%
rename from Data/User/GameConfig/RFBP01.ini
rename to Data/Sys/GameSettings/RFBP01.ini
diff --git a/Data/User/GameConfig/RFCEGD.ini b/Data/Sys/GameSettings/RFCEGD.ini
similarity index 100%
rename from Data/User/GameConfig/RFCEGD.ini
rename to Data/Sys/GameSettings/RFCEGD.ini
diff --git a/Data/User/GameConfig/RFCJGD.ini b/Data/Sys/GameSettings/RFCJGD.ini
similarity index 100%
rename from Data/User/GameConfig/RFCJGD.ini
rename to Data/Sys/GameSettings/RFCJGD.ini
diff --git a/Data/User/GameConfig/RFCPGD.ini b/Data/Sys/GameSettings/RFCPGD.ini
similarity index 100%
rename from Data/User/GameConfig/RFCPGD.ini
rename to Data/Sys/GameSettings/RFCPGD.ini
diff --git a/Data/User/GameConfig/RFEE01.ini b/Data/Sys/GameSettings/RFEE01.ini
similarity index 100%
rename from Data/User/GameConfig/RFEE01.ini
rename to Data/Sys/GameSettings/RFEE01.ini
diff --git a/Data/User/GameConfig/RFEJ01.ini b/Data/Sys/GameSettings/RFEJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RFEJ01.ini
rename to Data/Sys/GameSettings/RFEJ01.ini
diff --git a/Data/User/GameConfig/RFEP01.ini b/Data/Sys/GameSettings/RFEP01.ini
similarity index 100%
rename from Data/User/GameConfig/RFEP01.ini
rename to Data/Sys/GameSettings/RFEP01.ini
diff --git a/Data/User/GameConfig/RFFEGD.ini b/Data/Sys/GameSettings/RFFEGD.ini
similarity index 100%
rename from Data/User/GameConfig/RFFEGD.ini
rename to Data/Sys/GameSettings/RFFEGD.ini
diff --git a/Data/User/GameConfig/RFFJGD.ini b/Data/Sys/GameSettings/RFFJGD.ini
similarity index 100%
rename from Data/User/GameConfig/RFFJGD.ini
rename to Data/Sys/GameSettings/RFFJGD.ini
diff --git a/Data/User/GameConfig/RFFPGD.ini b/Data/Sys/GameSettings/RFFPGD.ini
similarity index 100%
rename from Data/User/GameConfig/RFFPGD.ini
rename to Data/Sys/GameSettings/RFFPGD.ini
diff --git a/Data/User/GameConfig/RFQP69.ini b/Data/Sys/GameSettings/RFQP69.ini
similarity index 100%
rename from Data/User/GameConfig/RFQP69.ini
rename to Data/Sys/GameSettings/RFQP69.ini
diff --git a/Data/User/GameConfig/RFSEEB.ini b/Data/Sys/GameSettings/RFSEEB.ini
similarity index 100%
rename from Data/User/GameConfig/RFSEEB.ini
rename to Data/Sys/GameSettings/RFSEEB.ini
diff --git a/Data/User/GameConfig/RFSJ8P.ini b/Data/Sys/GameSettings/RFSJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/RFSJ8P.ini
rename to Data/Sys/GameSettings/RFSJ8P.ini
diff --git a/Data/User/GameConfig/RG5PWR.ini b/Data/Sys/GameSettings/RG5PWR.ini
similarity index 100%
rename from Data/User/GameConfig/RG5PWR.ini
rename to Data/Sys/GameSettings/RG5PWR.ini
diff --git a/Data/User/GameConfig/RGAE8P.ini b/Data/Sys/GameSettings/RGAE8P.ini
similarity index 100%
rename from Data/User/GameConfig/RGAE8P.ini
rename to Data/Sys/GameSettings/RGAE8P.ini
diff --git a/Data/User/GameConfig/RGHE52.ini b/Data/Sys/GameSettings/RGHE52.ini
similarity index 100%
rename from Data/User/GameConfig/RGHE52.ini
rename to Data/Sys/GameSettings/RGHE52.ini
diff --git a/Data/User/GameConfig/RGLE7D.ini b/Data/Sys/GameSettings/RGLE7D.ini
similarity index 100%
rename from Data/User/GameConfig/RGLE7D.ini
rename to Data/Sys/GameSettings/RGLE7D.ini
diff --git a/Data/User/GameConfig/RGQE70.ini b/Data/Sys/GameSettings/RGQE70.ini
similarity index 97%
rename from Data/User/GameConfig/RGQE70.ini
rename to Data/Sys/GameSettings/RGQE70.ini
index 1a0fa42946..15954f207f 100644
--- a/Data/User/GameConfig/RGQE70.ini
+++ b/Data/Sys/GameSettings/RGQE70.ini
@@ -13,7 +13,7 @@ EmulationStateId = 4
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$crashfix
+$crashfix
 0x8006935C:dword:0x60000000
 
 [ActionReplay]
diff --git a/Data/User/GameConfig/RGVP52.ini b/Data/Sys/GameSettings/RGVP52.ini
similarity index 100%
rename from Data/User/GameConfig/RGVP52.ini
rename to Data/Sys/GameSettings/RGVP52.ini
diff --git a/Data/User/GameConfig/RH2P41.ini b/Data/Sys/GameSettings/RH2P41.ini
similarity index 100%
rename from Data/User/GameConfig/RH2P41.ini
rename to Data/Sys/GameSettings/RH2P41.ini
diff --git a/Data/User/GameConfig/RH8E4F.ini b/Data/Sys/GameSettings/RH8E4F.ini
similarity index 100%
rename from Data/User/GameConfig/RH8E4F.ini
rename to Data/Sys/GameSettings/RH8E4F.ini
diff --git a/Data/User/GameConfig/RH8JEL.ini b/Data/Sys/GameSettings/RH8JEL.ini
similarity index 100%
rename from Data/User/GameConfig/RH8JEL.ini
rename to Data/Sys/GameSettings/RH8JEL.ini
diff --git a/Data/User/GameConfig/RH8P4F.ini b/Data/Sys/GameSettings/RH8P4F.ini
similarity index 100%
rename from Data/User/GameConfig/RH8P4F.ini
rename to Data/Sys/GameSettings/RH8P4F.ini
diff --git a/Data/User/GameConfig/RH8X4F.ini b/Data/Sys/GameSettings/RH8X4F.ini
similarity index 100%
rename from Data/User/GameConfig/RH8X4F.ini
rename to Data/Sys/GameSettings/RH8X4F.ini
diff --git a/Data/User/GameConfig/RHAE01.ini b/Data/Sys/GameSettings/RHAE01.ini
similarity index 100%
rename from Data/User/GameConfig/RHAE01.ini
rename to Data/Sys/GameSettings/RHAE01.ini
diff --git a/Data/User/GameConfig/RHAJ01.ini b/Data/Sys/GameSettings/RHAJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RHAJ01.ini
rename to Data/Sys/GameSettings/RHAJ01.ini
diff --git a/Data/User/GameConfig/RHAK01.ini b/Data/Sys/GameSettings/RHAK01.ini
similarity index 100%
rename from Data/User/GameConfig/RHAK01.ini
rename to Data/Sys/GameSettings/RHAK01.ini
diff --git a/Data/User/GameConfig/RHAP01.ini b/Data/Sys/GameSettings/RHAP01.ini
similarity index 100%
rename from Data/User/GameConfig/RHAP01.ini
rename to Data/Sys/GameSettings/RHAP01.ini
diff --git a/Data/User/GameConfig/RHAW01.ini b/Data/Sys/GameSettings/RHAW01.ini
similarity index 100%
rename from Data/User/GameConfig/RHAW01.ini
rename to Data/Sys/GameSettings/RHAW01.ini
diff --git a/Data/User/GameConfig/RHDE8P.ini b/Data/Sys/GameSettings/RHDE8P.ini
similarity index 100%
rename from Data/User/GameConfig/RHDE8P.ini
rename to Data/Sys/GameSettings/RHDE8P.ini
diff --git a/Data/User/GameConfig/RHDJ8P.ini b/Data/Sys/GameSettings/RHDJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/RHDJ8P.ini
rename to Data/Sys/GameSettings/RHDJ8P.ini
diff --git a/Data/User/GameConfig/RHDP8P.ini b/Data/Sys/GameSettings/RHDP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RHDP8P.ini
rename to Data/Sys/GameSettings/RHDP8P.ini
diff --git a/Data/User/GameConfig/RHMEE9.ini b/Data/Sys/GameSettings/RHMEE9.ini
similarity index 100%
rename from Data/User/GameConfig/RHMEE9.ini
rename to Data/Sys/GameSettings/RHMEE9.ini
diff --git a/Data/User/GameConfig/RHMP99.ini b/Data/Sys/GameSettings/RHMP99.ini
similarity index 100%
rename from Data/User/GameConfig/RHMP99.ini
rename to Data/Sys/GameSettings/RHMP99.ini
diff --git a/Data/User/GameConfig/RHOE8P.ini b/Data/Sys/GameSettings/RHOE8P.ini
similarity index 100%
rename from Data/User/GameConfig/RHOE8P.ini
rename to Data/Sys/GameSettings/RHOE8P.ini
diff --git a/Data/User/GameConfig/RHOJ8P.ini b/Data/Sys/GameSettings/RHOJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/RHOJ8P.ini
rename to Data/Sys/GameSettings/RHOJ8P.ini
diff --git a/Data/User/GameConfig/RHOP8P.ini b/Data/Sys/GameSettings/RHOP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RHOP8P.ini
rename to Data/Sys/GameSettings/RHOP8P.ini
diff --git a/Data/User/GameConfig/RHTP54.ini b/Data/Sys/GameSettings/RHTP54.ini
similarity index 100%
rename from Data/User/GameConfig/RHTP54.ini
rename to Data/Sys/GameSettings/RHTP54.ini
diff --git a/Data/User/GameConfig/RHUP7J.ini b/Data/Sys/GameSettings/RHUP7J.ini
similarity index 100%
rename from Data/User/GameConfig/RHUP7J.ini
rename to Data/Sys/GameSettings/RHUP7J.ini
diff --git a/Data/User/GameConfig/RIBPKM.ini b/Data/Sys/GameSettings/RIBPKM.ini
similarity index 100%
rename from Data/User/GameConfig/RIBPKM.ini
rename to Data/Sys/GameSettings/RIBPKM.ini
diff --git a/Data/User/GameConfig/RIHP8P.ini b/Data/Sys/GameSettings/RIHP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RIHP8P.ini
rename to Data/Sys/GameSettings/RIHP8P.ini
diff --git a/Data/User/GameConfig/RIJE69.ini b/Data/Sys/GameSettings/RIJE69.ini
similarity index 100%
rename from Data/User/GameConfig/RIJE69.ini
rename to Data/Sys/GameSettings/RIJE69.ini
diff --git a/Data/User/GameConfig/RINE08.ini b/Data/Sys/GameSettings/RINE08.ini
similarity index 100%
rename from Data/User/GameConfig/RINE08.ini
rename to Data/Sys/GameSettings/RINE08.ini
diff --git a/Data/User/GameConfig/RINP08.ini b/Data/Sys/GameSettings/RINP08.ini
similarity index 100%
rename from Data/User/GameConfig/RINP08.ini
rename to Data/Sys/GameSettings/RINP08.ini
diff --git a/Data/User/GameConfig/RIPEAF.ini b/Data/Sys/GameSettings/RIPEAF.ini
similarity index 100%
rename from Data/User/GameConfig/RIPEAF.ini
rename to Data/Sys/GameSettings/RIPEAF.ini
diff --git a/Data/User/GameConfig/RIPJAF.ini b/Data/Sys/GameSettings/RIPJAF.ini
similarity index 100%
rename from Data/User/GameConfig/RIPJAF.ini
rename to Data/Sys/GameSettings/RIPJAF.ini
diff --git a/Data/User/GameConfig/RIPPAF.ini b/Data/Sys/GameSettings/RIPPAF.ini
similarity index 100%
rename from Data/User/GameConfig/RIPPAF.ini
rename to Data/Sys/GameSettings/RIPPAF.ini
diff --git a/Data/User/GameConfig/RIUJAF.ini b/Data/Sys/GameSettings/RIUJAF.ini
similarity index 100%
rename from Data/User/GameConfig/RIUJAF.ini
rename to Data/Sys/GameSettings/RIUJAF.ini
diff --git a/Data/User/GameConfig/RIUPAF.ini b/Data/Sys/GameSettings/RIUPAF.ini
similarity index 100%
rename from Data/User/GameConfig/RIUPAF.ini
rename to Data/Sys/GameSettings/RIUPAF.ini
diff --git a/Data/User/GameConfig/RIVEXJ.ini b/Data/Sys/GameSettings/RIVEXJ.ini
similarity index 100%
rename from Data/User/GameConfig/RIVEXJ.ini
rename to Data/Sys/GameSettings/RIVEXJ.ini
diff --git a/Data/User/GameConfig/RJ3P7J.ini b/Data/Sys/GameSettings/RJ3P7J.ini
similarity index 100%
rename from Data/User/GameConfig/RJ3P7J.ini
rename to Data/Sys/GameSettings/RJ3P7J.ini
diff --git a/Data/User/GameConfig/RJAP52.ini b/Data/Sys/GameSettings/RJAP52.ini
similarity index 100%
rename from Data/User/GameConfig/RJAP52.ini
rename to Data/Sys/GameSettings/RJAP52.ini
diff --git a/Data/User/GameConfig/RJCP52.ini b/Data/Sys/GameSettings/RJCP52.ini
similarity index 100%
rename from Data/User/GameConfig/RJCP52.ini
rename to Data/Sys/GameSettings/RJCP52.ini
diff --git a/Data/User/GameConfig/RJSXUG.ini b/Data/Sys/GameSettings/RJSXUG.ini
similarity index 100%
rename from Data/User/GameConfig/RJSXUG.ini
rename to Data/Sys/GameSettings/RJSXUG.ini
diff --git a/Data/User/GameConfig/RK2EEB.ini b/Data/Sys/GameSettings/RK2EEB.ini
similarity index 100%
rename from Data/User/GameConfig/RK2EEB.ini
rename to Data/Sys/GameSettings/RK2EEB.ini
diff --git a/Data/User/GameConfig/RK2JEB.ini b/Data/Sys/GameSettings/RK2JEB.ini
similarity index 100%
rename from Data/User/GameConfig/RK2JEB.ini
rename to Data/Sys/GameSettings/RK2JEB.ini
diff --git a/Data/User/GameConfig/RK2P01.ini b/Data/Sys/GameSettings/RK2P01.ini
similarity index 100%
rename from Data/User/GameConfig/RK2P01.ini
rename to Data/Sys/GameSettings/RK2P01.ini
diff --git a/Data/User/GameConfig/RK5E01.ini b/Data/Sys/GameSettings/RK5E01.ini
similarity index 100%
rename from Data/User/GameConfig/RK5E01.ini
rename to Data/Sys/GameSettings/RK5E01.ini
diff --git a/Data/User/GameConfig/RKDEEB.ini b/Data/Sys/GameSettings/RKDEEB.ini
similarity index 100%
rename from Data/User/GameConfig/RKDEEB.ini
rename to Data/Sys/GameSettings/RKDEEB.ini
diff --git a/Data/User/GameConfig/RKDJEB.ini b/Data/Sys/GameSettings/RKDJEB.ini
similarity index 100%
rename from Data/User/GameConfig/RKDJEB.ini
rename to Data/Sys/GameSettings/RKDJEB.ini
diff --git a/Data/User/GameConfig/RKDP01.ini b/Data/Sys/GameSettings/RKDP01.ini
similarity index 100%
rename from Data/User/GameConfig/RKDP01.ini
rename to Data/Sys/GameSettings/RKDP01.ini
diff --git a/Data/User/GameConfig/RKDPEB.ini b/Data/Sys/GameSettings/RKDPEB.ini
similarity index 100%
rename from Data/User/GameConfig/RKDPEB.ini
rename to Data/Sys/GameSettings/RKDPEB.ini
diff --git a/Data/User/GameConfig/RKIPUG.ini b/Data/Sys/GameSettings/RKIPUG.ini
similarity index 100%
rename from Data/User/GameConfig/RKIPUG.ini
rename to Data/Sys/GameSettings/RKIPUG.ini
diff --git a/Data/User/GameConfig/RKMP5D.ini b/Data/Sys/GameSettings/RKMP5D.ini
similarity index 100%
rename from Data/User/GameConfig/RKMP5D.ini
rename to Data/Sys/GameSettings/RKMP5D.ini
diff --git a/Data/User/GameConfig/RKSPUG.ini b/Data/Sys/GameSettings/RKSPUG.ini
similarity index 100%
rename from Data/User/GameConfig/RKSPUG.ini
rename to Data/Sys/GameSettings/RKSPUG.ini
diff --git a/Data/User/GameConfig/RLBEWR.ini b/Data/Sys/GameSettings/RLBEWR.ini
similarity index 100%
rename from Data/User/GameConfig/RLBEWR.ini
rename to Data/Sys/GameSettings/RLBEWR.ini
diff --git a/Data/User/GameConfig/RLEEFS.ini b/Data/Sys/GameSettings/RLEEFS.ini
similarity index 100%
rename from Data/User/GameConfig/RLEEFS.ini
rename to Data/Sys/GameSettings/RLEEFS.ini
diff --git a/Data/User/GameConfig/RLGE64.ini b/Data/Sys/GameSettings/RLGE64.ini
similarity index 100%
rename from Data/User/GameConfig/RLGE64.ini
rename to Data/Sys/GameSettings/RLGE64.ini
diff --git a/Data/User/GameConfig/RLGJ52.ini b/Data/Sys/GameSettings/RLGJ52.ini
similarity index 100%
rename from Data/User/GameConfig/RLGJ52.ini
rename to Data/Sys/GameSettings/RLGJ52.ini
diff --git a/Data/User/GameConfig/RLGP64.ini b/Data/Sys/GameSettings/RLGP64.ini
similarity index 100%
rename from Data/User/GameConfig/RLGP64.ini
rename to Data/Sys/GameSettings/RLGP64.ini
diff --git a/Data/User/GameConfig/RLJPKM.ini b/Data/Sys/GameSettings/RLJPKM.ini
similarity index 100%
rename from Data/User/GameConfig/RLJPKM.ini
rename to Data/Sys/GameSettings/RLJPKM.ini
diff --git a/Data/User/GameConfig/RLXEMJ.ini b/Data/Sys/GameSettings/RLXEMJ.ini
similarity index 100%
rename from Data/User/GameConfig/RLXEMJ.ini
rename to Data/Sys/GameSettings/RLXEMJ.ini
diff --git a/Data/User/GameConfig/RM2E69.ini b/Data/Sys/GameSettings/RM2E69.ini
similarity index 100%
rename from Data/User/GameConfig/RM2E69.ini
rename to Data/Sys/GameSettings/RM2E69.ini
diff --git a/Data/User/GameConfig/RM3E01.ini b/Data/Sys/GameSettings/RM3E01.ini
similarity index 100%
rename from Data/User/GameConfig/RM3E01.ini
rename to Data/Sys/GameSettings/RM3E01.ini
diff --git a/Data/User/GameConfig/RM3J01.ini b/Data/Sys/GameSettings/RM3J01.ini
similarity index 100%
rename from Data/User/GameConfig/RM3J01.ini
rename to Data/Sys/GameSettings/RM3J01.ini
diff --git a/Data/User/GameConfig/RM3P01.ini b/Data/Sys/GameSettings/RM3P01.ini
similarity index 100%
rename from Data/User/GameConfig/RM3P01.ini
rename to Data/Sys/GameSettings/RM3P01.ini
diff --git a/Data/User/GameConfig/RM6EEB.ini b/Data/Sys/GameSettings/RM6EEB.ini
similarity index 100%
rename from Data/User/GameConfig/RM6EEB.ini
rename to Data/Sys/GameSettings/RM6EEB.ini
diff --git a/Data/User/GameConfig/RM8E01.ini b/Data/Sys/GameSettings/RM8E01.ini
similarity index 100%
rename from Data/User/GameConfig/RM8E01.ini
rename to Data/Sys/GameSettings/RM8E01.ini
diff --git a/Data/User/GameConfig/RM8J01.ini b/Data/Sys/GameSettings/RM8J01.ini
similarity index 100%
rename from Data/User/GameConfig/RM8J01.ini
rename to Data/Sys/GameSettings/RM8J01.ini
diff --git a/Data/User/GameConfig/RM8K01.ini b/Data/Sys/GameSettings/RM8K01.ini
similarity index 100%
rename from Data/User/GameConfig/RM8K01.ini
rename to Data/Sys/GameSettings/RM8K01.ini
diff --git a/Data/User/GameConfig/RM8P01.ini b/Data/Sys/GameSettings/RM8P01.ini
similarity index 100%
rename from Data/User/GameConfig/RM8P01.ini
rename to Data/Sys/GameSettings/RM8P01.ini
diff --git a/Data/User/GameConfig/RMAE01.ini b/Data/Sys/GameSettings/RMAE01.ini
similarity index 100%
rename from Data/User/GameConfig/RMAE01.ini
rename to Data/Sys/GameSettings/RMAE01.ini
diff --git a/Data/User/GameConfig/RMAP01.ini b/Data/Sys/GameSettings/RMAP01.ini
similarity index 100%
rename from Data/User/GameConfig/RMAP01.ini
rename to Data/Sys/GameSettings/RMAP01.ini
diff --git a/Data/User/GameConfig/RMCE01.ini b/Data/Sys/GameSettings/RMCE01.ini
similarity index 100%
rename from Data/User/GameConfig/RMCE01.ini
rename to Data/Sys/GameSettings/RMCE01.ini
diff --git a/Data/User/GameConfig/RMCJ01.ini b/Data/Sys/GameSettings/RMCJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RMCJ01.ini
rename to Data/Sys/GameSettings/RMCJ01.ini
diff --git a/Data/User/GameConfig/RMCK01.ini b/Data/Sys/GameSettings/RMCK01.ini
similarity index 100%
rename from Data/User/GameConfig/RMCK01.ini
rename to Data/Sys/GameSettings/RMCK01.ini
diff --git a/Data/User/GameConfig/RMCP01.ini b/Data/Sys/GameSettings/RMCP01.ini
similarity index 100%
rename from Data/User/GameConfig/RMCP01.ini
rename to Data/Sys/GameSettings/RMCP01.ini
diff --git a/Data/User/GameConfig/RMGE01.ini b/Data/Sys/GameSettings/RMGE01.ini
similarity index 100%
rename from Data/User/GameConfig/RMGE01.ini
rename to Data/Sys/GameSettings/RMGE01.ini
diff --git a/Data/User/GameConfig/RMGJ01.ini b/Data/Sys/GameSettings/RMGJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RMGJ01.ini
rename to Data/Sys/GameSettings/RMGJ01.ini
diff --git a/Data/User/GameConfig/RMGK01.ini b/Data/Sys/GameSettings/RMGK01.ini
similarity index 100%
rename from Data/User/GameConfig/RMGK01.ini
rename to Data/Sys/GameSettings/RMGK01.ini
diff --git a/Data/User/GameConfig/RMGP01.ini b/Data/Sys/GameSettings/RMGP01.ini
similarity index 100%
rename from Data/User/GameConfig/RMGP01.ini
rename to Data/Sys/GameSettings/RMGP01.ini
diff --git a/Data/User/GameConfig/RMHE08.ini b/Data/Sys/GameSettings/RMHE08.ini
similarity index 98%
rename from Data/User/GameConfig/RMHE08.ini
rename to Data/Sys/GameSettings/RMHE08.ini
index 98bbab0d30..e968f2045d 100644
--- a/Data/User/GameConfig/RMHE08.ini
+++ b/Data/Sys/GameSettings/RMHE08.ini
@@ -14,7 +14,7 @@ EmulationStateId = 4
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$Bloom OFF
+$Bloom OFF
 0x04056FF4:dword:0xC022FFE4
 0x0479DA84:dword:0x3F800000
 
diff --git a/Data/User/GameConfig/RMHJ08.ini b/Data/Sys/GameSettings/RMHJ08.ini
similarity index 100%
rename from Data/User/GameConfig/RMHJ08.ini
rename to Data/Sys/GameSettings/RMHJ08.ini
diff --git a/Data/User/GameConfig/RMHP08.ini b/Data/Sys/GameSettings/RMHP08.ini
similarity index 100%
rename from Data/User/GameConfig/RMHP08.ini
rename to Data/Sys/GameSettings/RMHP08.ini
diff --git a/Data/User/GameConfig/RMKE01.ini b/Data/Sys/GameSettings/RMKE01.ini
similarity index 100%
rename from Data/User/GameConfig/RMKE01.ini
rename to Data/Sys/GameSettings/RMKE01.ini
diff --git a/Data/User/GameConfig/RMKJ01.ini b/Data/Sys/GameSettings/RMKJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RMKJ01.ini
rename to Data/Sys/GameSettings/RMKJ01.ini
diff --git a/Data/User/GameConfig/RMKP01.ini b/Data/Sys/GameSettings/RMKP01.ini
similarity index 100%
rename from Data/User/GameConfig/RMKP01.ini
rename to Data/Sys/GameSettings/RMKP01.ini
diff --git a/Data/User/GameConfig/RMLEH4.ini b/Data/Sys/GameSettings/RMLEH4.ini
similarity index 100%
rename from Data/User/GameConfig/RMLEH4.ini
rename to Data/Sys/GameSettings/RMLEH4.ini
diff --git a/Data/User/GameConfig/RMLJH4.ini b/Data/Sys/GameSettings/RMLJH4.ini
similarity index 100%
rename from Data/User/GameConfig/RMLJH4.ini
rename to Data/Sys/GameSettings/RMLJH4.ini
diff --git a/Data/User/GameConfig/RMLK52.ini b/Data/Sys/GameSettings/RMLK52.ini
similarity index 100%
rename from Data/User/GameConfig/RMLK52.ini
rename to Data/Sys/GameSettings/RMLK52.ini
diff --git a/Data/User/GameConfig/RMLP7U.ini b/Data/Sys/GameSettings/RMLP7U.ini
similarity index 100%
rename from Data/User/GameConfig/RMLP7U.ini
rename to Data/Sys/GameSettings/RMLP7U.ini
diff --git a/Data/User/GameConfig/RMLPH4.ini b/Data/Sys/GameSettings/RMLPH4.ini
similarity index 100%
rename from Data/User/GameConfig/RMLPH4.ini
rename to Data/Sys/GameSettings/RMLPH4.ini
diff --git a/Data/User/GameConfig/RMSE52.ini b/Data/Sys/GameSettings/RMSE52.ini
similarity index 100%
rename from Data/User/GameConfig/RMSE52.ini
rename to Data/Sys/GameSettings/RMSE52.ini
diff --git a/Data/User/GameConfig/RNEEDA.ini b/Data/Sys/GameSettings/RNEEDA.ini
similarity index 100%
rename from Data/User/GameConfig/RNEEDA.ini
rename to Data/Sys/GameSettings/RNEEDA.ini
diff --git a/Data/User/GameConfig/RNEJDA.ini b/Data/Sys/GameSettings/RNEJDA.ini
similarity index 100%
rename from Data/User/GameConfig/RNEJDA.ini
rename to Data/Sys/GameSettings/RNEJDA.ini
diff --git a/Data/User/GameConfig/RNEPDA.ini b/Data/Sys/GameSettings/RNEPDA.ini
similarity index 100%
rename from Data/User/GameConfig/RNEPDA.ini
rename to Data/Sys/GameSettings/RNEPDA.ini
diff --git a/Data/User/GameConfig/RNHE41.ini b/Data/Sys/GameSettings/RNHE41.ini
similarity index 100%
rename from Data/User/GameConfig/RNHE41.ini
rename to Data/Sys/GameSettings/RNHE41.ini
diff --git a/Data/User/GameConfig/RNMXUG.ini b/Data/Sys/GameSettings/RNMXUG.ini
similarity index 100%
rename from Data/User/GameConfig/RNMXUG.ini
rename to Data/Sys/GameSettings/RNMXUG.ini
diff --git a/Data/User/GameConfig/RNOJ01.ini b/Data/Sys/GameSettings/RNOJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RNOJ01.ini
rename to Data/Sys/GameSettings/RNOJ01.ini
diff --git a/Data/User/GameConfig/RNOP01.ini b/Data/Sys/GameSettings/RNOP01.ini
similarity index 100%
rename from Data/User/GameConfig/RNOP01.ini
rename to Data/Sys/GameSettings/RNOP01.ini
diff --git a/Data/User/GameConfig/RO2P7N.ini b/Data/Sys/GameSettings/RO2P7N.ini
similarity index 97%
rename from Data/User/GameConfig/RO2P7N.ini
rename to Data/Sys/GameSettings/RO2P7N.ini
index 5f84ef165b..2f26d6a6e3 100644
--- a/Data/User/GameConfig/RO2P7N.ini
+++ b/Data/Sys/GameSettings/RO2P7N.ini
@@ -13,7 +13,7 @@ EmulationIssues =
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$Hangfix
+$Hangfix
 0x8007D340:byte:0x00000090
 0x8007D344:byte:0x00000090
 0x8007D348:byte:0x00000090
diff --git a/Data/User/GameConfig/RO3EXJ.ini b/Data/Sys/GameSettings/RO3EXJ.ini
similarity index 100%
rename from Data/User/GameConfig/RO3EXJ.ini
rename to Data/Sys/GameSettings/RO3EXJ.ini
diff --git a/Data/User/GameConfig/RO3J99.ini b/Data/Sys/GameSettings/RO3J99.ini
similarity index 100%
rename from Data/User/GameConfig/RO3J99.ini
rename to Data/Sys/GameSettings/RO3J99.ini
diff --git a/Data/User/GameConfig/RO3P99.ini b/Data/Sys/GameSettings/RO3P99.ini
similarity index 100%
rename from Data/User/GameConfig/RO3P99.ini
rename to Data/Sys/GameSettings/RO3P99.ini
diff --git a/Data/User/GameConfig/RO7P7D.ini b/Data/Sys/GameSettings/RO7P7D.ini
similarity index 100%
rename from Data/User/GameConfig/RO7P7D.ini
rename to Data/Sys/GameSettings/RO7P7D.ini
diff --git a/Data/User/GameConfig/RO8E7D.ini b/Data/Sys/GameSettings/RO8E7D.ini
similarity index 100%
rename from Data/User/GameConfig/RO8E7D.ini
rename to Data/Sys/GameSettings/RO8E7D.ini
diff --git a/Data/User/GameConfig/RO9EFS.ini b/Data/Sys/GameSettings/RO9EFS.ini
similarity index 100%
rename from Data/User/GameConfig/RO9EFS.ini
rename to Data/Sys/GameSettings/RO9EFS.ini
diff --git a/Data/User/GameConfig/RO9PNK.ini b/Data/Sys/GameSettings/RO9PNK.ini
similarity index 100%
rename from Data/User/GameConfig/RO9PNK.ini
rename to Data/Sys/GameSettings/RO9PNK.ini
diff --git a/Data/User/GameConfig/ROAE36.ini b/Data/Sys/GameSettings/ROAE36.ini
similarity index 100%
rename from Data/User/GameConfig/ROAE36.ini
rename to Data/Sys/GameSettings/ROAE36.ini
diff --git a/Data/User/GameConfig/ROAP36.ini b/Data/Sys/GameSettings/ROAP36.ini
similarity index 100%
rename from Data/User/GameConfig/ROAP36.ini
rename to Data/Sys/GameSettings/ROAP36.ini
diff --git a/Data/User/GameConfig/ROCPNK.ini b/Data/Sys/GameSettings/ROCPNK.ini
similarity index 100%
rename from Data/User/GameConfig/ROCPNK.ini
rename to Data/Sys/GameSettings/ROCPNK.ini
diff --git a/Data/User/GameConfig/RODE01.ini b/Data/Sys/GameSettings/RODE01.ini
similarity index 100%
rename from Data/User/GameConfig/RODE01.ini
rename to Data/Sys/GameSettings/RODE01.ini
diff --git a/Data/User/GameConfig/RODJ01.ini b/Data/Sys/GameSettings/RODJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RODJ01.ini
rename to Data/Sys/GameSettings/RODJ01.ini
diff --git a/Data/User/GameConfig/RODK01.ini b/Data/Sys/GameSettings/RODK01.ini
similarity index 100%
rename from Data/User/GameConfig/RODK01.ini
rename to Data/Sys/GameSettings/RODK01.ini
diff --git a/Data/User/GameConfig/RODP01.ini b/Data/Sys/GameSettings/RODP01.ini
similarity index 100%
rename from Data/User/GameConfig/RODP01.ini
rename to Data/Sys/GameSettings/RODP01.ini
diff --git a/Data/User/GameConfig/ROLE8P.ini b/Data/Sys/GameSettings/ROLE8P.ini
similarity index 100%
rename from Data/User/GameConfig/ROLE8P.ini
rename to Data/Sys/GameSettings/ROLE8P.ini
diff --git a/Data/User/GameConfig/ROLJ01.ini b/Data/Sys/GameSettings/ROLJ01.ini
similarity index 100%
rename from Data/User/GameConfig/ROLJ01.ini
rename to Data/Sys/GameSettings/ROLJ01.ini
diff --git a/Data/User/GameConfig/ROLK01.ini b/Data/Sys/GameSettings/ROLK01.ini
similarity index 100%
rename from Data/User/GameConfig/ROLK01.ini
rename to Data/Sys/GameSettings/ROLK01.ini
diff --git a/Data/User/GameConfig/ROLP8P.ini b/Data/Sys/GameSettings/ROLP8P.ini
similarity index 100%
rename from Data/User/GameConfig/ROLP8P.ini
rename to Data/Sys/GameSettings/ROLP8P.ini
diff --git a/Data/User/GameConfig/RONEG9.ini b/Data/Sys/GameSettings/RONEG9.ini
similarity index 100%
rename from Data/User/GameConfig/RONEG9.ini
rename to Data/Sys/GameSettings/RONEG9.ini
diff --git a/Data/User/GameConfig/RONJG9.ini b/Data/Sys/GameSettings/RONJG9.ini
similarity index 100%
rename from Data/User/GameConfig/RONJG9.ini
rename to Data/Sys/GameSettings/RONJG9.ini
diff --git a/Data/User/GameConfig/RONPG9.ini b/Data/Sys/GameSettings/RONPG9.ini
similarity index 100%
rename from Data/User/GameConfig/RONPG9.ini
rename to Data/Sys/GameSettings/RONPG9.ini
diff --git a/Data/User/GameConfig/ROUJAF.ini b/Data/Sys/GameSettings/ROUJAF.ini
similarity index 100%
rename from Data/User/GameConfig/ROUJAF.ini
rename to Data/Sys/GameSettings/ROUJAF.ini
diff --git a/Data/User/GameConfig/ROUPAF.ini b/Data/Sys/GameSettings/ROUPAF.ini
similarity index 100%
rename from Data/User/GameConfig/ROUPAF.ini
rename to Data/Sys/GameSettings/ROUPAF.ini
diff --git a/Data/User/GameConfig/ROWE08.ini b/Data/Sys/GameSettings/ROWE08.ini
similarity index 100%
rename from Data/User/GameConfig/ROWE08.ini
rename to Data/Sys/GameSettings/ROWE08.ini
diff --git a/Data/User/GameConfig/ROWJ08.ini b/Data/Sys/GameSettings/ROWJ08.ini
similarity index 100%
rename from Data/User/GameConfig/ROWJ08.ini
rename to Data/Sys/GameSettings/ROWJ08.ini
diff --git a/Data/User/GameConfig/ROWP08.ini b/Data/Sys/GameSettings/ROWP08.ini
similarity index 100%
rename from Data/User/GameConfig/ROWP08.ini
rename to Data/Sys/GameSettings/ROWP08.ini
diff --git a/Data/User/GameConfig/RP7P52.ini b/Data/Sys/GameSettings/RP7P52.ini
similarity index 100%
rename from Data/User/GameConfig/RP7P52.ini
rename to Data/Sys/GameSettings/RP7P52.ini
diff --git a/Data/User/GameConfig/RPBE01.ini b/Data/Sys/GameSettings/RPBE01.ini
similarity index 100%
rename from Data/User/GameConfig/RPBE01.ini
rename to Data/Sys/GameSettings/RPBE01.ini
diff --git a/Data/User/GameConfig/RPBJ01.ini b/Data/Sys/GameSettings/RPBJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RPBJ01.ini
rename to Data/Sys/GameSettings/RPBJ01.ini
diff --git a/Data/User/GameConfig/RPBP01.ini b/Data/Sys/GameSettings/RPBP01.ini
similarity index 100%
rename from Data/User/GameConfig/RPBP01.ini
rename to Data/Sys/GameSettings/RPBP01.ini
diff --git a/Data/User/GameConfig/RPDPGN.ini b/Data/Sys/GameSettings/RPDPGN.ini
similarity index 100%
rename from Data/User/GameConfig/RPDPGN.ini
rename to Data/Sys/GameSettings/RPDPGN.ini
diff --git a/Data/User/GameConfig/RPJE7U.ini b/Data/Sys/GameSettings/RPJE7U.ini
similarity index 100%
rename from Data/User/GameConfig/RPJE7U.ini
rename to Data/Sys/GameSettings/RPJE7U.ini
diff --git a/Data/User/GameConfig/RPJJ99.ini b/Data/Sys/GameSettings/RPJJ99.ini
similarity index 100%
rename from Data/User/GameConfig/RPJJ99.ini
rename to Data/Sys/GameSettings/RPJJ99.ini
diff --git a/Data/User/GameConfig/RPPE41.ini b/Data/Sys/GameSettings/RPPE41.ini
similarity index 100%
rename from Data/User/GameConfig/RPPE41.ini
rename to Data/Sys/GameSettings/RPPE41.ini
diff --git a/Data/User/GameConfig/RPWZ41.ini b/Data/Sys/GameSettings/RPWZ41.ini
similarity index 100%
rename from Data/User/GameConfig/RPWZ41.ini
rename to Data/Sys/GameSettings/RPWZ41.ini
diff --git a/Data/User/GameConfig/RPYP9B.ini b/Data/Sys/GameSettings/RPYP9B.ini
similarity index 100%
rename from Data/User/GameConfig/RPYP9B.ini
rename to Data/Sys/GameSettings/RPYP9B.ini
diff --git a/Data/User/GameConfig/RQ6EJJ.ini b/Data/Sys/GameSettings/RQ6EJJ.ini
similarity index 100%
rename from Data/User/GameConfig/RQ6EJJ.ini
rename to Data/Sys/GameSettings/RQ6EJJ.ini
diff --git a/Data/User/GameConfig/RQ6PKM.ini b/Data/Sys/GameSettings/RQ6PKM.ini
similarity index 100%
rename from Data/User/GameConfig/RQ6PKM.ini
rename to Data/Sys/GameSettings/RQ6PKM.ini
diff --git a/Data/User/GameConfig/RQ6XKM.ini b/Data/Sys/GameSettings/RQ6XKM.ini
similarity index 100%
rename from Data/User/GameConfig/RQ6XKM.ini
rename to Data/Sys/GameSettings/RQ6XKM.ini
diff --git a/Data/User/GameConfig/RQBENR.ini b/Data/Sys/GameSettings/RQBENR.ini
similarity index 100%
rename from Data/User/GameConfig/RQBENR.ini
rename to Data/Sys/GameSettings/RQBENR.ini
diff --git a/Data/User/GameConfig/RQLE64.ini b/Data/Sys/GameSettings/RQLE64.ini
similarity index 100%
rename from Data/User/GameConfig/RQLE64.ini
rename to Data/Sys/GameSettings/RQLE64.ini
diff --git a/Data/User/GameConfig/RQOP69.ini b/Data/Sys/GameSettings/RQOP69.ini
similarity index 100%
rename from Data/User/GameConfig/RQOP69.ini
rename to Data/Sys/GameSettings/RQOP69.ini
diff --git a/Data/User/GameConfig/RQREXJ.ini b/Data/Sys/GameSettings/RQREXJ.ini
similarity index 100%
rename from Data/User/GameConfig/RQREXJ.ini
rename to Data/Sys/GameSettings/RQREXJ.ini
diff --git a/Data/User/GameConfig/RQRJAF.ini b/Data/Sys/GameSettings/RQRJAF.ini
similarity index 100%
rename from Data/User/GameConfig/RQRJAF.ini
rename to Data/Sys/GameSettings/RQRJAF.ini
diff --git a/Data/User/GameConfig/RQRPAF.ini b/Data/Sys/GameSettings/RQRPAF.ini
similarity index 100%
rename from Data/User/GameConfig/RQRPAF.ini
rename to Data/Sys/GameSettings/RQRPAF.ini
diff --git a/Data/User/GameConfig/RR2PUG.ini b/Data/Sys/GameSettings/RR2PUG.ini
similarity index 100%
rename from Data/User/GameConfig/RR2PUG.ini
rename to Data/Sys/GameSettings/RR2PUG.ini
diff --git a/Data/User/GameConfig/RR5P70.ini b/Data/Sys/GameSettings/RR5P70.ini
similarity index 100%
rename from Data/User/GameConfig/RR5P70.ini
rename to Data/Sys/GameSettings/RR5P70.ini
diff --git a/Data/User/GameConfig/RRAXUG.ini b/Data/Sys/GameSettings/RRAXUG.ini
similarity index 100%
rename from Data/User/GameConfig/RRAXUG.ini
rename to Data/Sys/GameSettings/RRAXUG.ini
diff --git a/Data/User/GameConfig/RRBE41.ini b/Data/Sys/GameSettings/RRBE41.ini
similarity index 100%
rename from Data/User/GameConfig/RRBE41.ini
rename to Data/Sys/GameSettings/RRBE41.ini
diff --git a/Data/User/GameConfig/RRBJ41.ini b/Data/Sys/GameSettings/RRBJ41.ini
similarity index 100%
rename from Data/User/GameConfig/RRBJ41.ini
rename to Data/Sys/GameSettings/RRBJ41.ini
diff --git a/Data/User/GameConfig/RRBP41.ini b/Data/Sys/GameSettings/RRBP41.ini
similarity index 100%
rename from Data/User/GameConfig/RRBP41.ini
rename to Data/Sys/GameSettings/RRBP41.ini
diff --git a/Data/User/GameConfig/RRKE70.ini b/Data/Sys/GameSettings/RRKE70.ini
similarity index 100%
rename from Data/User/GameConfig/RRKE70.ini
rename to Data/Sys/GameSettings/RRKE70.ini
diff --git a/Data/User/GameConfig/RRKP70.ini b/Data/Sys/GameSettings/RRKP70.ini
similarity index 100%
rename from Data/User/GameConfig/RRKP70.ini
rename to Data/Sys/GameSettings/RRKP70.ini
diff --git a/Data/User/GameConfig/RRMX69.ini b/Data/Sys/GameSettings/RRMX69.ini
similarity index 100%
rename from Data/User/GameConfig/RRMX69.ini
rename to Data/Sys/GameSettings/RRMX69.ini
diff --git a/Data/User/GameConfig/RRXXUG.ini b/Data/Sys/GameSettings/RRXXUG.ini
similarity index 100%
rename from Data/User/GameConfig/RRXXUG.ini
rename to Data/Sys/GameSettings/RRXXUG.ini
diff --git a/Data/User/GameConfig/RRYPHY.ini b/Data/Sys/GameSettings/RRYPHY.ini
similarity index 100%
rename from Data/User/GameConfig/RRYPHY.ini
rename to Data/Sys/GameSettings/RRYPHY.ini
diff --git a/Data/User/GameConfig/RRZEGY.ini b/Data/Sys/GameSettings/RRZEGY.ini
similarity index 100%
rename from Data/User/GameConfig/RRZEGY.ini
rename to Data/Sys/GameSettings/RRZEGY.ini
diff --git a/Data/User/GameConfig/RRZPGY.ini b/Data/Sys/GameSettings/RRZPGY.ini
similarity index 100%
rename from Data/User/GameConfig/RRZPGY.ini
rename to Data/Sys/GameSettings/RRZPGY.ini
diff --git a/Data/User/GameConfig/RS5EC8.ini b/Data/Sys/GameSettings/RS5EC8.ini
similarity index 100%
rename from Data/User/GameConfig/RS5EC8.ini
rename to Data/Sys/GameSettings/RS5EC8.ini
diff --git a/Data/User/GameConfig/RS5JC8.ini b/Data/Sys/GameSettings/RS5JC8.ini
similarity index 100%
rename from Data/User/GameConfig/RS5JC8.ini
rename to Data/Sys/GameSettings/RS5JC8.ini
diff --git a/Data/User/GameConfig/RS5PC8.ini b/Data/Sys/GameSettings/RS5PC8.ini
similarity index 100%
rename from Data/User/GameConfig/RS5PC8.ini
rename to Data/Sys/GameSettings/RS5PC8.ini
diff --git a/Data/User/GameConfig/RS8J8N.ini b/Data/Sys/GameSettings/RS8J8N.ini
similarity index 100%
rename from Data/User/GameConfig/RS8J8N.ini
rename to Data/Sys/GameSettings/RS8J8N.ini
diff --git a/Data/User/GameConfig/RS9E8P.ini b/Data/Sys/GameSettings/RS9E8P.ini
similarity index 100%
rename from Data/User/GameConfig/RS9E8P.ini
rename to Data/Sys/GameSettings/RS9E8P.ini
diff --git a/Data/User/GameConfig/RS9P8P.ini b/Data/Sys/GameSettings/RS9P8P.ini
similarity index 100%
rename from Data/User/GameConfig/RS9P8P.ini
rename to Data/Sys/GameSettings/RS9P8P.ini
diff --git a/Data/User/GameConfig/RSBE01.ini b/Data/Sys/GameSettings/RSBE01.ini
similarity index 100%
rename from Data/User/GameConfig/RSBE01.ini
rename to Data/Sys/GameSettings/RSBE01.ini
diff --git a/Data/User/GameConfig/RSBJ01.ini b/Data/Sys/GameSettings/RSBJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RSBJ01.ini
rename to Data/Sys/GameSettings/RSBJ01.ini
diff --git a/Data/User/GameConfig/RSBP01.ini b/Data/Sys/GameSettings/RSBP01.ini
similarity index 100%
rename from Data/User/GameConfig/RSBP01.ini
rename to Data/Sys/GameSettings/RSBP01.ini
diff --git a/Data/User/GameConfig/RSFE7U.ini b/Data/Sys/GameSettings/RSFE7U.ini
similarity index 100%
rename from Data/User/GameConfig/RSFE7U.ini
rename to Data/Sys/GameSettings/RSFE7U.ini
diff --git a/Data/User/GameConfig/RSFJ99.ini b/Data/Sys/GameSettings/RSFJ99.ini
similarity index 100%
rename from Data/User/GameConfig/RSFJ99.ini
rename to Data/Sys/GameSettings/RSFJ99.ini
diff --git a/Data/User/GameConfig/RSFP99.ini b/Data/Sys/GameSettings/RSFP99.ini
similarity index 100%
rename from Data/User/GameConfig/RSFP99.ini
rename to Data/Sys/GameSettings/RSFP99.ini
diff --git a/Data/User/GameConfig/RSIE69.ini b/Data/Sys/GameSettings/RSIE69.ini
similarity index 100%
rename from Data/User/GameConfig/RSIE69.ini
rename to Data/Sys/GameSettings/RSIE69.ini
diff --git a/Data/User/GameConfig/RSIJ13.ini b/Data/Sys/GameSettings/RSIJ13.ini
similarity index 100%
rename from Data/User/GameConfig/RSIJ13.ini
rename to Data/Sys/GameSettings/RSIJ13.ini
diff --git a/Data/User/GameConfig/RSIP69.ini b/Data/Sys/GameSettings/RSIP69.ini
similarity index 100%
rename from Data/User/GameConfig/RSIP69.ini
rename to Data/Sys/GameSettings/RSIP69.ini
diff --git a/Data/User/GameConfig/RSLEAF.ini b/Data/Sys/GameSettings/RSLEAF.ini
similarity index 100%
rename from Data/User/GameConfig/RSLEAF.ini
rename to Data/Sys/GameSettings/RSLEAF.ini
diff --git a/Data/User/GameConfig/RSLJAF.ini b/Data/Sys/GameSettings/RSLJAF.ini
similarity index 100%
rename from Data/User/GameConfig/RSLJAF.ini
rename to Data/Sys/GameSettings/RSLJAF.ini
diff --git a/Data/User/GameConfig/RSLKAF.ini b/Data/Sys/GameSettings/RSLKAF.ini
similarity index 100%
rename from Data/User/GameConfig/RSLKAF.ini
rename to Data/Sys/GameSettings/RSLKAF.ini
diff --git a/Data/User/GameConfig/RSLPAF.ini b/Data/Sys/GameSettings/RSLPAF.ini
similarity index 100%
rename from Data/User/GameConfig/RSLPAF.ini
rename to Data/Sys/GameSettings/RSLPAF.ini
diff --git a/Data/User/GameConfig/RSME8P.ini b/Data/Sys/GameSettings/RSME8P.ini
similarity index 100%
rename from Data/User/GameConfig/RSME8P.ini
rename to Data/Sys/GameSettings/RSME8P.ini
diff --git a/Data/User/GameConfig/RSMP8P.ini b/Data/Sys/GameSettings/RSMP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RSMP8P.ini
rename to Data/Sys/GameSettings/RSMP8P.ini
diff --git a/Data/User/GameConfig/RSPE01.ini b/Data/Sys/GameSettings/RSPE01.ini
similarity index 100%
rename from Data/User/GameConfig/RSPE01.ini
rename to Data/Sys/GameSettings/RSPE01.ini
diff --git a/Data/User/GameConfig/RSPP01.ini b/Data/Sys/GameSettings/RSPP01.ini
similarity index 100%
rename from Data/User/GameConfig/RSPP01.ini
rename to Data/Sys/GameSettings/RSPP01.ini
diff --git a/Data/User/GameConfig/RSRE8P.ini b/Data/Sys/GameSettings/RSRE8P.ini
similarity index 100%
rename from Data/User/GameConfig/RSRE8P.ini
rename to Data/Sys/GameSettings/RSRE8P.ini
diff --git a/Data/User/GameConfig/RSRP8P.ini b/Data/Sys/GameSettings/RSRP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RSRP8P.ini
rename to Data/Sys/GameSettings/RSRP8P.ini
diff --git a/Data/User/GameConfig/RSTP64.ini b/Data/Sys/GameSettings/RSTP64.ini
similarity index 100%
rename from Data/User/GameConfig/RSTP64.ini
rename to Data/Sys/GameSettings/RSTP64.ini
diff --git a/Data/User/GameConfig/RSUP41.ini b/Data/Sys/GameSettings/RSUP41.ini
similarity index 100%
rename from Data/User/GameConfig/RSUP41.ini
rename to Data/Sys/GameSettings/RSUP41.ini
diff --git a/Data/User/GameConfig/RSVE8P.ini b/Data/Sys/GameSettings/RSVE8P.ini
similarity index 100%
rename from Data/User/GameConfig/RSVE8P.ini
rename to Data/Sys/GameSettings/RSVE8P.ini
diff --git a/Data/User/GameConfig/RSVJ8P.ini b/Data/Sys/GameSettings/RSVJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/RSVJ8P.ini
rename to Data/Sys/GameSettings/RSVJ8P.ini
diff --git a/Data/User/GameConfig/RSVP8P.ini b/Data/Sys/GameSettings/RSVP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RSVP8P.ini
rename to Data/Sys/GameSettings/RSVP8P.ini
diff --git a/Data/User/GameConfig/RSWP08.ini b/Data/Sys/GameSettings/RSWP08.ini
similarity index 100%
rename from Data/User/GameConfig/RSWP08.ini
rename to Data/Sys/GameSettings/RSWP08.ini
diff --git a/Data/User/GameConfig/RSXE69.ini b/Data/Sys/GameSettings/RSXE69.ini
similarity index 100%
rename from Data/User/GameConfig/RSXE69.ini
rename to Data/Sys/GameSettings/RSXE69.ini
diff --git a/Data/User/GameConfig/RSXJ13.ini b/Data/Sys/GameSettings/RSXJ13.ini
similarity index 100%
rename from Data/User/GameConfig/RSXJ13.ini
rename to Data/Sys/GameSettings/RSXJ13.ini
diff --git a/Data/User/GameConfig/RSXK69.ini b/Data/Sys/GameSettings/RSXK69.ini
similarity index 100%
rename from Data/User/GameConfig/RSXK69.ini
rename to Data/Sys/GameSettings/RSXK69.ini
diff --git a/Data/User/GameConfig/RSXP69.ini b/Data/Sys/GameSettings/RSXP69.ini
similarity index 100%
rename from Data/User/GameConfig/RSXP69.ini
rename to Data/Sys/GameSettings/RSXP69.ini
diff --git a/Data/User/GameConfig/RSZPGT.ini b/Data/Sys/GameSettings/RSZPGT.ini
similarity index 100%
rename from Data/User/GameConfig/RSZPGT.ini
rename to Data/Sys/GameSettings/RSZPGT.ini
diff --git a/Data/User/GameConfig/RT3E54.ini b/Data/Sys/GameSettings/RT3E54.ini
similarity index 97%
rename from Data/User/GameConfig/RT3E54.ini
rename to Data/Sys/GameSettings/RT3E54.ini
index d175a9bd39..8311ae7234 100644
--- a/Data/User/GameConfig/RT3E54.ini
+++ b/Data/Sys/GameSettings/RT3E54.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/RT3JEL.ini b/Data/Sys/GameSettings/RT3JEL.ini
similarity index 97%
rename from Data/User/GameConfig/RT3JEL.ini
rename to Data/Sys/GameSettings/RT3JEL.ini
index 036f24c3fb..63007e740a 100644
--- a/Data/User/GameConfig/RT3JEL.ini
+++ b/Data/Sys/GameSettings/RT3JEL.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/RT3P54.ini b/Data/Sys/GameSettings/RT3P54.ini
similarity index 97%
rename from Data/User/GameConfig/RT3P54.ini
rename to Data/Sys/GameSettings/RT3P54.ini
index f9b6824985..9a4a5c9402 100644
--- a/Data/User/GameConfig/RT3P54.ini
+++ b/Data/Sys/GameSettings/RT3P54.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/RT4EAF.ini b/Data/Sys/GameSettings/RT4EAF.ini
similarity index 100%
rename from Data/User/GameConfig/RT4EAF.ini
rename to Data/Sys/GameSettings/RT4EAF.ini
diff --git a/Data/User/GameConfig/RT4JAF.ini b/Data/Sys/GameSettings/RT4JAF.ini
similarity index 100%
rename from Data/User/GameConfig/RT4JAF.ini
rename to Data/Sys/GameSettings/RT4JAF.ini
diff --git a/Data/User/GameConfig/RT4PAF.ini b/Data/Sys/GameSettings/RT4PAF.ini
similarity index 100%
rename from Data/User/GameConfig/RT4PAF.ini
rename to Data/Sys/GameSettings/RT4PAF.ini
diff --git a/Data/User/GameConfig/RT5E8P.ini b/Data/Sys/GameSettings/RT5E8P.ini
similarity index 100%
rename from Data/User/GameConfig/RT5E8P.ini
rename to Data/Sys/GameSettings/RT5E8P.ini
diff --git a/Data/User/GameConfig/RT5P8P.ini b/Data/Sys/GameSettings/RT5P8P.ini
similarity index 100%
rename from Data/User/GameConfig/RT5P8P.ini
rename to Data/Sys/GameSettings/RT5P8P.ini
diff --git a/Data/User/GameConfig/RT9E52.ini b/Data/Sys/GameSettings/RT9E52.ini
similarity index 100%
rename from Data/User/GameConfig/RT9E52.ini
rename to Data/Sys/GameSettings/RT9E52.ini
diff --git a/Data/User/GameConfig/RTBP52.ini b/Data/Sys/GameSettings/RTBP52.ini
similarity index 100%
rename from Data/User/GameConfig/RTBP52.ini
rename to Data/Sys/GameSettings/RTBP52.ini
diff --git a/Data/User/GameConfig/RTCP41.ini b/Data/Sys/GameSettings/RTCP41.ini
similarity index 100%
rename from Data/User/GameConfig/RTCP41.ini
rename to Data/Sys/GameSettings/RTCP41.ini
diff --git a/Data/User/GameConfig/RTHE52.ini b/Data/Sys/GameSettings/RTHE52.ini
similarity index 100%
rename from Data/User/GameConfig/RTHE52.ini
rename to Data/Sys/GameSettings/RTHE52.ini
diff --git a/Data/User/GameConfig/RTME41.ini b/Data/Sys/GameSettings/RTME41.ini
similarity index 100%
rename from Data/User/GameConfig/RTME41.ini
rename to Data/Sys/GameSettings/RTME41.ini
diff --git a/Data/User/GameConfig/RTMP41.ini b/Data/Sys/GameSettings/RTMP41.ini
similarity index 100%
rename from Data/User/GameConfig/RTMP41.ini
rename to Data/Sys/GameSettings/RTMP41.ini
diff --git a/Data/User/GameConfig/RTNE41.ini b/Data/Sys/GameSettings/RTNE41.ini
similarity index 100%
rename from Data/User/GameConfig/RTNE41.ini
rename to Data/Sys/GameSettings/RTNE41.ini
diff --git a/Data/User/GameConfig/RTNJCQ.ini b/Data/Sys/GameSettings/RTNJCQ.ini
similarity index 100%
rename from Data/User/GameConfig/RTNJCQ.ini
rename to Data/Sys/GameSettings/RTNJCQ.ini
diff --git a/Data/User/GameConfig/RTNP41.ini b/Data/Sys/GameSettings/RTNP41.ini
similarity index 100%
rename from Data/User/GameConfig/RTNP41.ini
rename to Data/Sys/GameSettings/RTNP41.ini
diff --git a/Data/User/GameConfig/RTZE08.ini b/Data/Sys/GameSettings/RTZE08.ini
similarity index 100%
rename from Data/User/GameConfig/RTZE08.ini
rename to Data/Sys/GameSettings/RTZE08.ini
diff --git a/Data/User/GameConfig/RTZJ08.ini b/Data/Sys/GameSettings/RTZJ08.ini
similarity index 100%
rename from Data/User/GameConfig/RTZJ08.ini
rename to Data/Sys/GameSettings/RTZJ08.ini
diff --git a/Data/User/GameConfig/RTZK08.ini b/Data/Sys/GameSettings/RTZK08.ini
similarity index 100%
rename from Data/User/GameConfig/RTZK08.ini
rename to Data/Sys/GameSettings/RTZK08.ini
diff --git a/Data/User/GameConfig/RTZP08.ini b/Data/Sys/GameSettings/RTZP08.ini
similarity index 100%
rename from Data/User/GameConfig/RTZP08.ini
rename to Data/Sys/GameSettings/RTZP08.ini
diff --git a/Data/User/GameConfig/RUCXRT.ini b/Data/Sys/GameSettings/RUCXRT.ini
similarity index 100%
rename from Data/User/GameConfig/RUCXRT.ini
rename to Data/Sys/GameSettings/RUCXRT.ini
diff --git a/Data/User/GameConfig/RUUE01.ini b/Data/Sys/GameSettings/RUUE01.ini
similarity index 98%
rename from Data/User/GameConfig/RUUE01.ini
rename to Data/Sys/GameSettings/RUUE01.ini
index e8e63f861c..1625ea981e 100644
--- a/Data/User/GameConfig/RUUE01.ini
+++ b/Data/Sys/GameSettings/RUUE01.ini
@@ -16,7 +16,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/RUUJ01.ini b/Data/Sys/GameSettings/RUUJ01.ini
similarity index 98%
rename from Data/User/GameConfig/RUUJ01.ini
rename to Data/Sys/GameSettings/RUUJ01.ini
index fdeefb5003..294412f3d2 100644
--- a/Data/User/GameConfig/RUUJ01.ini
+++ b/Data/Sys/GameSettings/RUUJ01.ini
@@ -16,7 +16,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/RUUK01.ini b/Data/Sys/GameSettings/RUUK01.ini
similarity index 98%
rename from Data/User/GameConfig/RUUK01.ini
rename to Data/Sys/GameSettings/RUUK01.ini
index 2bb3818a31..b12b52cfd2 100644
--- a/Data/User/GameConfig/RUUK01.ini
+++ b/Data/Sys/GameSettings/RUUK01.ini
@@ -16,7 +16,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/RUUP01.ini b/Data/Sys/GameSettings/RUUP01.ini
similarity index 98%
rename from Data/User/GameConfig/RUUP01.ini
rename to Data/Sys/GameSettings/RUUP01.ini
index 4cb31371ef..b1c4cb4cde 100644
--- a/Data/User/GameConfig/RUUP01.ini
+++ b/Data/Sys/GameSettings/RUUP01.ini
@@ -16,7 +16,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBToTextureEnable = False
 EFBCopyEnable = True
diff --git a/Data/User/GameConfig/RUYE41.ini b/Data/Sys/GameSettings/RUYE41.ini
similarity index 100%
rename from Data/User/GameConfig/RUYE41.ini
rename to Data/Sys/GameSettings/RUYE41.ini
diff --git a/Data/User/GameConfig/RVKEXJ.ini b/Data/Sys/GameSettings/RVKEXJ.ini
similarity index 100%
rename from Data/User/GameConfig/RVKEXJ.ini
rename to Data/Sys/GameSettings/RVKEXJ.ini
diff --git a/Data/User/GameConfig/RVKP99.ini b/Data/Sys/GameSettings/RVKP99.ini
similarity index 100%
rename from Data/User/GameConfig/RVKP99.ini
rename to Data/Sys/GameSettings/RVKP99.ini
diff --git a/Data/User/GameConfig/RVOPPL.ini b/Data/Sys/GameSettings/RVOPPL.ini
similarity index 100%
rename from Data/User/GameConfig/RVOPPL.ini
rename to Data/Sys/GameSettings/RVOPPL.ini
diff --git a/Data/User/GameConfig/RVQP41.ini b/Data/Sys/GameSettings/RVQP41.ini
similarity index 100%
rename from Data/User/GameConfig/RVQP41.ini
rename to Data/Sys/GameSettings/RVQP41.ini
diff --git a/Data/User/GameConfig/RVSE69.ini b/Data/Sys/GameSettings/RVSE69.ini
similarity index 100%
rename from Data/User/GameConfig/RVSE69.ini
rename to Data/Sys/GameSettings/RVSE69.ini
diff --git a/Data/User/GameConfig/RVSP69.ini b/Data/Sys/GameSettings/RVSP69.ini
similarity index 100%
rename from Data/User/GameConfig/RVSP69.ini
rename to Data/Sys/GameSettings/RVSP69.ini
diff --git a/Data/User/GameConfig/RVUP8P.ini b/Data/Sys/GameSettings/RVUP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RVUP8P.ini
rename to Data/Sys/GameSettings/RVUP8P.ini
diff --git a/Data/User/GameConfig/RVVP78.ini b/Data/Sys/GameSettings/RVVP78.ini
similarity index 100%
rename from Data/User/GameConfig/RVVP78.ini
rename to Data/Sys/GameSettings/RVVP78.ini
diff --git a/Data/User/GameConfig/RVZP52.ini b/Data/Sys/GameSettings/RVZP52.ini
similarity index 100%
rename from Data/User/GameConfig/RVZP52.ini
rename to Data/Sys/GameSettings/RVZP52.ini
diff --git a/Data/User/GameConfig/RW9X78.ini b/Data/Sys/GameSettings/RW9X78.ini
similarity index 100%
rename from Data/User/GameConfig/RW9X78.ini
rename to Data/Sys/GameSettings/RW9X78.ini
diff --git a/Data/User/GameConfig/RWBXUG.ini b/Data/Sys/GameSettings/RWBXUG.ini
similarity index 100%
rename from Data/User/GameConfig/RWBXUG.ini
rename to Data/Sys/GameSettings/RWBXUG.ini
diff --git a/Data/User/GameConfig/RWEPA4.ini b/Data/Sys/GameSettings/RWEPA4.ini
similarity index 100%
rename from Data/User/GameConfig/RWEPA4.ini
rename to Data/Sys/GameSettings/RWEPA4.ini
diff --git a/Data/User/GameConfig/RWLE01.ini b/Data/Sys/GameSettings/RWLE01.ini
similarity index 100%
rename from Data/User/GameConfig/RWLE01.ini
rename to Data/Sys/GameSettings/RWLE01.ini
diff --git a/Data/User/GameConfig/RWRE4F.ini b/Data/Sys/GameSettings/RWRE4F.ini
similarity index 100%
rename from Data/User/GameConfig/RWRE4F.ini
rename to Data/Sys/GameSettings/RWRE4F.ini
diff --git a/Data/User/GameConfig/RWRP4F.ini b/Data/Sys/GameSettings/RWRP4F.ini
similarity index 100%
rename from Data/User/GameConfig/RWRP4F.ini
rename to Data/Sys/GameSettings/RWRP4F.ini
diff --git a/Data/User/GameConfig/RWSE8P.ini b/Data/Sys/GameSettings/RWSE8P.ini
similarity index 100%
rename from Data/User/GameConfig/RWSE8P.ini
rename to Data/Sys/GameSettings/RWSE8P.ini
diff --git a/Data/User/GameConfig/RWSJ01.ini b/Data/Sys/GameSettings/RWSJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RWSJ01.ini
rename to Data/Sys/GameSettings/RWSJ01.ini
diff --git a/Data/User/GameConfig/RWSK01.ini b/Data/Sys/GameSettings/RWSK01.ini
similarity index 100%
rename from Data/User/GameConfig/RWSK01.ini
rename to Data/Sys/GameSettings/RWSK01.ini
diff --git a/Data/User/GameConfig/RWSP8P.ini b/Data/Sys/GameSettings/RWSP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RWSP8P.ini
rename to Data/Sys/GameSettings/RWSP8P.ini
diff --git a/Data/User/GameConfig/RWUX52.ini b/Data/Sys/GameSettings/RWUX52.ini
similarity index 100%
rename from Data/User/GameConfig/RWUX52.ini
rename to Data/Sys/GameSettings/RWUX52.ini
diff --git a/Data/User/GameConfig/RX3E01.ini b/Data/Sys/GameSettings/RX3E01.ini
similarity index 100%
rename from Data/User/GameConfig/RX3E01.ini
rename to Data/Sys/GameSettings/RX3E01.ini
diff --git a/Data/User/GameConfig/RX9P69.ini b/Data/Sys/GameSettings/RX9P69.ini
similarity index 100%
rename from Data/User/GameConfig/RX9P69.ini
rename to Data/Sys/GameSettings/RX9P69.ini
diff --git a/Data/User/GameConfig/RX9Y69.ini b/Data/Sys/GameSettings/RX9Y69.ini
similarity index 100%
rename from Data/User/GameConfig/RX9Y69.ini
rename to Data/Sys/GameSettings/RX9Y69.ini
diff --git a/Data/User/GameConfig/RXXE4Q.ini b/Data/Sys/GameSettings/RXXE4Q.ini
similarity index 100%
rename from Data/User/GameConfig/RXXE4Q.ini
rename to Data/Sys/GameSettings/RXXE4Q.ini
diff --git a/Data/User/GameConfig/RXXJ4Q.ini b/Data/Sys/GameSettings/RXXJ4Q.ini
similarity index 100%
rename from Data/User/GameConfig/RXXJ4Q.ini
rename to Data/Sys/GameSettings/RXXJ4Q.ini
diff --git a/Data/User/GameConfig/RXXP4Q.ini b/Data/Sys/GameSettings/RXXP4Q.ini
similarity index 100%
rename from Data/User/GameConfig/RXXP4Q.ini
rename to Data/Sys/GameSettings/RXXP4Q.ini
diff --git a/Data/User/GameConfig/RYBE69.ini b/Data/Sys/GameSettings/RYBE69.ini
similarity index 100%
rename from Data/User/GameConfig/RYBE69.ini
rename to Data/Sys/GameSettings/RYBE69.ini
diff --git a/Data/User/GameConfig/RYOEA4.ini b/Data/Sys/GameSettings/RYOEA4.ini
similarity index 100%
rename from Data/User/GameConfig/RYOEA4.ini
rename to Data/Sys/GameSettings/RYOEA4.ini
diff --git a/Data/User/GameConfig/RYQP69.ini b/Data/Sys/GameSettings/RYQP69.ini
similarity index 100%
rename from Data/User/GameConfig/RYQP69.ini
rename to Data/Sys/GameSettings/RYQP69.ini
diff --git a/Data/User/GameConfig/RYXP7J.ini b/Data/Sys/GameSettings/RYXP7J.ini
similarity index 100%
rename from Data/User/GameConfig/RYXP7J.ini
rename to Data/Sys/GameSettings/RYXP7J.ini
diff --git a/Data/User/GameConfig/RZ9PG9.ini b/Data/Sys/GameSettings/RZ9PG9.ini
similarity index 100%
rename from Data/User/GameConfig/RZ9PG9.ini
rename to Data/Sys/GameSettings/RZ9PG9.ini
diff --git a/Data/User/GameConfig/RZDE01.ini b/Data/Sys/GameSettings/RZDE01.ini
similarity index 100%
rename from Data/User/GameConfig/RZDE01.ini
rename to Data/Sys/GameSettings/RZDE01.ini
diff --git a/Data/User/GameConfig/RZDJ01.ini b/Data/Sys/GameSettings/RZDJ01.ini
similarity index 100%
rename from Data/User/GameConfig/RZDJ01.ini
rename to Data/Sys/GameSettings/RZDJ01.ini
diff --git a/Data/User/GameConfig/RZDK01.ini b/Data/Sys/GameSettings/RZDK01.ini
similarity index 100%
rename from Data/User/GameConfig/RZDK01.ini
rename to Data/Sys/GameSettings/RZDK01.ini
diff --git a/Data/User/GameConfig/RZDP01.ini b/Data/Sys/GameSettings/RZDP01.ini
similarity index 100%
rename from Data/User/GameConfig/RZDP01.ini
rename to Data/Sys/GameSettings/RZDP01.ini
diff --git a/Data/User/GameConfig/RZJD69.ini b/Data/Sys/GameSettings/RZJD69.ini
similarity index 100%
rename from Data/User/GameConfig/RZJD69.ini
rename to Data/Sys/GameSettings/RZJD69.ini
diff --git a/Data/User/GameConfig/RZJE69.ini b/Data/Sys/GameSettings/RZJE69.ini
similarity index 100%
rename from Data/User/GameConfig/RZJE69.ini
rename to Data/Sys/GameSettings/RZJE69.ini
diff --git a/Data/User/GameConfig/RZJJ13.ini b/Data/Sys/GameSettings/RZJJ13.ini
similarity index 100%
rename from Data/User/GameConfig/RZJJ13.ini
rename to Data/Sys/GameSettings/RZJJ13.ini
diff --git a/Data/User/GameConfig/RZJP69.ini b/Data/Sys/GameSettings/RZJP69.ini
similarity index 100%
rename from Data/User/GameConfig/RZJP69.ini
rename to Data/Sys/GameSettings/RZJP69.ini
diff --git a/Data/User/GameConfig/RZPE01.ini b/Data/Sys/GameSettings/RZPE01.ini
similarity index 100%
rename from Data/User/GameConfig/RZPE01.ini
rename to Data/Sys/GameSettings/RZPE01.ini
diff --git a/Data/User/GameConfig/RZTE01.ini b/Data/Sys/GameSettings/RZTE01.ini
similarity index 98%
rename from Data/User/GameConfig/RZTE01.ini
rename to Data/Sys/GameSettings/RZTE01.ini
index ef4e34f1f4..195c944cf4 100644
--- a/Data/User/GameConfig/RZTE01.ini
+++ b/Data/Sys/GameSettings/RZTE01.ini
@@ -16,6 +16,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/RZTJ01.ini b/Data/Sys/GameSettings/RZTJ01.ini
similarity index 98%
rename from Data/User/GameConfig/RZTJ01.ini
rename to Data/Sys/GameSettings/RZTJ01.ini
index b416f639bd..5ac0a14309 100644
--- a/Data/User/GameConfig/RZTJ01.ini
+++ b/Data/Sys/GameSettings/RZTJ01.ini
@@ -16,6 +16,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/RZTK01.ini b/Data/Sys/GameSettings/RZTK01.ini
similarity index 98%
rename from Data/User/GameConfig/RZTK01.ini
rename to Data/Sys/GameSettings/RZTK01.ini
index 2daa37448a..3a0d0e664f 100644
--- a/Data/User/GameConfig/RZTK01.ini
+++ b/Data/Sys/GameSettings/RZTK01.ini
@@ -16,6 +16,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/RZTP01.ini b/Data/Sys/GameSettings/RZTP01.ini
similarity index 98%
rename from Data/User/GameConfig/RZTP01.ini
rename to Data/Sys/GameSettings/RZTP01.ini
index 393f8b637a..461edb24e7 100644
--- a/Data/User/GameConfig/RZTP01.ini
+++ b/Data/Sys/GameSettings/RZTP01.ini
@@ -16,6 +16,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/RZTW01.ini b/Data/Sys/GameSettings/RZTW01.ini
similarity index 98%
rename from Data/User/GameConfig/RZTW01.ini
rename to Data/Sys/GameSettings/RZTW01.ini
index bf63686d79..d62c8f1919 100644
--- a/Data/User/GameConfig/RZTW01.ini
+++ b/Data/Sys/GameSettings/RZTW01.ini
@@ -16,6 +16,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
diff --git a/Data/User/GameConfig/RZZE8P.ini b/Data/Sys/GameSettings/RZZE8P.ini
similarity index 100%
rename from Data/User/GameConfig/RZZE8P.ini
rename to Data/Sys/GameSettings/RZZE8P.ini
diff --git a/Data/User/GameConfig/RZZJEL.ini b/Data/Sys/GameSettings/RZZJEL.ini
similarity index 100%
rename from Data/User/GameConfig/RZZJEL.ini
rename to Data/Sys/GameSettings/RZZJEL.ini
diff --git a/Data/User/GameConfig/RZZP8P.ini b/Data/Sys/GameSettings/RZZP8P.ini
similarity index 100%
rename from Data/User/GameConfig/RZZP8P.ini
rename to Data/Sys/GameSettings/RZZP8P.ini
diff --git a/Data/User/GameConfig/S2IP8P.ini b/Data/Sys/GameSettings/S2IP8P.ini
similarity index 100%
rename from Data/User/GameConfig/S2IP8P.ini
rename to Data/Sys/GameSettings/S2IP8P.ini
diff --git a/Data/User/GameConfig/S2LE01.ini b/Data/Sys/GameSettings/S2LE01.ini
similarity index 100%
rename from Data/User/GameConfig/S2LE01.ini
rename to Data/Sys/GameSettings/S2LE01.ini
diff --git a/Data/User/GameConfig/S2LJ01.ini b/Data/Sys/GameSettings/S2LJ01.ini
similarity index 100%
rename from Data/User/GameConfig/S2LJ01.ini
rename to Data/Sys/GameSettings/S2LJ01.ini
diff --git a/Data/User/GameConfig/S2LP01.ini b/Data/Sys/GameSettings/S2LP01.ini
similarity index 100%
rename from Data/User/GameConfig/S2LP01.ini
rename to Data/Sys/GameSettings/S2LP01.ini
diff --git a/Data/User/GameConfig/S2TJAF.ini b/Data/Sys/GameSettings/S2TJAF.ini
similarity index 100%
rename from Data/User/GameConfig/S2TJAF.ini
rename to Data/Sys/GameSettings/S2TJAF.ini
diff --git a/Data/User/GameConfig/S2WE78.ini b/Data/Sys/GameSettings/S2WE78.ini
similarity index 100%
rename from Data/User/GameConfig/S2WE78.ini
rename to Data/Sys/GameSettings/S2WE78.ini
diff --git a/Data/User/GameConfig/S2WP78.ini b/Data/Sys/GameSettings/S2WP78.ini
similarity index 100%
rename from Data/User/GameConfig/S2WP78.ini
rename to Data/Sys/GameSettings/S2WP78.ini
diff --git a/Data/User/GameConfig/S3BEWR.ini b/Data/Sys/GameSettings/S3BEWR.ini
similarity index 100%
rename from Data/User/GameConfig/S3BEWR.ini
rename to Data/Sys/GameSettings/S3BEWR.ini
diff --git a/Data/User/GameConfig/S3BPWR.ini b/Data/Sys/GameSettings/S3BPWR.ini
similarity index 100%
rename from Data/User/GameConfig/S3BPWR.ini
rename to Data/Sys/GameSettings/S3BPWR.ini
diff --git a/Data/User/GameConfig/S59E01.ini b/Data/Sys/GameSettings/S59E01.ini
similarity index 100%
rename from Data/User/GameConfig/S59E01.ini
rename to Data/Sys/GameSettings/S59E01.ini
diff --git a/Data/User/GameConfig/S59JC8.ini b/Data/Sys/GameSettings/S59JC8.ini
similarity index 100%
rename from Data/User/GameConfig/S59JC8.ini
rename to Data/Sys/GameSettings/S59JC8.ini
diff --git a/Data/User/GameConfig/S59P01.ini b/Data/Sys/GameSettings/S59P01.ini
similarity index 100%
rename from Data/User/GameConfig/S59P01.ini
rename to Data/Sys/GameSettings/S59P01.ini
diff --git a/Data/User/GameConfig/S72E01.ini b/Data/Sys/GameSettings/S72E01.ini
similarity index 100%
rename from Data/User/GameConfig/S72E01.ini
rename to Data/Sys/GameSettings/S72E01.ini
diff --git a/Data/User/GameConfig/S72J01.ini b/Data/Sys/GameSettings/S72J01.ini
similarity index 100%
rename from Data/User/GameConfig/S72J01.ini
rename to Data/Sys/GameSettings/S72J01.ini
diff --git a/Data/User/GameConfig/S75E69.ini b/Data/Sys/GameSettings/S75E69.ini
similarity index 100%
rename from Data/User/GameConfig/S75E69.ini
rename to Data/Sys/GameSettings/S75E69.ini
diff --git a/Data/User/GameConfig/S75P69.ini b/Data/Sys/GameSettings/S75P69.ini
similarity index 100%
rename from Data/User/GameConfig/S75P69.ini
rename to Data/Sys/GameSettings/S75P69.ini
diff --git a/Data/User/GameConfig/SAKENS.ini b/Data/Sys/GameSettings/SAKENS.ini
similarity index 100%
rename from Data/User/GameConfig/SAKENS.ini
rename to Data/Sys/GameSettings/SAKENS.ini
diff --git a/Data/User/GameConfig/SAKPNS.ini b/Data/Sys/GameSettings/SAKPNS.ini
similarity index 100%
rename from Data/User/GameConfig/SAKPNS.ini
rename to Data/Sys/GameSettings/SAKPNS.ini
diff --git a/Data/User/GameConfig/SB3E08.ini b/Data/Sys/GameSettings/SB3E08.ini
similarity index 100%
rename from Data/User/GameConfig/SB3E08.ini
rename to Data/Sys/GameSettings/SB3E08.ini
diff --git a/Data/User/GameConfig/SB3J08.ini b/Data/Sys/GameSettings/SB3J08.ini
similarity index 100%
rename from Data/User/GameConfig/SB3J08.ini
rename to Data/Sys/GameSettings/SB3J08.ini
diff --git a/Data/User/GameConfig/SB3P08.ini b/Data/Sys/GameSettings/SB3P08.ini
similarity index 100%
rename from Data/User/GameConfig/SB3P08.ini
rename to Data/Sys/GameSettings/SB3P08.ini
diff --git a/Data/User/GameConfig/SB4E01.ini b/Data/Sys/GameSettings/SB4E01.ini
similarity index 100%
rename from Data/User/GameConfig/SB4E01.ini
rename to Data/Sys/GameSettings/SB4E01.ini
diff --git a/Data/User/GameConfig/SB4J01.ini b/Data/Sys/GameSettings/SB4J01.ini
similarity index 100%
rename from Data/User/GameConfig/SB4J01.ini
rename to Data/Sys/GameSettings/SB4J01.ini
diff --git a/Data/User/GameConfig/SB4P01.ini b/Data/Sys/GameSettings/SB4P01.ini
similarity index 100%
rename from Data/User/GameConfig/SB4P01.ini
rename to Data/Sys/GameSettings/SB4P01.ini
diff --git a/Data/User/GameConfig/SBDE08.ini b/Data/Sys/GameSettings/SBDE08.ini
similarity index 100%
rename from Data/User/GameConfig/SBDE08.ini
rename to Data/Sys/GameSettings/SBDE08.ini
diff --git a/Data/User/GameConfig/SBDJ08.ini b/Data/Sys/GameSettings/SBDJ08.ini
similarity index 100%
rename from Data/User/GameConfig/SBDJ08.ini
rename to Data/Sys/GameSettings/SBDJ08.ini
diff --git a/Data/User/GameConfig/SBDK08.ini b/Data/Sys/GameSettings/SBDK08.ini
similarity index 100%
rename from Data/User/GameConfig/SBDK08.ini
rename to Data/Sys/GameSettings/SBDK08.ini
diff --git a/Data/User/GameConfig/SBDP08.ini b/Data/Sys/GameSettings/SBDP08.ini
similarity index 100%
rename from Data/User/GameConfig/SBDP08.ini
rename to Data/Sys/GameSettings/SBDP08.ini
diff --git a/Data/User/GameConfig/SBLE5G.ini b/Data/Sys/GameSettings/SBLE5G.ini
similarity index 100%
rename from Data/User/GameConfig/SBLE5G.ini
rename to Data/Sys/GameSettings/SBLE5G.ini
diff --git a/Data/User/GameConfig/SBNEG9.ini b/Data/Sys/GameSettings/SBNEG9.ini
similarity index 100%
rename from Data/User/GameConfig/SBNEG9.ini
rename to Data/Sys/GameSettings/SBNEG9.ini
diff --git a/Data/User/GameConfig/SBVE78.ini b/Data/Sys/GameSettings/SBVE78.ini
similarity index 100%
rename from Data/User/GameConfig/SBVE78.ini
rename to Data/Sys/GameSettings/SBVE78.ini
diff --git a/Data/User/GameConfig/SC2E8P.ini b/Data/Sys/GameSettings/SC2E8P.ini
similarity index 100%
rename from Data/User/GameConfig/SC2E8P.ini
rename to Data/Sys/GameSettings/SC2E8P.ini
diff --git a/Data/User/GameConfig/SC2P8P.ini b/Data/Sys/GameSettings/SC2P8P.ini
similarity index 100%
rename from Data/User/GameConfig/SC2P8P.ini
rename to Data/Sys/GameSettings/SC2P8P.ini
diff --git a/Data/User/GameConfig/SC4E64.ini b/Data/Sys/GameSettings/SC4E64.ini
similarity index 100%
rename from Data/User/GameConfig/SC4E64.ini
rename to Data/Sys/GameSettings/SC4E64.ini
diff --git a/Data/User/GameConfig/SC4P64.ini b/Data/Sys/GameSettings/SC4P64.ini
similarity index 100%
rename from Data/User/GameConfig/SC4P64.ini
rename to Data/Sys/GameSettings/SC4P64.ini
diff --git a/Data/User/GameConfig/SC7D52.ini b/Data/Sys/GameSettings/SC7D52.ini
similarity index 100%
rename from Data/User/GameConfig/SC7D52.ini
rename to Data/Sys/GameSettings/SC7D52.ini
diff --git a/Data/User/GameConfig/SC7E52.ini b/Data/Sys/GameSettings/SC7E52.ini
similarity index 100%
rename from Data/User/GameConfig/SC7E52.ini
rename to Data/Sys/GameSettings/SC7E52.ini
diff --git a/Data/User/GameConfig/SC7F52.ini b/Data/Sys/GameSettings/SC7F52.ini
similarity index 100%
rename from Data/User/GameConfig/SC7F52.ini
rename to Data/Sys/GameSettings/SC7F52.ini
diff --git a/Data/User/GameConfig/SC7I52.ini b/Data/Sys/GameSettings/SC7I52.ini
similarity index 100%
rename from Data/User/GameConfig/SC7I52.ini
rename to Data/Sys/GameSettings/SC7I52.ini
diff --git a/Data/User/GameConfig/SC7P52.ini b/Data/Sys/GameSettings/SC7P52.ini
similarity index 100%
rename from Data/User/GameConfig/SC7P52.ini
rename to Data/Sys/GameSettings/SC7P52.ini
diff --git a/Data/User/GameConfig/SC7S52.ini b/Data/Sys/GameSettings/SC7S52.ini
similarity index 100%
rename from Data/User/GameConfig/SC7S52.ini
rename to Data/Sys/GameSettings/SC7S52.ini
diff --git a/Data/User/GameConfig/SC8E01.ini b/Data/Sys/GameSettings/SC8E01.ini
similarity index 100%
rename from Data/User/GameConfig/SC8E01.ini
rename to Data/Sys/GameSettings/SC8E01.ini
diff --git a/Data/User/GameConfig/SC8J01.ini b/Data/Sys/GameSettings/SC8J01.ini
similarity index 100%
rename from Data/User/GameConfig/SC8J01.ini
rename to Data/Sys/GameSettings/SC8J01.ini
diff --git a/Data/User/GameConfig/SC8P01.ini b/Data/Sys/GameSettings/SC8P01.ini
similarity index 100%
rename from Data/User/GameConfig/SC8P01.ini
rename to Data/Sys/GameSettings/SC8P01.ini
diff --git a/Data/User/GameConfig/SCAE18.ini b/Data/Sys/GameSettings/SCAE18.ini
similarity index 100%
rename from Data/User/GameConfig/SCAE18.ini
rename to Data/Sys/GameSettings/SCAE18.ini
diff --git a/Data/User/GameConfig/SCAJ18.ini b/Data/Sys/GameSettings/SCAJ18.ini
similarity index 100%
rename from Data/User/GameConfig/SCAJ18.ini
rename to Data/Sys/GameSettings/SCAJ18.ini
diff --git a/Data/User/GameConfig/SCAP18.ini b/Data/Sys/GameSettings/SCAP18.ini
similarity index 100%
rename from Data/User/GameConfig/SCAP18.ini
rename to Data/Sys/GameSettings/SCAP18.ini
diff --git a/Data/User/GameConfig/SCYE4Q.ini b/Data/Sys/GameSettings/SCYE4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SCYE4Q.ini
rename to Data/Sys/GameSettings/SCYE4Q.ini
diff --git a/Data/User/GameConfig/SCYP4Q.ini b/Data/Sys/GameSettings/SCYP4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SCYP4Q.ini
rename to Data/Sys/GameSettings/SCYP4Q.ini
diff --git a/Data/User/GameConfig/SCYX4Q.ini b/Data/Sys/GameSettings/SCYX4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SCYX4Q.ini
rename to Data/Sys/GameSettings/SCYX4Q.ini
diff --git a/Data/User/GameConfig/SCYY4Q.ini b/Data/Sys/GameSettings/SCYY4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SCYY4Q.ini
rename to Data/Sys/GameSettings/SCYY4Q.ini
diff --git a/Data/User/GameConfig/SCYZ4Q.ini b/Data/Sys/GameSettings/SCYZ4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SCYZ4Q.ini
rename to Data/Sys/GameSettings/SCYZ4Q.ini
diff --git a/Data/User/GameConfig/SD2E41.ini b/Data/Sys/GameSettings/SD2E41.ini
similarity index 100%
rename from Data/User/GameConfig/SD2E41.ini
rename to Data/Sys/GameSettings/SD2E41.ini
diff --git a/Data/User/GameConfig/SD2J01.ini b/Data/Sys/GameSettings/SD2J01.ini
similarity index 100%
rename from Data/User/GameConfig/SD2J01.ini
rename to Data/Sys/GameSettings/SD2J01.ini
diff --git a/Data/User/GameConfig/SD2P41.ini b/Data/Sys/GameSettings/SD2P41.ini
similarity index 100%
rename from Data/User/GameConfig/SD2P41.ini
rename to Data/Sys/GameSettings/SD2P41.ini
diff --git a/Data/User/GameConfig/SD2Y41.ini b/Data/Sys/GameSettings/SD2Y41.ini
similarity index 100%
rename from Data/User/GameConfig/SD2Y41.ini
rename to Data/Sys/GameSettings/SD2Y41.ini
diff --git a/Data/User/GameConfig/SDBE78.ini b/Data/Sys/GameSettings/SDBE78.ini
similarity index 100%
rename from Data/User/GameConfig/SDBE78.ini
rename to Data/Sys/GameSettings/SDBE78.ini
diff --git a/Data/User/GameConfig/SDBP78.ini b/Data/Sys/GameSettings/SDBP78.ini
similarity index 100%
rename from Data/User/GameConfig/SDBP78.ini
rename to Data/Sys/GameSettings/SDBP78.ini
diff --git a/Data/User/GameConfig/SDFE4Q.ini b/Data/Sys/GameSettings/SDFE4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SDFE4Q.ini
rename to Data/Sys/GameSettings/SDFE4Q.ini
diff --git a/Data/User/GameConfig/SDNE41.ini b/Data/Sys/GameSettings/SDNE41.ini
similarity index 100%
rename from Data/User/GameConfig/SDNE41.ini
rename to Data/Sys/GameSettings/SDNE41.ini
diff --git a/Data/User/GameConfig/SDNP41.ini b/Data/Sys/GameSettings/SDNP41.ini
similarity index 100%
rename from Data/User/GameConfig/SDNP41.ini
rename to Data/Sys/GameSettings/SDNP41.ini
diff --git a/Data/User/GameConfig/SDWE18.ini b/Data/Sys/GameSettings/SDWE18.ini
similarity index 100%
rename from Data/User/GameConfig/SDWE18.ini
rename to Data/Sys/GameSettings/SDWE18.ini
diff --git a/Data/User/GameConfig/SDWJ18.ini b/Data/Sys/GameSettings/SDWJ18.ini
similarity index 100%
rename from Data/User/GameConfig/SDWJ18.ini
rename to Data/Sys/GameSettings/SDWJ18.ini
diff --git a/Data/User/GameConfig/SDWP18.ini b/Data/Sys/GameSettings/SDWP18.ini
similarity index 100%
rename from Data/User/GameConfig/SDWP18.ini
rename to Data/Sys/GameSettings/SDWP18.ini
diff --git a/Data/User/GameConfig/SE2P69.ini b/Data/Sys/GameSettings/SE2P69.ini
similarity index 100%
rename from Data/User/GameConfig/SE2P69.ini
rename to Data/Sys/GameSettings/SE2P69.ini
diff --git a/Data/User/GameConfig/SEAE69.ini b/Data/Sys/GameSettings/SEAE69.ini
similarity index 100%
rename from Data/User/GameConfig/SEAE69.ini
rename to Data/Sys/GameSettings/SEAE69.ini
diff --git a/Data/User/GameConfig/SEAJ13.ini b/Data/Sys/GameSettings/SEAJ13.ini
similarity index 100%
rename from Data/User/GameConfig/SEAJ13.ini
rename to Data/Sys/GameSettings/SEAJ13.ini
diff --git a/Data/User/GameConfig/SEAP69.ini b/Data/Sys/GameSettings/SEAP69.ini
similarity index 100%
rename from Data/User/GameConfig/SEAP69.ini
rename to Data/Sys/GameSettings/SEAP69.ini
diff --git a/Data/User/GameConfig/SEME4Q.ini b/Data/Sys/GameSettings/SEME4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SEME4Q.ini
rename to Data/Sys/GameSettings/SEME4Q.ini
diff --git a/Data/User/GameConfig/SEMJ01.ini b/Data/Sys/GameSettings/SEMJ01.ini
similarity index 100%
rename from Data/User/GameConfig/SEMJ01.ini
rename to Data/Sys/GameSettings/SEMJ01.ini
diff --git a/Data/User/GameConfig/SEMP4Q.ini b/Data/Sys/GameSettings/SEMP4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SEMP4Q.ini
rename to Data/Sys/GameSettings/SEMP4Q.ini
diff --git a/Data/User/GameConfig/SEMX4Q.ini b/Data/Sys/GameSettings/SEMX4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SEMX4Q.ini
rename to Data/Sys/GameSettings/SEMX4Q.ini
diff --git a/Data/User/GameConfig/SEMY4Q.ini b/Data/Sys/GameSettings/SEMY4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SEMY4Q.ini
rename to Data/Sys/GameSettings/SEMY4Q.ini
diff --git a/Data/User/GameConfig/SEMZ4Q.ini b/Data/Sys/GameSettings/SEMZ4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SEMZ4Q.ini
rename to Data/Sys/GameSettings/SEMZ4Q.ini
diff --git a/Data/User/GameConfig/SERE4Q.ini b/Data/Sys/GameSettings/SERE4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SERE4Q.ini
rename to Data/Sys/GameSettings/SERE4Q.ini
diff --git a/Data/User/GameConfig/SERF4Q.ini b/Data/Sys/GameSettings/SERF4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SERF4Q.ini
rename to Data/Sys/GameSettings/SERF4Q.ini
diff --git a/Data/User/GameConfig/SERP4Q.ini b/Data/Sys/GameSettings/SERP4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SERP4Q.ini
rename to Data/Sys/GameSettings/SERP4Q.ini
diff --git a/Data/User/GameConfig/SF8E01.ini b/Data/Sys/GameSettings/SF8E01.ini
similarity index 100%
rename from Data/User/GameConfig/SF8E01.ini
rename to Data/Sys/GameSettings/SF8E01.ini
diff --git a/Data/User/GameConfig/SF8J01.ini b/Data/Sys/GameSettings/SF8J01.ini
similarity index 100%
rename from Data/User/GameConfig/SF8J01.ini
rename to Data/Sys/GameSettings/SF8J01.ini
diff --git a/Data/User/GameConfig/SF8P01.ini b/Data/Sys/GameSettings/SF8P01.ini
similarity index 100%
rename from Data/User/GameConfig/SF8P01.ini
rename to Data/Sys/GameSettings/SF8P01.ini
diff --git a/Data/User/GameConfig/SFIE01.ini b/Data/Sys/GameSettings/SFIE01.ini
similarity index 100%
rename from Data/User/GameConfig/SFIE01.ini
rename to Data/Sys/GameSettings/SFIE01.ini
diff --git a/Data/User/GameConfig/SFIP01.ini b/Data/Sys/GameSettings/SFIP01.ini
similarity index 100%
rename from Data/User/GameConfig/SFIP01.ini
rename to Data/Sys/GameSettings/SFIP01.ini
diff --git a/Data/User/GameConfig/SFWE69.ini b/Data/Sys/GameSettings/SFWE69.ini
similarity index 100%
rename from Data/User/GameConfig/SFWE69.ini
rename to Data/Sys/GameSettings/SFWE69.ini
diff --git a/Data/User/GameConfig/SFWP69.ini b/Data/Sys/GameSettings/SFWP69.ini
similarity index 100%
rename from Data/User/GameConfig/SFWP69.ini
rename to Data/Sys/GameSettings/SFWP69.ini
diff --git a/Data/User/GameConfig/SGAP8P.ini b/Data/Sys/GameSettings/SGAP8P.ini
similarity index 100%
rename from Data/User/GameConfig/SGAP8P.ini
rename to Data/Sys/GameSettings/SGAP8P.ini
diff --git a/Data/User/GameConfig/SH6E52.ini b/Data/Sys/GameSettings/SH6E52.ini
similarity index 100%
rename from Data/User/GameConfig/SH6E52.ini
rename to Data/Sys/GameSettings/SH6E52.ini
diff --git a/Data/User/GameConfig/SHDE52.ini b/Data/Sys/GameSettings/SHDE52.ini
similarity index 100%
rename from Data/User/GameConfig/SHDE52.ini
rename to Data/Sys/GameSettings/SHDE52.ini
diff --git a/Data/User/GameConfig/SHLPA4.ini b/Data/Sys/GameSettings/SHLPA4.ini
similarity index 100%
rename from Data/User/GameConfig/SHLPA4.ini
rename to Data/Sys/GameSettings/SHLPA4.ini
diff --git a/Data/User/GameConfig/SILE78.ini b/Data/Sys/GameSettings/SILE78.ini
similarity index 100%
rename from Data/User/GameConfig/SILE78.ini
rename to Data/Sys/GameSettings/SILE78.ini
diff --git a/Data/User/GameConfig/SILP78.ini b/Data/Sys/GameSettings/SILP78.ini
similarity index 100%
rename from Data/User/GameConfig/SILP78.ini
rename to Data/Sys/GameSettings/SILP78.ini
diff --git a/Data/User/GameConfig/SJBE52.ini b/Data/Sys/GameSettings/SJBE52.ini
similarity index 100%
rename from Data/User/GameConfig/SJBE52.ini
rename to Data/Sys/GameSettings/SJBE52.ini
diff --git a/Data/User/GameConfig/SJBP52.ini b/Data/Sys/GameSettings/SJBP52.ini
similarity index 100%
rename from Data/User/GameConfig/SJBP52.ini
rename to Data/Sys/GameSettings/SJBP52.ini
diff --git a/Data/User/GameConfig/SJDE41.ini b/Data/Sys/GameSettings/SJDE41.ini
similarity index 100%
rename from Data/User/GameConfig/SJDE41.ini
rename to Data/Sys/GameSettings/SJDE41.ini
diff --git a/Data/User/GameConfig/SJDP41.ini b/Data/Sys/GameSettings/SJDP41.ini
similarity index 100%
rename from Data/User/GameConfig/SJDP41.ini
rename to Data/Sys/GameSettings/SJDP41.ini
diff --git a/Data/User/GameConfig/SJDY41.ini b/Data/Sys/GameSettings/SJDY41.ini
similarity index 100%
rename from Data/User/GameConfig/SJDY41.ini
rename to Data/Sys/GameSettings/SJDY41.ini
diff --git a/Data/User/GameConfig/SJDZ41.ini b/Data/Sys/GameSettings/SJDZ41.ini
similarity index 100%
rename from Data/User/GameConfig/SJDZ41.ini
rename to Data/Sys/GameSettings/SJDZ41.ini
diff --git a/Data/User/GameConfig/SJXD41.ini b/Data/Sys/GameSettings/SJXD41.ini
similarity index 98%
rename from Data/User/GameConfig/SJXD41.ini
rename to Data/Sys/GameSettings/SJXD41.ini
index 10227122e8..31586b5e5d 100644
--- a/Data/User/GameConfig/SJXD41.ini
+++ b/Data/Sys/GameSettings/SJXD41.ini
@@ -18,4 +18,3 @@ PH_ZNear =
 PH_ZFar = 
 [Video_Enhancements]
 MaxAnisotropy = 0
-[Gecko]
diff --git a/Data/User/GameConfig/SJXE41.ini b/Data/Sys/GameSettings/SJXE41.ini
similarity index 98%
rename from Data/User/GameConfig/SJXE41.ini
rename to Data/Sys/GameSettings/SJXE41.ini
index db62d82610..5834e3e951 100644
--- a/Data/User/GameConfig/SJXE41.ini
+++ b/Data/Sys/GameSettings/SJXE41.ini
@@ -18,4 +18,3 @@ PH_ZNear =
 PH_ZFar = 
 [Video_Enhancements]
 MaxAnisotropy = 0
-[Gecko]
diff --git a/Data/User/GameConfig/SJXP41.ini b/Data/Sys/GameSettings/SJXP41.ini
similarity index 98%
rename from Data/User/GameConfig/SJXP41.ini
rename to Data/Sys/GameSettings/SJXP41.ini
index d88bb20622..abf0264ef6 100644
--- a/Data/User/GameConfig/SJXP41.ini
+++ b/Data/Sys/GameSettings/SJXP41.ini
@@ -18,4 +18,3 @@ PH_ZNear =
 PH_ZFar = 
 [Video_Enhancements]
 MaxAnisotropy = 0
-[Gecko]
diff --git a/Data/User/GameConfig/SK3EEB.ini b/Data/Sys/GameSettings/SK3EEB.ini
similarity index 100%
rename from Data/User/GameConfig/SK3EEB.ini
rename to Data/Sys/GameSettings/SK3EEB.ini
diff --git a/Data/User/GameConfig/SK4E52.ini b/Data/Sys/GameSettings/SK4E52.ini
similarity index 100%
rename from Data/User/GameConfig/SK4E52.ini
rename to Data/Sys/GameSettings/SK4E52.ini
diff --git a/Data/User/GameConfig/SKJE78.ini b/Data/Sys/GameSettings/SKJE78.ini
similarity index 100%
rename from Data/User/GameConfig/SKJE78.ini
rename to Data/Sys/GameSettings/SKJE78.ini
diff --git a/Data/User/GameConfig/SKVE20.ini b/Data/Sys/GameSettings/SKVE20.ini
similarity index 100%
rename from Data/User/GameConfig/SKVE20.ini
rename to Data/Sys/GameSettings/SKVE20.ini
diff --git a/Data/User/GameConfig/SLSEXJ.ini b/Data/Sys/GameSettings/SLSEXJ.ini
similarity index 100%
rename from Data/User/GameConfig/SLSEXJ.ini
rename to Data/Sys/GameSettings/SLSEXJ.ini
diff --git a/Data/User/GameConfig/SLSJ01.ini b/Data/Sys/GameSettings/SLSJ01.ini
similarity index 100%
rename from Data/User/GameConfig/SLSJ01.ini
rename to Data/Sys/GameSettings/SLSJ01.ini
diff --git a/Data/User/GameConfig/SLSP01.ini b/Data/Sys/GameSettings/SLSP01.ini
similarity index 100%
rename from Data/User/GameConfig/SLSP01.ini
rename to Data/Sys/GameSettings/SLSP01.ini
diff --git a/Data/User/GameConfig/SLWE41.ini b/Data/Sys/GameSettings/SLWE41.ini
similarity index 100%
rename from Data/User/GameConfig/SLWE41.ini
rename to Data/Sys/GameSettings/SLWE41.ini
diff --git a/Data/User/GameConfig/SMBE8P.ini b/Data/Sys/GameSettings/SMBE8P.ini
similarity index 100%
rename from Data/User/GameConfig/SMBE8P.ini
rename to Data/Sys/GameSettings/SMBE8P.ini
diff --git a/Data/User/GameConfig/SMBP8P.ini b/Data/Sys/GameSettings/SMBP8P.ini
similarity index 100%
rename from Data/User/GameConfig/SMBP8P.ini
rename to Data/Sys/GameSettings/SMBP8P.ini
diff --git a/Data/User/GameConfig/SMFE4Q.ini b/Data/Sys/GameSettings/SMFE4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SMFE4Q.ini
rename to Data/Sys/GameSettings/SMFE4Q.ini
diff --git a/Data/User/GameConfig/SMFP4Q.ini b/Data/Sys/GameSettings/SMFP4Q.ini
similarity index 100%
rename from Data/User/GameConfig/SMFP4Q.ini
rename to Data/Sys/GameSettings/SMFP4Q.ini
diff --git a/Data/User/GameConfig/SMNE01.ini b/Data/Sys/GameSettings/SMNE01.ini
similarity index 100%
rename from Data/User/GameConfig/SMNE01.ini
rename to Data/Sys/GameSettings/SMNE01.ini
diff --git a/Data/User/GameConfig/SMNJ01.ini b/Data/Sys/GameSettings/SMNJ01.ini
similarity index 100%
rename from Data/User/GameConfig/SMNJ01.ini
rename to Data/Sys/GameSettings/SMNJ01.ini
diff --git a/Data/User/GameConfig/SMNK01.ini b/Data/Sys/GameSettings/SMNK01.ini
similarity index 100%
rename from Data/User/GameConfig/SMNK01.ini
rename to Data/Sys/GameSettings/SMNK01.ini
diff --git a/Data/User/GameConfig/SMNP01.ini b/Data/Sys/GameSettings/SMNP01.ini
similarity index 98%
rename from Data/User/GameConfig/SMNP01.ini
rename to Data/Sys/GameSettings/SMNP01.ini
index de60c36282..fa82d55841 100644
--- a/Data/User/GameConfig/SMNP01.ini
+++ b/Data/Sys/GameSettings/SMNP01.ini
@@ -13,7 +13,7 @@ EmulationStateId = 4
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$Speed hack
+$Speed hack
 0x801D5B10:dword:0x60000000
 0x801D5B14:dword:0x60000000
 
diff --git a/Data/User/GameConfig/SMNW01.ini b/Data/Sys/GameSettings/SMNW01.ini
similarity index 100%
rename from Data/User/GameConfig/SMNW01.ini
rename to Data/Sys/GameSettings/SMNW01.ini
diff --git a/Data/User/GameConfig/SMOE41.ini b/Data/Sys/GameSettings/SMOE41.ini
similarity index 100%
rename from Data/User/GameConfig/SMOE41.ini
rename to Data/Sys/GameSettings/SMOE41.ini
diff --git a/Data/User/GameConfig/SMOP41.ini b/Data/Sys/GameSettings/SMOP41.ini
similarity index 100%
rename from Data/User/GameConfig/SMOP41.ini
rename to Data/Sys/GameSettings/SMOP41.ini
diff --git a/Data/User/GameConfig/SMOX41.ini b/Data/Sys/GameSettings/SMOX41.ini
similarity index 100%
rename from Data/User/GameConfig/SMOX41.ini
rename to Data/Sys/GameSettings/SMOX41.ini
diff --git a/Data/User/GameConfig/SN4EDA.ini b/Data/Sys/GameSettings/SN4EDA.ini
similarity index 100%
rename from Data/User/GameConfig/SN4EDA.ini
rename to Data/Sys/GameSettings/SN4EDA.ini
diff --git a/Data/User/GameConfig/SN4JDA.ini b/Data/Sys/GameSettings/SN4JDA.ini
similarity index 100%
rename from Data/User/GameConfig/SN4JDA.ini
rename to Data/Sys/GameSettings/SN4JDA.ini
diff --git a/Data/User/GameConfig/SN4XGT.ini b/Data/Sys/GameSettings/SN4XGT.ini
similarity index 100%
rename from Data/User/GameConfig/SN4XGT.ini
rename to Data/Sys/GameSettings/SN4XGT.ini
diff --git a/Data/User/GameConfig/SNCE8P.ini b/Data/Sys/GameSettings/SNCE8P.ini
similarity index 100%
rename from Data/User/GameConfig/SNCE8P.ini
rename to Data/Sys/GameSettings/SNCE8P.ini
diff --git a/Data/User/GameConfig/SNCJ8P.ini b/Data/Sys/GameSettings/SNCJ8P.ini
similarity index 100%
rename from Data/User/GameConfig/SNCJ8P.ini
rename to Data/Sys/GameSettings/SNCJ8P.ini
diff --git a/Data/User/GameConfig/SNCP8P.ini b/Data/Sys/GameSettings/SNCP8P.ini
similarity index 100%
rename from Data/User/GameConfig/SNCP8P.ini
rename to Data/Sys/GameSettings/SNCP8P.ini
diff --git a/Data/User/GameConfig/SNDE20.ini b/Data/Sys/GameSettings/SNDE20.ini
similarity index 100%
rename from Data/User/GameConfig/SNDE20.ini
rename to Data/Sys/GameSettings/SNDE20.ini
diff --git a/Data/User/GameConfig/SNJE69.ini b/Data/Sys/GameSettings/SNJE69.ini
similarity index 100%
rename from Data/User/GameConfig/SNJE69.ini
rename to Data/Sys/GameSettings/SNJE69.ini
diff --git a/Data/User/GameConfig/SNJP69.ini b/Data/Sys/GameSettings/SNJP69.ini
similarity index 100%
rename from Data/User/GameConfig/SNJP69.ini
rename to Data/Sys/GameSettings/SNJP69.ini
diff --git a/Data/User/GameConfig/SO3EE9.ini b/Data/Sys/GameSettings/SO3EE9.ini
similarity index 100%
rename from Data/User/GameConfig/SO3EE9.ini
rename to Data/Sys/GameSettings/SO3EE9.ini
diff --git a/Data/User/GameConfig/SO3J99.ini b/Data/Sys/GameSettings/SO3J99.ini
similarity index 100%
rename from Data/User/GameConfig/SO3J99.ini
rename to Data/Sys/GameSettings/SO3J99.ini
diff --git a/Data/User/GameConfig/SOJE41.ini b/Data/Sys/GameSettings/SOJE41.ini
similarity index 100%
rename from Data/User/GameConfig/SOJE41.ini
rename to Data/Sys/GameSettings/SOJE41.ini
diff --git a/Data/User/GameConfig/SOJP41.ini b/Data/Sys/GameSettings/SOJP41.ini
similarity index 100%
rename from Data/User/GameConfig/SOJP41.ini
rename to Data/Sys/GameSettings/SOJP41.ini
diff --git a/Data/User/GameConfig/SOUE01.ini b/Data/Sys/GameSettings/SOUE01.ini
similarity index 100%
rename from Data/User/GameConfig/SOUE01.ini
rename to Data/Sys/GameSettings/SOUE01.ini
diff --git a/Data/User/GameConfig/SOUJ01.ini b/Data/Sys/GameSettings/SOUJ01.ini
similarity index 100%
rename from Data/User/GameConfig/SOUJ01.ini
rename to Data/Sys/GameSettings/SOUJ01.ini
diff --git a/Data/User/GameConfig/SOUK01.ini b/Data/Sys/GameSettings/SOUK01.ini
similarity index 100%
rename from Data/User/GameConfig/SOUK01.ini
rename to Data/Sys/GameSettings/SOUK01.ini
diff --git a/Data/User/GameConfig/SOUP01.ini b/Data/Sys/GameSettings/SOUP01.ini
similarity index 100%
rename from Data/User/GameConfig/SOUP01.ini
rename to Data/Sys/GameSettings/SOUP01.ini
diff --git a/Data/User/GameConfig/SPDE52.ini b/Data/Sys/GameSettings/SPDE52.ini
similarity index 100%
rename from Data/User/GameConfig/SPDE52.ini
rename to Data/Sys/GameSettings/SPDE52.ini
diff --git a/Data/User/GameConfig/SPDP52.ini b/Data/Sys/GameSettings/SPDP52.ini
similarity index 100%
rename from Data/User/GameConfig/SPDP52.ini
rename to Data/Sys/GameSettings/SPDP52.ini
diff --git a/Data/User/GameConfig/SPPEFS.ini b/Data/Sys/GameSettings/SPPEFS.ini
similarity index 100%
rename from Data/User/GameConfig/SPPEFS.ini
rename to Data/Sys/GameSettings/SPPEFS.ini
diff --git a/Data/User/GameConfig/SPTJEB.ini b/Data/Sys/GameSettings/SPTJEB.ini
similarity index 100%
rename from Data/User/GameConfig/SPTJEB.ini
rename to Data/Sys/GameSettings/SPTJEB.ini
diff --git a/Data/User/GameConfig/SPVEA4.ini b/Data/Sys/GameSettings/SPVEA4.ini
similarity index 100%
rename from Data/User/GameConfig/SPVEA4.ini
rename to Data/Sys/GameSettings/SPVEA4.ini
diff --git a/Data/User/GameConfig/SPVPA4.ini b/Data/Sys/GameSettings/SPVPA4.ini
similarity index 100%
rename from Data/User/GameConfig/SPVPA4.ini
rename to Data/Sys/GameSettings/SPVPA4.ini
diff --git a/Data/User/GameConfig/SPVXA4.ini b/Data/Sys/GameSettings/SPVXA4.ini
similarity index 100%
rename from Data/User/GameConfig/SPVXA4.ini
rename to Data/Sys/GameSettings/SPVXA4.ini
diff --git a/Data/User/GameConfig/SPVYA4.ini b/Data/Sys/GameSettings/SPVYA4.ini
similarity index 100%
rename from Data/User/GameConfig/SPVYA4.ini
rename to Data/Sys/GameSettings/SPVYA4.ini
diff --git a/Data/User/GameConfig/SQME52.ini b/Data/Sys/GameSettings/SQME52.ini
similarity index 100%
rename from Data/User/GameConfig/SQME52.ini
rename to Data/Sys/GameSettings/SQME52.ini
diff --git a/Data/User/GameConfig/SQMP52.ini b/Data/Sys/GameSettings/SQMP52.ini
similarity index 100%
rename from Data/User/GameConfig/SQMP52.ini
rename to Data/Sys/GameSettings/SQMP52.ini
diff --git a/Data/User/GameConfig/SR5E41.ini b/Data/Sys/GameSettings/SR5E41.ini
similarity index 100%
rename from Data/User/GameConfig/SR5E41.ini
rename to Data/Sys/GameSettings/SR5E41.ini
diff --git a/Data/User/GameConfig/SRQE41.ini b/Data/Sys/GameSettings/SRQE41.ini
similarity index 100%
rename from Data/User/GameConfig/SRQE41.ini
rename to Data/Sys/GameSettings/SRQE41.ini
diff --git a/Data/User/GameConfig/SRQP41.ini b/Data/Sys/GameSettings/SRQP41.ini
similarity index 100%
rename from Data/User/GameConfig/SRQP41.ini
rename to Data/Sys/GameSettings/SRQP41.ini
diff --git a/Data/User/GameConfig/SS3EWR.ini b/Data/Sys/GameSettings/SS3EWR.ini
similarity index 100%
rename from Data/User/GameConfig/SS3EWR.ini
rename to Data/Sys/GameSettings/SS3EWR.ini
diff --git a/Data/User/GameConfig/SSQE01.ini b/Data/Sys/GameSettings/SSQE01.ini
similarity index 100%
rename from Data/User/GameConfig/SSQE01.ini
rename to Data/Sys/GameSettings/SSQE01.ini
diff --git a/Data/User/GameConfig/SSQJ01.ini b/Data/Sys/GameSettings/SSQJ01.ini
similarity index 100%
rename from Data/User/GameConfig/SSQJ01.ini
rename to Data/Sys/GameSettings/SSQJ01.ini
diff --git a/Data/User/GameConfig/SSQP01.ini b/Data/Sys/GameSettings/SSQP01.ini
similarity index 100%
rename from Data/User/GameConfig/SSQP01.ini
rename to Data/Sys/GameSettings/SSQP01.ini
diff --git a/Data/User/GameConfig/SSRE20.ini b/Data/Sys/GameSettings/SSRE20.ini
similarity index 100%
rename from Data/User/GameConfig/SSRE20.ini
rename to Data/Sys/GameSettings/SSRE20.ini
diff --git a/Data/User/GameConfig/SSRPXT.ini b/Data/Sys/GameSettings/SSRPXT.ini
similarity index 100%
rename from Data/User/GameConfig/SSRPXT.ini
rename to Data/Sys/GameSettings/SSRPXT.ini
diff --git a/Data/User/GameConfig/SSZE5G.ini b/Data/Sys/GameSettings/SSZE5G.ini
similarity index 100%
rename from Data/User/GameConfig/SSZE5G.ini
rename to Data/Sys/GameSettings/SSZE5G.ini
diff --git a/Data/User/GameConfig/STEETR.ini b/Data/Sys/GameSettings/STEETR.ini
similarity index 100%
rename from Data/User/GameConfig/STEETR.ini
rename to Data/Sys/GameSettings/STEETR.ini
diff --git a/Data/User/GameConfig/STHP8P.ini b/Data/Sys/GameSettings/STHP8P.ini
similarity index 100%
rename from Data/User/GameConfig/STHP8P.ini
rename to Data/Sys/GameSettings/STHP8P.ini
diff --git a/Data/User/GameConfig/STKE08.ini b/Data/Sys/GameSettings/STKE08.ini
similarity index 100%
rename from Data/User/GameConfig/STKE08.ini
rename to Data/Sys/GameSettings/STKE08.ini
diff --git a/Data/User/GameConfig/STKJ08.ini b/Data/Sys/GameSettings/STKJ08.ini
similarity index 100%
rename from Data/User/GameConfig/STKJ08.ini
rename to Data/Sys/GameSettings/STKJ08.ini
diff --git a/Data/User/GameConfig/STKP08.ini b/Data/Sys/GameSettings/STKP08.ini
similarity index 100%
rename from Data/User/GameConfig/STKP08.ini
rename to Data/Sys/GameSettings/STKP08.ini
diff --git a/Data/User/GameConfig/SUKE01.ini b/Data/Sys/GameSettings/SUKE01.ini
similarity index 100%
rename from Data/User/GameConfig/SUKE01.ini
rename to Data/Sys/GameSettings/SUKE01.ini
diff --git a/Data/User/GameConfig/SUKJ01.ini b/Data/Sys/GameSettings/SUKJ01.ini
similarity index 100%
rename from Data/User/GameConfig/SUKJ01.ini
rename to Data/Sys/GameSettings/SUKJ01.ini
diff --git a/Data/User/GameConfig/SUKP01.ini b/Data/Sys/GameSettings/SUKP01.ini
similarity index 100%
rename from Data/User/GameConfig/SUKP01.ini
rename to Data/Sys/GameSettings/SUKP01.ini
diff --git a/Data/User/GameConfig/SVBE52.ini b/Data/Sys/GameSettings/SVBE52.ini
similarity index 100%
rename from Data/User/GameConfig/SVBE52.ini
rename to Data/Sys/GameSettings/SVBE52.ini
diff --git a/Data/User/GameConfig/SVBP52.ini b/Data/Sys/GameSettings/SVBP52.ini
similarity index 100%
rename from Data/User/GameConfig/SVBP52.ini
rename to Data/Sys/GameSettings/SVBP52.ini
diff --git a/Data/User/GameConfig/SVME01.ini b/Data/Sys/GameSettings/SVME01.ini
similarity index 100%
rename from Data/User/GameConfig/SVME01.ini
rename to Data/Sys/GameSettings/SVME01.ini
diff --git a/Data/User/GameConfig/SVMJ01.ini b/Data/Sys/GameSettings/SVMJ01.ini
similarity index 100%
rename from Data/User/GameConfig/SVMJ01.ini
rename to Data/Sys/GameSettings/SVMJ01.ini
diff --git a/Data/User/GameConfig/SVMP01.ini b/Data/Sys/GameSettings/SVMP01.ini
similarity index 100%
rename from Data/User/GameConfig/SVMP01.ini
rename to Data/Sys/GameSettings/SVMP01.ini
diff --git a/Data/User/GameConfig/SWAE52.ini b/Data/Sys/GameSettings/SWAE52.ini
similarity index 100%
rename from Data/User/GameConfig/SWAE52.ini
rename to Data/Sys/GameSettings/SWAE52.ini
diff --git a/Data/User/GameConfig/SX3J01.ini b/Data/Sys/GameSettings/SX3J01.ini
similarity index 100%
rename from Data/User/GameConfig/SX3J01.ini
rename to Data/Sys/GameSettings/SX3J01.ini
diff --git a/Data/User/GameConfig/SX3P01.ini b/Data/Sys/GameSettings/SX3P01.ini
similarity index 100%
rename from Data/User/GameConfig/SX3P01.ini
rename to Data/Sys/GameSettings/SX3P01.ini
diff --git a/Data/User/GameConfig/SX4J01.ini b/Data/Sys/GameSettings/SX4J01.ini
similarity index 100%
rename from Data/User/GameConfig/SX4J01.ini
rename to Data/Sys/GameSettings/SX4J01.ini
diff --git a/Data/User/GameConfig/SX4P01.ini b/Data/Sys/GameSettings/SX4P01.ini
similarity index 100%
rename from Data/User/GameConfig/SX4P01.ini
rename to Data/Sys/GameSettings/SX4P01.ini
diff --git a/Data/User/GameConfig/SX8E52.ini b/Data/Sys/GameSettings/SX8E52.ini
similarity index 100%
rename from Data/User/GameConfig/SX8E52.ini
rename to Data/Sys/GameSettings/SX8E52.ini
diff --git a/Data/User/GameConfig/SXBP52.ini b/Data/Sys/GameSettings/SXBP52.ini
similarity index 100%
rename from Data/User/GameConfig/SXBP52.ini
rename to Data/Sys/GameSettings/SXBP52.ini
diff --git a/Data/User/GameConfig/SXCE52.ini b/Data/Sys/GameSettings/SXCE52.ini
similarity index 100%
rename from Data/User/GameConfig/SXCE52.ini
rename to Data/Sys/GameSettings/SXCE52.ini
diff --git a/Data/User/GameConfig/SXCP52.ini b/Data/Sys/GameSettings/SXCP52.ini
similarity index 100%
rename from Data/User/GameConfig/SXCP52.ini
rename to Data/Sys/GameSettings/SXCP52.ini
diff --git a/Data/User/GameConfig/SXDE52.ini b/Data/Sys/GameSettings/SXDE52.ini
similarity index 100%
rename from Data/User/GameConfig/SXDE52.ini
rename to Data/Sys/GameSettings/SXDE52.ini
diff --git a/Data/User/GameConfig/SXEE52.ini b/Data/Sys/GameSettings/SXEE52.ini
similarity index 96%
rename from Data/User/GameConfig/SXEE52.ini
rename to Data/Sys/GameSettings/SXEE52.ini
index 4d4975dfc4..05445fa6d8 100644
--- a/Data/User/GameConfig/SXEE52.ini
+++ b/Data/Sys/GameSettings/SXEE52.ini
@@ -13,7 +13,7 @@ EmulationIssues =
 
 [OnFrame]
 # Add memory patches to be applied every frame here.
-+$Get ingame
+$Get ingame
 0x801822D0:dword:0x60000000
 
 [ActionReplay]
diff --git a/Data/User/GameConfig/SZAE69.ini b/Data/Sys/GameSettings/SZAE69.ini
similarity index 100%
rename from Data/User/GameConfig/SZAE69.ini
rename to Data/Sys/GameSettings/SZAE69.ini
diff --git a/Data/User/GameConfig/SZAP69.ini b/Data/Sys/GameSettings/SZAP69.ini
similarity index 100%
rename from Data/User/GameConfig/SZAP69.ini
rename to Data/Sys/GameSettings/SZAP69.ini
diff --git a/Data/User/GameConfig/SZBE69.ini b/Data/Sys/GameSettings/SZBE69.ini
similarity index 100%
rename from Data/User/GameConfig/SZBE69.ini
rename to Data/Sys/GameSettings/SZBE69.ini
diff --git a/Data/User/GameConfig/SZBP69.ini b/Data/Sys/GameSettings/SZBP69.ini
similarity index 100%
rename from Data/User/GameConfig/SZBP69.ini
rename to Data/Sys/GameSettings/SZBP69.ini
diff --git a/Data/User/GameConfig/UGPE01.ini b/Data/Sys/GameSettings/UGPE01.ini
similarity index 100%
rename from Data/User/GameConfig/UGPE01.ini
rename to Data/Sys/GameSettings/UGPE01.ini
diff --git a/Data/User/GameConfig/UGPP01.ini b/Data/Sys/GameSettings/UGPP01.ini
similarity index 100%
rename from Data/User/GameConfig/UGPP01.ini
rename to Data/Sys/GameSettings/UGPP01.ini
diff --git a/Data/User/GameConfig/W2GE08.ini b/Data/Sys/GameSettings/W2GE08.ini
similarity index 97%
rename from Data/User/GameConfig/W2GE08.ini
rename to Data/Sys/GameSettings/W2GE08.ini
index 62a7b848ea..0e5cae1f0d 100644
--- a/Data/User/GameConfig/W2GE08.ini
+++ b/Data/Sys/GameSettings/W2GE08.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 [Video_Settings]
diff --git a/Data/User/GameConfig/W2GP08.ini b/Data/Sys/GameSettings/W2GP08.ini
similarity index 97%
rename from Data/User/GameConfig/W2GP08.ini
rename to Data/Sys/GameSettings/W2GP08.ini
index 0d265ca35d..56990dee85 100644
--- a/Data/User/GameConfig/W2GP08.ini
+++ b/Data/Sys/GameSettings/W2GP08.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 [Video_Settings]
diff --git a/Data/User/GameConfig/W2MEBB.ini b/Data/Sys/GameSettings/W2MEBB.ini
similarity index 100%
rename from Data/User/GameConfig/W2MEBB.ini
rename to Data/Sys/GameSettings/W2MEBB.ini
diff --git a/Data/User/GameConfig/W3GE08.ini b/Data/Sys/GameSettings/W3GE08.ini
similarity index 97%
rename from Data/User/GameConfig/W3GE08.ini
rename to Data/Sys/GameSettings/W3GE08.ini
index 1759930dea..24dc6f7548 100644
--- a/Data/User/GameConfig/W3GE08.ini
+++ b/Data/Sys/GameSettings/W3GE08.ini
@@ -16,4 +16,3 @@ PH_ZFar =
 EFBEmulateFormatChanges = True
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-[Gecko]
diff --git a/Data/User/GameConfig/W3GP08.ini b/Data/Sys/GameSettings/W3GP08.ini
similarity index 97%
rename from Data/User/GameConfig/W3GP08.ini
rename to Data/Sys/GameSettings/W3GP08.ini
index 46c0206e2b..72b60de292 100644
--- a/Data/User/GameConfig/W3GP08.ini
+++ b/Data/Sys/GameSettings/W3GP08.ini
@@ -16,4 +16,3 @@ PH_ZFar =
 EFBEmulateFormatChanges = True
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
-[Gecko]
diff --git a/Data/User/GameConfig/W8CEXS.ini b/Data/Sys/GameSettings/W8CEXS.ini
similarity index 100%
rename from Data/User/GameConfig/W8CEXS.ini
rename to Data/Sys/GameSettings/W8CEXS.ini
diff --git a/Data/User/GameConfig/W8CPXS.ini b/Data/Sys/GameSettings/W8CPXS.ini
similarity index 100%
rename from Data/User/GameConfig/W8CPXS.ini
rename to Data/Sys/GameSettings/W8CPXS.ini
diff --git a/Data/User/GameConfig/WA4P01.ini b/Data/Sys/GameSettings/WA4P01.ini
similarity index 100%
rename from Data/User/GameConfig/WA4P01.ini
rename to Data/Sys/GameSettings/WA4P01.ini
diff --git a/Data/User/GameConfig/WALE01.ini b/Data/Sys/GameSettings/WALE01.ini
similarity index 100%
rename from Data/User/GameConfig/WALE01.ini
rename to Data/Sys/GameSettings/WALE01.ini
diff --git a/Data/User/GameConfig/WAYETJ.ini b/Data/Sys/GameSettings/WAYETJ.ini
similarity index 100%
rename from Data/User/GameConfig/WAYETJ.ini
rename to Data/Sys/GameSettings/WAYETJ.ini
diff --git a/Data/User/GameConfig/WB2ETL.ini b/Data/Sys/GameSettings/WB2ETL.ini
similarity index 96%
rename from Data/User/GameConfig/WB2ETL.ini
rename to Data/Sys/GameSettings/WB2ETL.ini
index b7f7d48ca0..5ea90f06c8 100644
--- a/Data/User/GameConfig/WB2ETL.ini
+++ b/Data/Sys/GameSettings/WB2ETL.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WB3ETL.ini b/Data/Sys/GameSettings/WB3ETL.ini
similarity index 96%
rename from Data/User/GameConfig/WB3ETL.ini
rename to Data/Sys/GameSettings/WB3ETL.ini
index 2954bef58e..fb6c0cbd62 100644
--- a/Data/User/GameConfig/WB3ETL.ini
+++ b/Data/Sys/GameSettings/WB3ETL.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WB6EGL.ini b/Data/Sys/GameSettings/WB6EGL.ini
similarity index 96%
rename from Data/User/GameConfig/WB6EGL.ini
rename to Data/Sys/GameSettings/WB6EGL.ini
index 8af762c359..1af5dfc320 100644
--- a/Data/User/GameConfig/WB6EGL.ini
+++ b/Data/Sys/GameSettings/WB6EGL.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WBLPGD.ini b/Data/Sys/GameSettings/WBLPGD.ini
similarity index 100%
rename from Data/User/GameConfig/WBLPGD.ini
rename to Data/Sys/GameSettings/WBLPGD.ini
diff --git a/Data/User/GameConfig/WBME01.ini b/Data/Sys/GameSettings/WBME01.ini
similarity index 100%
rename from Data/User/GameConfig/WBME01.ini
rename to Data/Sys/GameSettings/WBME01.ini
diff --git a/Data/User/GameConfig/WBQE18.ini b/Data/Sys/GameSettings/WBQE18.ini
similarity index 100%
rename from Data/User/GameConfig/WBQE18.ini
rename to Data/Sys/GameSettings/WBQE18.ini
diff --git a/Data/User/GameConfig/WBXETL.ini b/Data/Sys/GameSettings/WBXETL.ini
similarity index 96%
rename from Data/User/GameConfig/WBXETL.ini
rename to Data/Sys/GameSettings/WBXETL.ini
index 6520392f0c..c8b46841c8 100644
--- a/Data/User/GameConfig/WBXETL.ini
+++ b/Data/Sys/GameSettings/WBXETL.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WBYETL.ini b/Data/Sys/GameSettings/WBYETL.ini
similarity index 97%
rename from Data/User/GameConfig/WBYETL.ini
rename to Data/Sys/GameSettings/WBYETL.ini
index 55bb77dbb4..cade2f4991 100644
--- a/Data/User/GameConfig/WBYETL.ini
+++ b/Data/Sys/GameSettings/WBYETL.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WBZETL.ini b/Data/Sys/GameSettings/WBZETL.ini
similarity index 97%
rename from Data/User/GameConfig/WBZETL.ini
rename to Data/Sys/GameSettings/WBZETL.ini
index 3fb8e504d7..1529c395fd 100644
--- a/Data/User/GameConfig/WBZETL.ini
+++ b/Data/Sys/GameSettings/WBZETL.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WC6EUP.ini b/Data/Sys/GameSettings/WC6EUP.ini
similarity index 98%
rename from Data/User/GameConfig/WC6EUP.ini
rename to Data/Sys/GameSettings/WC6EUP.ini
index 8996b68646..62567fa8d1 100644
--- a/Data/User/GameConfig/WC6EUP.ini
+++ b/Data/Sys/GameSettings/WC6EUP.ini
@@ -16,7 +16,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WCHEJS.ini b/Data/Sys/GameSettings/WCHEJS.ini
similarity index 97%
rename from Data/User/GameConfig/WCHEJS.ini
rename to Data/Sys/GameSettings/WCHEJS.ini
index df3f05b26f..2d36a7ca61 100644
--- a/Data/User/GameConfig/WCHEJS.ini
+++ b/Data/Sys/GameSettings/WCHEJS.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 EFBToTextureEnable = False
diff --git a/Data/User/GameConfig/WCVENV.ini b/Data/Sys/GameSettings/WCVENV.ini
similarity index 100%
rename from Data/User/GameConfig/WCVENV.ini
rename to Data/Sys/GameSettings/WCVENV.ini
diff --git a/Data/User/GameConfig/WD9EA4.ini b/Data/Sys/GameSettings/WD9EA4.ini
similarity index 100%
rename from Data/User/GameConfig/WD9EA4.ini
rename to Data/Sys/GameSettings/WD9EA4.ini
diff --git a/Data/User/GameConfig/WDME01.ini b/Data/Sys/GameSettings/WDME01.ini
similarity index 100%
rename from Data/User/GameConfig/WDME01.ini
rename to Data/Sys/GameSettings/WDME01.ini
diff --git a/Data/User/GameConfig/WDMP01.ini b/Data/Sys/GameSettings/WDMP01.ini
similarity index 100%
rename from Data/User/GameConfig/WDMP01.ini
rename to Data/Sys/GameSettings/WDMP01.ini
diff --git a/Data/User/GameConfig/WERP18.ini b/Data/Sys/GameSettings/WERP18.ini
similarity index 100%
rename from Data/User/GameConfig/WERP18.ini
rename to Data/Sys/GameSettings/WERP18.ini
diff --git a/Data/User/GameConfig/WF4EGD.ini b/Data/Sys/GameSettings/WF4EGD.ini
similarity index 100%
rename from Data/User/GameConfig/WF4EGD.ini
rename to Data/Sys/GameSettings/WF4EGD.ini
diff --git a/Data/User/GameConfig/WFLE01.ini b/Data/Sys/GameSettings/WFLE01.ini
similarity index 96%
rename from Data/User/GameConfig/WFLE01.ini
rename to Data/Sys/GameSettings/WFLE01.ini
index 3b5e8530f4..b5e7489086 100644
--- a/Data/User/GameConfig/WFLE01.ini
+++ b/Data/Sys/GameSettings/WFLE01.ini
@@ -12,6 +12,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
diff --git a/Data/User/GameConfig/WFUEQQ.ini b/Data/Sys/GameSettings/WFUEQQ.ini
similarity index 96%
rename from Data/User/GameConfig/WFUEQQ.ini
rename to Data/Sys/GameSettings/WFUEQQ.ini
index fce18cf20c..f86db23cda 100644
--- a/Data/User/GameConfig/WFUEQQ.ini
+++ b/Data/Sys/GameSettings/WFUEQQ.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WGDEA4.ini b/Data/Sys/GameSettings/WGDEA4.ini
similarity index 100%
rename from Data/User/GameConfig/WGDEA4.ini
rename to Data/Sys/GameSettings/WGDEA4.ini
diff --git a/Data/User/GameConfig/WGDPA4.ini b/Data/Sys/GameSettings/WGDPA4.ini
similarity index 100%
rename from Data/User/GameConfig/WGDPA4.ini
rename to Data/Sys/GameSettings/WGDPA4.ini
diff --git a/Data/User/GameConfig/WGOEWG.ini b/Data/Sys/GameSettings/WGOEWG.ini
similarity index 100%
rename from Data/User/GameConfig/WGOEWG.ini
rename to Data/Sys/GameSettings/WGOEWG.ini
diff --git a/Data/User/GameConfig/WGOPWG.ini b/Data/Sys/GameSettings/WGOPWG.ini
similarity index 100%
rename from Data/User/GameConfig/WGOPWG.ini
rename to Data/Sys/GameSettings/WGOPWG.ini
diff --git a/Data/User/GameConfig/WGSE08.ini b/Data/Sys/GameSettings/WGSE08.ini
similarity index 98%
rename from Data/User/GameConfig/WGSE08.ini
rename to Data/Sys/GameSettings/WGSE08.ini
index 9ede5a162d..e6e02e3c44 100644
--- a/Data/User/GameConfig/WGSE08.ini
+++ b/Data/Sys/GameSettings/WGSE08.ini
@@ -16,7 +16,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 [Video_Settings]
diff --git a/Data/User/GameConfig/WGSP08.ini b/Data/Sys/GameSettings/WGSP08.ini
similarity index 98%
rename from Data/User/GameConfig/WGSP08.ini
rename to Data/Sys/GameSettings/WGSP08.ini
index a3eeca61e5..8bf5201a6b 100644
--- a/Data/User/GameConfig/WGSP08.ini
+++ b/Data/Sys/GameSettings/WGSP08.ini
@@ -16,7 +16,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Hacks]
 EFBEmulateFormatChanges = True
 [Video_Settings]
diff --git a/Data/User/GameConfig/WGYEHN.ini b/Data/Sys/GameSettings/WGYEHN.ini
similarity index 100%
rename from Data/User/GameConfig/WGYEHN.ini
rename to Data/Sys/GameSettings/WGYEHN.ini
diff --git a/Data/User/GameConfig/WHFETY.ini b/Data/Sys/GameSettings/WHFETY.ini
similarity index 100%
rename from Data/User/GameConfig/WHFETY.ini
rename to Data/Sys/GameSettings/WHFETY.ini
diff --git a/Data/User/GameConfig/WHWEFJ.ini b/Data/Sys/GameSettings/WHWEFJ.ini
similarity index 97%
rename from Data/User/GameConfig/WHWEFJ.ini
rename to Data/Sys/GameSettings/WHWEFJ.ini
index 87fdaae304..f281b7133f 100644
--- a/Data/User/GameConfig/WHWEFJ.ini
+++ b/Data/Sys/GameSettings/WHWEFJ.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
 [Video_Hacks]
diff --git a/Data/User/GameConfig/WHWPFJ.ini b/Data/Sys/GameSettings/WHWPFJ.ini
similarity index 97%
rename from Data/User/GameConfig/WHWPFJ.ini
rename to Data/Sys/GameSettings/WHWPFJ.ini
index 0c658b96f6..afaf2267c4 100644
--- a/Data/User/GameConfig/WHWPFJ.ini
+++ b/Data/Sys/GameSettings/WHWPFJ.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 0
 [Video_Hacks]
diff --git a/Data/User/GameConfig/WICPKQ.ini b/Data/Sys/GameSettings/WICPKQ.ini
similarity index 100%
rename from Data/User/GameConfig/WICPKQ.ini
rename to Data/Sys/GameSettings/WICPKQ.ini
diff --git a/Data/User/GameConfig/WIDEUN.ini b/Data/Sys/GameSettings/WIDEUN.ini
similarity index 100%
rename from Data/User/GameConfig/WIDEUN.ini
rename to Data/Sys/GameSettings/WIDEUN.ini
diff --git a/Data/User/GameConfig/WILETL.ini b/Data/Sys/GameSettings/WILETL.ini
similarity index 100%
rename from Data/User/GameConfig/WILETL.ini
rename to Data/Sys/GameSettings/WILETL.ini
diff --git a/Data/User/GameConfig/WIYETL.ini b/Data/Sys/GameSettings/WIYETL.ini
similarity index 100%
rename from Data/User/GameConfig/WIYETL.ini
rename to Data/Sys/GameSettings/WIYETL.ini
diff --git a/Data/User/GameConfig/WJEEJX.ini b/Data/Sys/GameSettings/WJEEJX.ini
similarity index 100%
rename from Data/User/GameConfig/WJEEJX.ini
rename to Data/Sys/GameSettings/WJEEJX.ini
diff --git a/Data/User/GameConfig/WKTJA4.ini b/Data/Sys/GameSettings/WKTJA4.ini
similarity index 100%
rename from Data/User/GameConfig/WKTJA4.ini
rename to Data/Sys/GameSettings/WKTJA4.ini
diff --git a/Data/User/GameConfig/WKTPA4.ini b/Data/Sys/GameSettings/WKTPA4.ini
similarity index 100%
rename from Data/User/GameConfig/WKTPA4.ini
rename to Data/Sys/GameSettings/WKTPA4.ini
diff --git a/Data/User/GameConfig/WLOEHL.ini b/Data/Sys/GameSettings/WLOEHL.ini
similarity index 100%
rename from Data/User/GameConfig/WLOEHL.ini
rename to Data/Sys/GameSettings/WLOEHL.ini
diff --git a/Data/User/GameConfig/WLWEHL.ini b/Data/Sys/GameSettings/WLWEHL.ini
similarity index 100%
rename from Data/User/GameConfig/WLWEHL.ini
rename to Data/Sys/GameSettings/WLWEHL.ini
diff --git a/Data/User/GameConfig/WM8E18.ini b/Data/Sys/GameSettings/WM8E18.ini
similarity index 100%
rename from Data/User/GameConfig/WM8E18.ini
rename to Data/Sys/GameSettings/WM8E18.ini
diff --git a/Data/User/GameConfig/WMBP01.ini b/Data/Sys/GameSettings/WMBP01.ini
similarity index 100%
rename from Data/User/GameConfig/WMBP01.ini
rename to Data/Sys/GameSettings/WMBP01.ini
diff --git a/Data/User/GameConfig/WMMEAF.ini b/Data/Sys/GameSettings/WMMEAF.ini
similarity index 100%
rename from Data/User/GameConfig/WMMEAF.ini
rename to Data/Sys/GameSettings/WMMEAF.ini
diff --git a/Data/User/GameConfig/WOTEM0.ini b/Data/Sys/GameSettings/WOTEM0.ini
similarity index 100%
rename from Data/User/GameConfig/WOTEM0.ini
rename to Data/Sys/GameSettings/WOTEM0.ini
diff --git a/Data/User/GameConfig/WPCE01.ini b/Data/Sys/GameSettings/WPCE01.ini
similarity index 98%
rename from Data/User/GameConfig/WPCE01.ini
rename to Data/Sys/GameSettings/WPCE01.ini
index 550e1424b4..632a6849a1 100644
--- a/Data/User/GameConfig/WPCE01.ini
+++ b/Data/Sys/GameSettings/WPCE01.ini
@@ -16,4 +16,3 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
diff --git a/Data/User/GameConfig/WPJEJW.ini b/Data/Sys/GameSettings/WPJEJW.ini
similarity index 97%
rename from Data/User/GameConfig/WPJEJW.ini
rename to Data/Sys/GameSettings/WPJEJW.ini
index 8f3f896d73..4c2ad883b7 100644
--- a/Data/User/GameConfig/WPJEJW.ini
+++ b/Data/Sys/GameSettings/WPJEJW.ini
@@ -12,6 +12,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/WPPEXS.ini b/Data/Sys/GameSettings/WPPEXS.ini
similarity index 100%
rename from Data/User/GameConfig/WPPEXS.ini
rename to Data/Sys/GameSettings/WPPEXS.ini
diff --git a/Data/User/GameConfig/WPPJJF.ini b/Data/Sys/GameSettings/WPPJJF.ini
similarity index 100%
rename from Data/User/GameConfig/WPPJJF.ini
rename to Data/Sys/GameSettings/WPPJJF.ini
diff --git a/Data/User/GameConfig/WPSE01.ini b/Data/Sys/GameSettings/WPSE01.ini
similarity index 100%
rename from Data/User/GameConfig/WPSE01.ini
rename to Data/Sys/GameSettings/WPSE01.ini
diff --git a/Data/User/GameConfig/WPUEGD.ini b/Data/Sys/GameSettings/WPUEGD.ini
similarity index 96%
rename from Data/User/GameConfig/WPUEGD.ini
rename to Data/Sys/GameSettings/WPUEGD.ini
index 2051ccf6eb..4b14ae7d37 100644
--- a/Data/User/GameConfig/WPUEGD.ini
+++ b/Data/Sys/GameSettings/WPUEGD.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WPYPPY.ini b/Data/Sys/GameSettings/WPYPPY.ini
similarity index 100%
rename from Data/User/GameConfig/WPYPPY.ini
rename to Data/Sys/GameSettings/WPYPPY.ini
diff --git a/Data/User/GameConfig/WR9E08.ini b/Data/Sys/GameSettings/WR9E08.ini
similarity index 100%
rename from Data/User/GameConfig/WR9E08.ini
rename to Data/Sys/GameSettings/WR9E08.ini
diff --git a/Data/User/GameConfig/WR9P08.ini b/Data/Sys/GameSettings/WR9P08.ini
similarity index 100%
rename from Data/User/GameConfig/WR9P08.ini
rename to Data/Sys/GameSettings/WR9P08.ini
diff --git a/Data/User/GameConfig/WRGEHU.ini b/Data/Sys/GameSettings/WRGEHU.ini
similarity index 100%
rename from Data/User/GameConfig/WRGEHU.ini
rename to Data/Sys/GameSettings/WRGEHU.ini
diff --git a/Data/User/GameConfig/WRIPGD.ini b/Data/Sys/GameSettings/WRIPGD.ini
similarity index 100%
rename from Data/User/GameConfig/WRIPGD.ini
rename to Data/Sys/GameSettings/WRIPGD.ini
diff --git a/Data/User/GameConfig/WRUPXS.ini b/Data/Sys/GameSettings/WRUPXS.ini
similarity index 100%
rename from Data/User/GameConfig/WRUPXS.ini
rename to Data/Sys/GameSettings/WRUPXS.ini
diff --git a/Data/User/GameConfig/WRXE08.ini b/Data/Sys/GameSettings/WRXE08.ini
similarity index 100%
rename from Data/User/GameConfig/WRXE08.ini
rename to Data/Sys/GameSettings/WRXE08.ini
diff --git a/Data/User/GameConfig/WSNE8P.ini b/Data/Sys/GameSettings/WSNE8P.ini
similarity index 100%
rename from Data/User/GameConfig/WSNE8P.ini
rename to Data/Sys/GameSettings/WSNE8P.ini
diff --git a/Data/User/GameConfig/WTEELU.ini b/Data/Sys/GameSettings/WTEELU.ini
similarity index 97%
rename from Data/User/GameConfig/WTEELU.ini
rename to Data/Sys/GameSettings/WTEELU.ini
index f44112dcd3..289c72bd9d 100644
--- a/Data/User/GameConfig/WTEELU.ini
+++ b/Data/Sys/GameSettings/WTEELU.ini
@@ -12,7 +12,6 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 UseXFB = True
 UseRealXFB = False
diff --git a/Data/User/GameConfig/WTKEGL.ini b/Data/Sys/GameSettings/WTKEGL.ini
similarity index 98%
rename from Data/User/GameConfig/WTKEGL.ini
rename to Data/Sys/GameSettings/WTKEGL.ini
index 7af8152062..fffe3a11c2 100644
--- a/Data/User/GameConfig/WTKEGL.ini
+++ b/Data/Sys/GameSettings/WTKEGL.ini
@@ -16,6 +16,5 @@ PH_SZFar = 0
 PH_ExtraParam = 0
 PH_ZNear = 
 PH_ZFar = 
-[Gecko]
 [Video_Settings]
 SafeTextureCacheColorSamples = 512
diff --git a/Data/User/GameConfig/WTRPXS.ini b/Data/Sys/GameSettings/WTRPXS.ini
similarity index 100%
rename from Data/User/GameConfig/WTRPXS.ini
rename to Data/Sys/GameSettings/WTRPXS.ini
diff --git a/Data/User/GameConfig/WTTPTW.ini b/Data/Sys/GameSettings/WTTPTW.ini
similarity index 100%
rename from Data/User/GameConfig/WTTPTW.ini
rename to Data/Sys/GameSettings/WTTPTW.ini
diff --git a/Data/User/GameConfig/WTXPJS.ini b/Data/Sys/GameSettings/WTXPJS.ini
similarity index 100%
rename from Data/User/GameConfig/WTXPJS.ini
rename to Data/Sys/GameSettings/WTXPJS.ini
diff --git a/Data/User/GameConfig/WWRE01.ini b/Data/Sys/GameSettings/WWRE01.ini
similarity index 100%
rename from Data/User/GameConfig/WWRE01.ini
rename to Data/Sys/GameSettings/WWRE01.ini
diff --git a/Data/User/GameConfig/WZIPTW.ini b/Data/Sys/GameSettings/WZIPTW.ini
similarity index 100%
rename from Data/User/GameConfig/WZIPTW.ini
rename to Data/Sys/GameSettings/WZIPTW.ini
diff --git a/Data/User/GameConfig/WZPPRZ.ini b/Data/Sys/GameSettings/WZPPRZ.ini
similarity index 100%
rename from Data/User/GameConfig/WZPPRZ.ini
rename to Data/Sys/GameSettings/WZPPRZ.ini
diff --git a/Data/User/Maps/GFZE01.map b/Data/Sys/Maps/GFZE01.map
similarity index 100%
rename from Data/User/Maps/GFZE01.map
rename to Data/Sys/Maps/GFZE01.map
diff --git a/Data/User/Maps/GMBE8P.map b/Data/Sys/Maps/GMBE8P.map
similarity index 100%
rename from Data/User/Maps/GMBE8P.map
rename to Data/Sys/Maps/GMBE8P.map
diff --git a/Data/User/OpenCL/TextureDecoder.cl b/Data/Sys/OpenCL/TextureDecoder.cl
similarity index 100%
rename from Data/User/OpenCL/TextureDecoder.cl
rename to Data/Sys/OpenCL/TextureDecoder.cl
diff --git a/Data/User/Shaders/16bit.txt b/Data/Sys/Shaders/16bit.glsl
similarity index 100%
rename from Data/User/Shaders/16bit.txt
rename to Data/Sys/Shaders/16bit.glsl
diff --git a/Data/User/Shaders/32bit.txt b/Data/Sys/Shaders/32bit.glsl
similarity index 100%
rename from Data/User/Shaders/32bit.txt
rename to Data/Sys/Shaders/32bit.glsl
diff --git a/Data/User/Shaders/README.txt b/Data/Sys/Shaders/README.txt
similarity index 100%
rename from Data/User/Shaders/README.txt
rename to Data/Sys/Shaders/README.txt
diff --git a/Data/User/Shaders/acidmetal.txt b/Data/Sys/Shaders/acidmetal.glsl
similarity index 100%
rename from Data/User/Shaders/acidmetal.txt
rename to Data/Sys/Shaders/acidmetal.glsl
diff --git a/Data/User/Shaders/acidtrip.txt b/Data/Sys/Shaders/acidtrip.glsl
similarity index 100%
rename from Data/User/Shaders/acidtrip.txt
rename to Data/Sys/Shaders/acidtrip.glsl
diff --git a/Data/User/Shaders/acidtrip2.txt b/Data/Sys/Shaders/acidtrip2.glsl
similarity index 100%
rename from Data/User/Shaders/acidtrip2.txt
rename to Data/Sys/Shaders/acidtrip2.glsl
diff --git a/Data/User/Shaders/asciiart.txt b/Data/Sys/Shaders/asciiart.glsl
similarity index 100%
rename from Data/User/Shaders/asciiart.txt
rename to Data/Sys/Shaders/asciiart.glsl
diff --git a/Data/User/Shaders/auto_toon.txt b/Data/Sys/Shaders/auto_toon.glsl
similarity index 100%
rename from Data/User/Shaders/auto_toon.txt
rename to Data/Sys/Shaders/auto_toon.glsl
diff --git a/Data/User/Shaders/auto_toon2.txt b/Data/Sys/Shaders/auto_toon2.glsl
similarity index 100%
rename from Data/User/Shaders/auto_toon2.txt
rename to Data/Sys/Shaders/auto_toon2.glsl
diff --git a/Data/User/Shaders/bad_bloom.txt b/Data/Sys/Shaders/bad_bloom.glsl
similarity index 100%
rename from Data/User/Shaders/bad_bloom.txt
rename to Data/Sys/Shaders/bad_bloom.glsl
diff --git a/Data/User/Shaders/brighten.txt b/Data/Sys/Shaders/brighten.glsl
similarity index 100%
rename from Data/User/Shaders/brighten.txt
rename to Data/Sys/Shaders/brighten.glsl
diff --git a/Data/User/Shaders/chrismas.txt b/Data/Sys/Shaders/chrismas.glsl
similarity index 100%
rename from Data/User/Shaders/chrismas.txt
rename to Data/Sys/Shaders/chrismas.glsl
diff --git a/Data/User/Shaders/cool1.txt b/Data/Sys/Shaders/cool1.glsl
similarity index 100%
rename from Data/User/Shaders/cool1.txt
rename to Data/Sys/Shaders/cool1.glsl
diff --git a/Data/User/Shaders/darkerbrighter.txt b/Data/Sys/Shaders/darkerbrighter.glsl
similarity index 100%
rename from Data/User/Shaders/darkerbrighter.txt
rename to Data/Sys/Shaders/darkerbrighter.glsl
diff --git a/Data/User/Shaders/emboss.txt b/Data/Sys/Shaders/emboss.glsl
similarity index 100%
rename from Data/User/Shaders/emboss.txt
rename to Data/Sys/Shaders/emboss.glsl
diff --git a/Data/User/Shaders/fire.txt b/Data/Sys/Shaders/fire.glsl
similarity index 100%
rename from Data/User/Shaders/fire.txt
rename to Data/Sys/Shaders/fire.glsl
diff --git a/Data/User/Shaders/fire2.txt b/Data/Sys/Shaders/fire2.glsl
similarity index 100%
rename from Data/User/Shaders/fire2.txt
rename to Data/Sys/Shaders/fire2.glsl
diff --git a/Data/User/Shaders/firewater.txt b/Data/Sys/Shaders/firewater.glsl
similarity index 100%
rename from Data/User/Shaders/firewater.txt
rename to Data/Sys/Shaders/firewater.glsl
diff --git a/Data/User/Shaders/grayscale.txt b/Data/Sys/Shaders/grayscale.glsl
similarity index 100%
rename from Data/User/Shaders/grayscale.txt
rename to Data/Sys/Shaders/grayscale.glsl
diff --git a/Data/User/Shaders/grayscale2.txt b/Data/Sys/Shaders/grayscale2.glsl
similarity index 100%
rename from Data/User/Shaders/grayscale2.txt
rename to Data/Sys/Shaders/grayscale2.glsl
diff --git a/Data/User/Shaders/invert.txt b/Data/Sys/Shaders/invert.glsl
similarity index 100%
rename from Data/User/Shaders/invert.txt
rename to Data/Sys/Shaders/invert.glsl
diff --git a/Data/User/Shaders/invert_blue.txt b/Data/Sys/Shaders/invert_blue.glsl
similarity index 100%
rename from Data/User/Shaders/invert_blue.txt
rename to Data/Sys/Shaders/invert_blue.glsl
diff --git a/Data/User/Shaders/invertedoutline.txt b/Data/Sys/Shaders/invertedoutline.glsl
similarity index 100%
rename from Data/User/Shaders/invertedoutline.txt
rename to Data/Sys/Shaders/invertedoutline.glsl
diff --git a/Data/User/Shaders/mad_world.txt b/Data/Sys/Shaders/mad_world.glsl
similarity index 100%
rename from Data/User/Shaders/mad_world.txt
rename to Data/Sys/Shaders/mad_world.glsl
diff --git a/Data/User/Shaders/nightvision.txt b/Data/Sys/Shaders/nightvision.glsl
similarity index 100%
rename from Data/User/Shaders/nightvision.txt
rename to Data/Sys/Shaders/nightvision.glsl
diff --git a/Data/User/Shaders/nightvision2.txt b/Data/Sys/Shaders/nightvision2.glsl
similarity index 100%
rename from Data/User/Shaders/nightvision2.txt
rename to Data/Sys/Shaders/nightvision2.glsl
diff --git a/Data/User/Shaders/nightvision2scanlines.txt b/Data/Sys/Shaders/nightvision2scanlines.glsl
similarity index 100%
rename from Data/User/Shaders/nightvision2scanlines.txt
rename to Data/Sys/Shaders/nightvision2scanlines.glsl
diff --git a/Data/User/Shaders/posterize.txt b/Data/Sys/Shaders/posterize.glsl
similarity index 100%
rename from Data/User/Shaders/posterize.txt
rename to Data/Sys/Shaders/posterize.glsl
diff --git a/Data/User/Shaders/posterize2.txt b/Data/Sys/Shaders/posterize2.glsl
similarity index 100%
rename from Data/User/Shaders/posterize2.txt
rename to Data/Sys/Shaders/posterize2.glsl
diff --git a/Data/User/Shaders/primarycolors.txt b/Data/Sys/Shaders/primarycolors.glsl
similarity index 100%
rename from Data/User/Shaders/primarycolors.txt
rename to Data/Sys/Shaders/primarycolors.glsl
diff --git a/Data/User/Shaders/sepia.txt b/Data/Sys/Shaders/sepia.glsl
similarity index 100%
rename from Data/User/Shaders/sepia.txt
rename to Data/Sys/Shaders/sepia.glsl
diff --git a/Data/User/Shaders/sketchy.txt b/Data/Sys/Shaders/sketchy.glsl
similarity index 100%
rename from Data/User/Shaders/sketchy.txt
rename to Data/Sys/Shaders/sketchy.glsl
diff --git a/Data/User/Shaders/spookey1.txt b/Data/Sys/Shaders/spookey1.glsl
similarity index 100%
rename from Data/User/Shaders/spookey1.txt
rename to Data/Sys/Shaders/spookey1.glsl
diff --git a/Data/User/Shaders/spookey2.txt b/Data/Sys/Shaders/spookey2.glsl
similarity index 100%
rename from Data/User/Shaders/spookey2.txt
rename to Data/Sys/Shaders/spookey2.glsl
diff --git a/Data/User/Shaders/stereoscopic.txt b/Data/Sys/Shaders/stereoscopic.glsl
similarity index 100%
rename from Data/User/Shaders/stereoscopic.txt
rename to Data/Sys/Shaders/stereoscopic.glsl
diff --git a/Data/User/Shaders/stereoscopic2.txt b/Data/Sys/Shaders/stereoscopic2.glsl
similarity index 100%
rename from Data/User/Shaders/stereoscopic2.txt
rename to Data/Sys/Shaders/stereoscopic2.glsl
diff --git a/Data/User/Shaders/sunset.txt b/Data/Sys/Shaders/sunset.glsl
similarity index 100%
rename from Data/User/Shaders/sunset.txt
rename to Data/Sys/Shaders/sunset.glsl
diff --git a/Data/User/Shaders/swap_RGB_BGR.txt b/Data/Sys/Shaders/swap_RGB_BGR.glsl
similarity index 100%
rename from Data/User/Shaders/swap_RGB_BGR.txt
rename to Data/Sys/Shaders/swap_RGB_BGR.glsl
diff --git a/Data/User/Shaders/swap_RGB_BRG.txt b/Data/Sys/Shaders/swap_RGB_BRG.glsl
similarity index 100%
rename from Data/User/Shaders/swap_RGB_BRG.txt
rename to Data/Sys/Shaders/swap_RGB_BRG.glsl
diff --git a/Data/User/Shaders/swap_RGB_GBR.txt b/Data/Sys/Shaders/swap_RGB_GBR.glsl
similarity index 100%
rename from Data/User/Shaders/swap_RGB_GBR.txt
rename to Data/Sys/Shaders/swap_RGB_GBR.glsl
diff --git a/Data/User/Shaders/swap_RGB_GRB.txt b/Data/Sys/Shaders/swap_RGB_GRB.glsl
similarity index 100%
rename from Data/User/Shaders/swap_RGB_GRB.txt
rename to Data/Sys/Shaders/swap_RGB_GRB.glsl
diff --git a/Data/User/Shaders/swap_RGB_RBG.txt b/Data/Sys/Shaders/swap_RGB_RBG.glsl
similarity index 100%
rename from Data/User/Shaders/swap_RGB_RBG.txt
rename to Data/Sys/Shaders/swap_RGB_RBG.glsl
diff --git a/Data/User/Shaders/toxic.txt b/Data/Sys/Shaders/toxic.glsl
similarity index 100%
rename from Data/User/Shaders/toxic.txt
rename to Data/Sys/Shaders/toxic.glsl
diff --git a/Data/User/Themes/Boomy/README.txt b/Data/Sys/Themes/Boomy/README.txt
similarity index 100%
rename from Data/User/Themes/Boomy/README.txt
rename to Data/Sys/Themes/Boomy/README.txt
diff --git a/Data/User/Themes/Boomy/browse.png b/Data/Sys/Themes/Boomy/browse.png
similarity index 100%
rename from Data/User/Themes/Boomy/browse.png
rename to Data/Sys/Themes/Boomy/browse.png
diff --git a/Data/User/Themes/Boomy/config.png b/Data/Sys/Themes/Boomy/config.png
similarity index 100%
rename from Data/User/Themes/Boomy/config.png
rename to Data/Sys/Themes/Boomy/config.png
diff --git a/Data/User/Themes/Boomy/dsp.png b/Data/Sys/Themes/Boomy/dsp.png
similarity index 100%
rename from Data/User/Themes/Boomy/dsp.png
rename to Data/Sys/Themes/Boomy/dsp.png
diff --git a/Data/User/Themes/Boomy/fullscreen.png b/Data/Sys/Themes/Boomy/fullscreen.png
similarity index 100%
rename from Data/User/Themes/Boomy/fullscreen.png
rename to Data/Sys/Themes/Boomy/fullscreen.png
diff --git a/Data/User/Themes/Boomy/gcpad.png b/Data/Sys/Themes/Boomy/gcpad.png
similarity index 100%
rename from Data/User/Themes/Boomy/gcpad.png
rename to Data/Sys/Themes/Boomy/gcpad.png
diff --git a/Data/User/Themes/Boomy/graphics.png b/Data/Sys/Themes/Boomy/graphics.png
similarity index 100%
rename from Data/User/Themes/Boomy/graphics.png
rename to Data/Sys/Themes/Boomy/graphics.png
diff --git a/Data/User/Themes/Boomy/help.png b/Data/Sys/Themes/Boomy/help.png
similarity index 100%
rename from Data/User/Themes/Boomy/help.png
rename to Data/Sys/Themes/Boomy/help.png
diff --git a/Data/User/Themes/Boomy/nobanner.png b/Data/Sys/Themes/Boomy/nobanner.png
similarity index 100%
rename from Data/User/Themes/Boomy/nobanner.png
rename to Data/Sys/Themes/Boomy/nobanner.png
diff --git a/Data/User/Themes/Boomy/open.png b/Data/Sys/Themes/Boomy/open.png
similarity index 100%
rename from Data/User/Themes/Boomy/open.png
rename to Data/Sys/Themes/Boomy/open.png
diff --git a/Data/User/Themes/Boomy/pause.png b/Data/Sys/Themes/Boomy/pause.png
similarity index 100%
rename from Data/User/Themes/Boomy/pause.png
rename to Data/Sys/Themes/Boomy/pause.png
diff --git a/Data/User/Themes/Boomy/play.png b/Data/Sys/Themes/Boomy/play.png
similarity index 100%
rename from Data/User/Themes/Boomy/play.png
rename to Data/Sys/Themes/Boomy/play.png
diff --git a/Data/User/Themes/Boomy/refresh.png b/Data/Sys/Themes/Boomy/refresh.png
similarity index 100%
rename from Data/User/Themes/Boomy/refresh.png
rename to Data/Sys/Themes/Boomy/refresh.png
diff --git a/Data/User/Themes/Boomy/screenshot.png b/Data/Sys/Themes/Boomy/screenshot.png
similarity index 100%
rename from Data/User/Themes/Boomy/screenshot.png
rename to Data/Sys/Themes/Boomy/screenshot.png
diff --git a/Data/User/Themes/Boomy/stop.png b/Data/Sys/Themes/Boomy/stop.png
similarity index 100%
rename from Data/User/Themes/Boomy/stop.png
rename to Data/Sys/Themes/Boomy/stop.png
diff --git a/Data/User/Themes/Boomy/wiimote.png b/Data/Sys/Themes/Boomy/wiimote.png
similarity index 100%
rename from Data/User/Themes/Boomy/wiimote.png
rename to Data/Sys/Themes/Boomy/wiimote.png
diff --git a/Data/Sys/Wii/setting-kor.txt b/Data/Sys/Wii/setting-kor.txt
deleted file mode 100644
index 8c04855554..0000000000
Binary files a/Data/Sys/Wii/setting-kor.txt and /dev/null differ
diff --git a/Data/User/Wii/shared2/ec/shopsetu.log b/Data/Sys/Wii/shared2/ec/shopsetu.log
similarity index 100%
rename from Data/User/Wii/shared2/ec/shopsetu.log
rename to Data/Sys/Wii/shared2/ec/shopsetu.log
diff --git a/Data/User/Wii/shared2/succession/shop.log b/Data/Sys/Wii/shared2/succession/shop.log
similarity index 100%
rename from Data/User/Wii/shared2/succession/shop.log
rename to Data/Sys/Wii/shared2/succession/shop.log
diff --git a/Data/User/Wii/shared2/sys/SYSCONF b/Data/Sys/Wii/shared2/sys/SYSCONF
similarity index 100%
rename from Data/User/Wii/shared2/sys/SYSCONF
rename to Data/Sys/Wii/shared2/sys/SYSCONF
diff --git a/Data/User/Wii/shared2/wc24/mbox/Readme.txt b/Data/Sys/Wii/shared2/wc24/mbox/Readme.txt
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/Readme.txt
rename to Data/Sys/Wii/shared2/wc24/mbox/Readme.txt
diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/wc24recv.ctl
rename to Data/Sys/Wii/shared2/wc24/mbox/wc24recv.ctl
diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx b/Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/wc24recv.mbx
rename to Data/Sys/Wii/shared2/wc24/mbox/wc24recv.mbx
diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24send.ctl b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/wc24send.ctl
rename to Data/Sys/Wii/shared2/wc24/mbox/wc24send.ctl
diff --git a/Data/User/Wii/shared2/wc24/mbox/wc24send.mbx b/Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx
similarity index 100%
rename from Data/User/Wii/shared2/wc24/mbox/wc24send.mbx
rename to Data/Sys/Wii/shared2/wc24/mbox/wc24send.mbx
diff --git a/Data/User/Wii/shared2/wc24/misc.bin b/Data/Sys/Wii/shared2/wc24/misc.bin
similarity index 100%
rename from Data/User/Wii/shared2/wc24/misc.bin
rename to Data/Sys/Wii/shared2/wc24/misc.bin
diff --git a/Data/User/Wii/shared2/wc24/nwc24dl.bin b/Data/Sys/Wii/shared2/wc24/nwc24dl.bin
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24dl.bin
rename to Data/Sys/Wii/shared2/wc24/nwc24dl.bin
diff --git a/Data/User/Wii/shared2/wc24/nwc24fl.bin b/Data/Sys/Wii/shared2/wc24/nwc24fl.bin
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24fl.bin
rename to Data/Sys/Wii/shared2/wc24/nwc24fl.bin
diff --git a/Data/User/Wii/shared2/wc24/nwc24fls.bin b/Data/Sys/Wii/shared2/wc24/nwc24fls.bin
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24fls.bin
rename to Data/Sys/Wii/shared2/wc24/nwc24fls.bin
diff --git a/Data/User/Wii/shared2/wc24/nwc24msg.cbk b/Data/Sys/Wii/shared2/wc24/nwc24msg.cbk
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24msg.cbk
rename to Data/Sys/Wii/shared2/wc24/nwc24msg.cbk
diff --git a/Data/User/Wii/shared2/wc24/nwc24msg.cfg b/Data/Sys/Wii/shared2/wc24/nwc24msg.cfg
similarity index 100%
rename from Data/User/Wii/shared2/wc24/nwc24msg.cfg
rename to Data/Sys/Wii/shared2/wc24/nwc24msg.cfg
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
index 6703c5710c..07bfaf8a63 100644
--- a/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/DolphinEmulator.java
@@ -64,10 +64,9 @@ public final class DolphinEmulator extends Activity
 			String BaseDir = Environment.getExternalStorageDirectory()+File.separator+"dolphin-emu";
 			String ConfigDir = BaseDir + File.separator + "Config";
 			String GCDir = BaseDir + File.separator + "GC";
-			String WiiDir = BaseDir + File.separator + "Wii";
 
 			// Copy assets if needed
-			File file = new File(WiiDir + File.separator + "setting-usa.txt");
+			File file = new File(GCDir + File.separator + "font_sjis.bin");
 			if(!file.exists())
 			{
 				NativeLibrary.CreateUserFolders();
@@ -81,10 +80,6 @@ public final class DolphinEmulator extends Activity
 				CopyAsset("dsp_rom.bin",     GCDir + File.separator + "dsp_rom.bin");
 				CopyAsset("font_ansi.bin",   GCDir + File.separator + "font_ansi.bin");
 				CopyAsset("font_sjis.bin",   GCDir + File.separator + "font_sjis.bin");
-				CopyAsset("setting-eur.txt", WiiDir + File.separator + "setting-eur.txt");
-				CopyAsset("setting-jpn.txt", WiiDir + File.separator + "setting-jpn.txt");
-				CopyAsset("setting-kor.txt", WiiDir + File.separator + "setting-kor.txt");
-				CopyAsset("setting-usa.txt", WiiDir + File.separator + "setting-usa.txt");
 			}
 
 			// Load the configuration keys set in the Dolphin ini and gfx ini files
diff --git a/Source/Core/Common/Src/CommonPaths.h b/Source/Core/Common/Src/CommonPaths.h
index 38640723e5..d171bcb0a7 100644
--- a/Source/Core/Common/Src/CommonPaths.h
+++ b/Source/Core/Common/Src/CommonPaths.h
@@ -40,18 +40,13 @@
 	#define SYSDATA_DIR "Sys"
 #elif defined __APPLE__
 	#define SYSDATA_DIR "Contents/Resources/Sys"
-	#define SHARED_USER_DIR	File::GetBundleDirectory() + \
-				DIR_SEP USERDATA_DIR DIR_SEP
 #elif defined ANDROID
 	#define SYSDATA_DIR "/sdcard/dolphin-emu"
-	#define SHARED_USER_DIR SYSDATA_DIR
 #else
 	#ifdef DATA_DIR
 		#define SYSDATA_DIR DATA_DIR "sys"
-		#define SHARED_USER_DIR  DATA_DIR USERDATA_DIR DIR_SEP
 	#else
 		#define SYSDATA_DIR "sys"
-		#define SHARED_USER_DIR  ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP
 	#endif
 #endif
 
@@ -64,7 +59,7 @@
 #define GC_USER_DIR			"GC"
 #define WII_USER_DIR		"Wii"
 #define CONFIG_DIR			"Config"
-#define GAMECONFIG_DIR		"GameConfig"
+#define GAMESETTINGS_DIR	"GameSettings"
 #define MAPS_DIR			"Maps"
 #define CACHE_DIR			"Cache"
 #define SHADERCACHE_DIR		"ShaderCache"
diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp
index 8792321bf0..64f24d6420 100644
--- a/Source/Core/Common/Src/FileUtil.cpp
+++ b/Source/Core/Common/Src/FileUtil.cpp
@@ -551,11 +551,24 @@ bool DeleteDirRecursively(const std::string &directory)
 // Create directory and copy contents (does not overwrite existing files)
 void CopyDir(const std::string &source_path, const std::string &dest_path)
 {
-#ifndef _WIN32
 	if (source_path == dest_path) return;
 	if (!File::Exists(source_path)) return;
 	if (!File::Exists(dest_path)) File::CreateFullPath(dest_path);
 
+#ifdef _WIN32
+	WIN32_FIND_DATA ffd;
+	HANDLE hFind = FindFirstFile(UTF8ToTStr(source_path + "\\*").c_str(), &ffd);
+
+	if (hFind == INVALID_HANDLE_VALUE)
+	{
+		FindClose(hFind);
+		return;
+	}
+
+	do
+	{
+		const std::string virtualName(TStrToUTF8(ffd.cFileName));
+#else
 	struct dirent dirent, *result = NULL;
 	DIR *dirp = opendir(source_path.c_str());
 	if (!dirp) return;
@@ -563,10 +576,9 @@ void CopyDir(const std::string &source_path, const std::string &dest_path)
 	while (!readdir_r(dirp, &dirent, &result) && result)
 	{
 		const std::string virtualName(result->d_name);
+#endif
 		// check for "." and ".."
-		if (((virtualName[0] == '.') && (virtualName[1] == '\0')) ||
-			((virtualName[0] == '.') && (virtualName[1] == '.') &&
-			(virtualName[2] == '\0')))
+		if (virtualName == "." || virtualName == "..")
 			continue;
 
 		std::string source, dest;
@@ -580,6 +592,10 @@ void CopyDir(const std::string &source_path, const std::string &dest_path)
 			CopyDir(source, dest);
 		}
 		else if (!File::Exists(dest)) File::Copy(source, dest);
+#ifdef _WIN32
+	} while (FindNextFile(hFind, &ffd) != 0);
+	FindClose(hFind);
+#else
 	}
 	closedir(dirp);
 #endif
@@ -643,9 +659,9 @@ std::string GetSysDirectory()
 	std::string sysDir;
 
 #if defined (__APPLE__)
-	sysDir = GetBundleDirectory();
-	sysDir += DIR_SEP;
-	sysDir += SYSDATA_DIR;
+	sysDir = GetBundleDirectory() + DIR_SEP + SYSDATA_DIR;
+#elif defined (_WIN32)
+	sysDir = GetExeDirectory() + DIR_SEP + SYSDATA_DIR;
 #else
 	sysDir = SYSDATA_DIR;
 #endif
@@ -665,7 +681,52 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
 	if (paths[D_USER_IDX].empty())
 	{
 #ifdef _WIN32
-		paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
+		// Detect where the User directory is. There are four different cases (on top of the
+		// command line flag, which overrides all this):
+		// 1. HKCU\Software\Dolphin Emulator\LocalUserConfig exists and is true
+		//    -> Use GetExeDirectory()\User
+		// 2. HKCU\Software\Dolphin Emulator\UserConfigPath exists
+		//    -> Use this as the user directory path
+		// 3. My Documents exists
+		//    -> Use My Documents\Dolphin Emulator as the User directory path
+		// 4. Default
+		//    -> Use GetExeDirectory()\User
+
+		// Check our registry keys
+		HKEY hkey;
+		DWORD local = 0;
+		TCHAR configPath[MAX_PATH] = {0};
+		if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), NULL, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS)
+		{
+			DWORD size = 4;
+			if (RegQueryValueEx(hkey, TEXT("LocalUserConfig"), NULL, NULL, reinterpret_cast<LPBYTE>(&local), &size) != ERROR_SUCCESS)
+				local = 0;
+
+			size = MAX_PATH;
+			if (RegQueryValueEx(hkey, TEXT("UserConfigPath"), NULL, NULL, (LPBYTE)configPath, &size) != ERROR_SUCCESS)
+				configPath[0] = 0;
+			RegCloseKey(hkey);
+		}
+
+		// Get Program Files path in case we need it.
+		TCHAR my_documents[MAX_PATH];
+		bool my_documents_found = SUCCEEDED(SHGetFolderPath(NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, my_documents));
+
+		if (local) // Case 1
+			paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
+		else if (configPath[0]) // Case 2
+			paths[D_USER_IDX] = TStrToUTF8(configPath);
+		else if (my_documents_found) // Case 3
+			paths[D_USER_IDX] = TStrToUTF8(my_documents) + DIR_SEP "Dolphin Emulator" DIR_SEP;
+		else // Case 4
+			paths[D_USER_IDX] = GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
+
+		// Prettify the path: it will be displayed in some places, we don't want a mix of \ and /.
+		paths[D_USER_IDX] = ReplaceAll(paths[D_USER_IDX], "\\", DIR_SEP);
+
+		// Make sure it ends in DIR_SEP.
+		if (*paths[D_USER_IDX].rbegin() != DIR_SEP_CHR)
+			paths[D_USER_IDX] += DIR_SEP;
 #else
 		if (File::Exists(ROOT_DIR DIR_SEP USERDATA_DIR))
 			paths[D_USER_IDX] = ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP;
@@ -679,7 +740,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
 		paths[D_WIIROOT_IDX]		= paths[D_USER_IDX] + WII_USER_DIR;
 		paths[D_WIIUSER_IDX]		= paths[D_WIIROOT_IDX] + DIR_SEP;
 		paths[D_CONFIG_IDX]			= paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
-		paths[D_GAMECONFIG_IDX]		= paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP;
+		paths[D_GAMESETTINGS_IDX]	= paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
 		paths[D_MAPS_IDX]			= paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
 		paths[D_CACHE_IDX]			= paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
 		paths[D_SHADERCACHE_IDX]	= paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
@@ -730,37 +791,37 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new
 			break;
 
 		case D_USER_IDX:
-			paths[D_GCUSER_IDX]			= paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
-			paths[D_WIIROOT_IDX]		= paths[D_USER_IDX] + WII_USER_DIR;
-			paths[D_WIIUSER_IDX]		= paths[D_WIIROOT_IDX] + DIR_SEP;
-			paths[D_CONFIG_IDX]			= paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
-			paths[D_GAMECONFIG_IDX]		= paths[D_USER_IDX] + GAMECONFIG_DIR DIR_SEP;
-			paths[D_MAPS_IDX]			= paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
-			paths[D_CACHE_IDX]			= paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
-			paths[D_SHADERCACHE_IDX]	= paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
-			paths[D_SHADERS_IDX]		= paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
-			paths[D_STATESAVES_IDX]		= paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
-			paths[D_SCREENSHOTS_IDX]	= paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
-			paths[D_OPENCL_IDX]			= paths[D_USER_IDX] + OPENCL_DIR DIR_SEP;
-			paths[D_HIRESTEXTURES_IDX]	= paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
-			paths[D_DUMP_IDX]			= paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
-			paths[D_DUMPFRAMES_IDX]		= paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
-			paths[D_DUMPAUDIO_IDX]		= paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
-			paths[D_DUMPTEXTURES_IDX]	= paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
-			paths[D_DUMPDSP_IDX]		= paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
-			paths[D_LOGS_IDX]			= paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
-			paths[D_MAILLOGS_IDX]		= paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
-			paths[D_WIISYSCONF_IDX]		= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
-			paths[D_THEMES_IDX]			= paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
-			paths[F_DOLPHINCONFIG_IDX]	= paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
-			paths[F_DEBUGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
-			paths[F_LOGGERCONFIG_IDX]	= paths[D_CONFIG_IDX] + LOGGER_CONFIG;
-			paths[F_MAINLOG_IDX]		= paths[D_LOGS_IDX] + MAIN_LOG;
-			paths[F_WIISYSCONF_IDX]		= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
-			paths[F_RAMDUMP_IDX]		= paths[D_DUMP_IDX] + RAM_DUMP;
-			paths[F_ARAMDUMP_IDX]		= paths[D_DUMP_IDX] + ARAM_DUMP;
-			paths[F_FAKEVMEMDUMP_IDX]	= paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
-			paths[F_GCSRAM_IDX]			= paths[D_GCUSER_IDX] + GC_SRAM;
+			paths[D_GCUSER_IDX]				= paths[D_USER_IDX] + GC_USER_DIR DIR_SEP;
+			paths[D_WIIROOT_IDX]			= paths[D_USER_IDX] + WII_USER_DIR;
+			paths[D_WIIUSER_IDX]			= paths[D_WIIROOT_IDX] + DIR_SEP;
+			paths[D_CONFIG_IDX]				= paths[D_USER_IDX] + CONFIG_DIR DIR_SEP;
+			paths[D_GAMESETTINGS_IDX]		= paths[D_USER_IDX] + GAMESETTINGS_DIR DIR_SEP;
+			paths[D_MAPS_IDX]				= paths[D_USER_IDX] + MAPS_DIR DIR_SEP;
+			paths[D_CACHE_IDX]				= paths[D_USER_IDX] + CACHE_DIR DIR_SEP;
+			paths[D_SHADERCACHE_IDX]		= paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP;
+			paths[D_SHADERS_IDX]			= paths[D_USER_IDX] + SHADERS_DIR DIR_SEP;
+			paths[D_STATESAVES_IDX]			= paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP;
+			paths[D_SCREENSHOTS_IDX]		= paths[D_USER_IDX] + SCREENSHOTS_DIR DIR_SEP;
+			paths[D_OPENCL_IDX]				= paths[D_USER_IDX] + OPENCL_DIR DIR_SEP;
+			paths[D_HIRESTEXTURES_IDX]		= paths[D_USER_IDX] + HIRES_TEXTURES_DIR DIR_SEP;
+			paths[D_DUMP_IDX]				= paths[D_USER_IDX] + DUMP_DIR DIR_SEP;
+			paths[D_DUMPFRAMES_IDX]			= paths[D_DUMP_IDX] + DUMP_FRAMES_DIR DIR_SEP;
+			paths[D_DUMPAUDIO_IDX]			= paths[D_DUMP_IDX] + DUMP_AUDIO_DIR DIR_SEP;
+			paths[D_DUMPTEXTURES_IDX]		= paths[D_DUMP_IDX] + DUMP_TEXTURES_DIR DIR_SEP;
+			paths[D_DUMPDSP_IDX]			= paths[D_DUMP_IDX] + DUMP_DSP_DIR DIR_SEP;
+			paths[D_LOGS_IDX]				= paths[D_USER_IDX] + LOGS_DIR DIR_SEP;
+			paths[D_MAILLOGS_IDX]			= paths[D_LOGS_IDX] + MAIL_LOGS_DIR DIR_SEP;
+			paths[D_WIISYSCONF_IDX]			= paths[D_WIIUSER_IDX] + WII_SYSCONF_DIR DIR_SEP;
+			paths[D_THEMES_IDX]				= paths[D_USER_IDX] + THEMES_DIR DIR_SEP;
+			paths[F_DOLPHINCONFIG_IDX]		= paths[D_CONFIG_IDX] + DOLPHIN_CONFIG;
+			paths[F_DEBUGGERCONFIG_IDX]		= paths[D_CONFIG_IDX] + DEBUGGER_CONFIG;
+			paths[F_LOGGERCONFIG_IDX]		= paths[D_CONFIG_IDX] + LOGGER_CONFIG;
+			paths[F_MAINLOG_IDX]			= paths[D_LOGS_IDX] + MAIN_LOG;
+			paths[F_WIISYSCONF_IDX]			= paths[D_WIISYSCONF_IDX] + WII_SYSCONF;
+			paths[F_RAMDUMP_IDX]			= paths[D_DUMP_IDX] + RAM_DUMP;
+			paths[F_ARAMDUMP_IDX]			= paths[D_DUMP_IDX] + ARAM_DUMP;
+			paths[F_FAKEVMEMDUMP_IDX]		= paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
+			paths[F_GCSRAM_IDX]				= paths[D_GCUSER_IDX] + GC_SRAM;
 			break;
 
 		case D_CONFIG_IDX:
@@ -800,12 +861,10 @@ std::string GetThemeDir(const std::string& theme_name)
 {
 	std::string dir = File::GetUserPath(D_THEMES_IDX) + theme_name + "/";
 
-#if !defined(_WIN32)
 	// If theme does not exist in user's dir load from shared directory
 	if (!File::Exists(dir))
-		dir = SHARED_USER_DIR THEMES_DIR "/" + theme_name + "/";
-#endif
-	
+		dir = GetSysDirectory() + THEMES_DIR "/" + theme_name + "/";
+
 	return dir;
 }
 
diff --git a/Source/Core/Common/Src/FileUtil.h b/Source/Core/Common/Src/FileUtil.h
index 40aba0037d..6d0a440f69 100644
--- a/Source/Core/Common/Src/FileUtil.h
+++ b/Source/Core/Common/Src/FileUtil.h
@@ -21,8 +21,8 @@ enum {
 	D_GCUSER_IDX,
 	D_WIIROOT_IDX,
 	D_WIIUSER_IDX,
-	D_CONFIG_IDX,
-	D_GAMECONFIG_IDX,
+	D_CONFIG_IDX, // global settings
+	D_GAMESETTINGS_IDX, // user-specified settings which override both the global and the default settings (per game)
 	D_MAPS_IDX,
 	D_CACHE_IDX,
 	D_SHADERCACHE_IDX,
diff --git a/Source/Core/Common/Src/IniFile.cpp b/Source/Core/Common/Src/IniFile.cpp
index 2eca8df929..1c45a8095e 100644
--- a/Source/Core/Common/Src/IniFile.cpp
+++ b/Source/Core/Common/Src/IniFile.cpp
@@ -20,7 +20,7 @@
 
 namespace {
 
-static void ParseLine(const std::string& line, std::string* keyOut, std::string* valueOut)
+void ParseLine(const std::string& line, std::string* keyOut, std::string* valueOut)
 {
 	if (line[0] == '#')
 		return;
@@ -37,32 +37,15 @@ static void ParseLine(const std::string& line, std::string* keyOut, std::string*
 
 }
 
-std::string* IniFile::Section::GetLine(const char* key, std::string* valueOut)
-{
-	for (std::vector<std::string>::iterator iter = lines.begin(); iter != lines.end(); ++iter)
-	{
-		std::string& line = *iter;
-		std::string lineKey;
-		ParseLine(line, &lineKey, valueOut);
-		if (!strcasecmp(lineKey.c_str(), key))
-			return &line;
-	}
-	return 0;
-}
-
 void IniFile::Section::Set(const char* key, const char* newValue)
 {
-	std::string value;
-	std::string* line = GetLine(key, &value);
-	if (line)
-	{
-		// Change the value - keep the key and comment
-		*line = StripSpaces(key) + " = " + newValue;
-	}
+	auto it = values.find(key);
+	if (it != values.end())
+		it->second = newValue;
 	else
 	{
-		// The key did not already exist in this section - let's add it.
-		lines.push_back(std::string(key) + " = " + newValue);
+		values[key] = newValue;
+		keys_order.push_back(key);
 	}
 }
 
@@ -74,20 +57,6 @@ void IniFile::Section::Set(const char* key, const std::string& newValue, const s
 		Delete(key);
 }
 
-bool IniFile::Section::Get(const char* key, std::string* value, const char* defaultValue)
-{
-	std::string* line = GetLine(key, value);
-	if (!line)
-	{
-		if (defaultValue)
-		{
-			*value = defaultValue;
-		}
-		return false;
-	}
-	return true;
-}
-
 void IniFile::Section::Set(const char* key, const float newValue, const float defaultValue)
 {
 	if (newValue != defaultValue)
@@ -126,7 +95,24 @@ void IniFile::Section::Set(const char* key, const std::vector<std::string>& newV
 	Set(key, temp.c_str());
 }
 
-bool IniFile::Section::Get(const char* key, std::vector<std::string>& values) 
+bool IniFile::Section::Get(const char* key, std::string* value, const char* defaultValue)
+{
+	auto it = values.find(key);
+	if (it != values.end())
+	{
+		*value = it->second;
+		return true;
+	}
+	else if (defaultValue)
+	{
+		*value = defaultValue;
+		return true;
+	}
+	else
+		return false;
+}
+
+bool IniFile::Section::Get(const char* key, std::vector<std::string>& out)
 {
 	std::string temp;
 	bool retval = Get(key, &temp, 0);
@@ -145,7 +131,7 @@ bool IniFile::Section::Get(const char* key, std::vector<std::string>& values)
 		subEnd = temp.find_first_of(",", subStart);
 		if (subStart != subEnd) 
 			// take from first char until next , 
-			values.push_back(StripSpaces(temp.substr(subStart, subEnd - subStart)));
+			out.push_back(StripSpaces(temp.substr(subStart, subEnd - subStart)));
 	
 		// Find the next non , char
 		subStart = temp.find_first_not_of(",", subEnd);
@@ -206,28 +192,18 @@ bool IniFile::Section::Get(const char* key, double* value, double defaultValue)
 
 bool IniFile::Section::Exists(const char *key) const
 {
-	for (std::vector<std::string>::const_iterator iter = lines.begin(); iter != lines.end(); ++iter)
-	{
-		std::string lineKey;
-		ParseLine(*iter, &lineKey, NULL);
-		if (!strcasecmp(lineKey.c_str(), key))
-			return true;
-	}
-	return false;
+	return values.find(key) != values.end();
 }
 
 bool IniFile::Section::Delete(const char *key)
 {
-	std::string* line = GetLine(key, 0);
-	for (std::vector<std::string>::iterator liter = lines.begin(); liter != lines.end(); ++liter)
-	{
-		if (line == &*liter)
-		{
-			lines.erase(liter);
-			return true;
-		}
-	}
-	return false;
+	auto it = values.find(key);
+	if (it == values.end())
+		return false;
+
+	values.erase(it);
+	keys_order.erase(std::find(keys_order.begin(), keys_order.end(), key));
+	return true;
 }
 
 // IniFile
@@ -286,11 +262,7 @@ bool IniFile::Exists(const char* sectionName, const char* key) const
 void IniFile::SetLines(const char* sectionName, const std::vector<std::string> &lines)
 {
 	Section* section = GetOrCreateSection(sectionName);
-	section->lines.clear();
-	for (std::vector<std::string>::const_iterator iter = lines.begin(); iter != lines.end(); ++iter)
-	{
-		section->lines.push_back(*iter);
-	}
+	section->lines = lines;
 }
 
 bool IniFile::DeleteKey(const char* sectionName, const char* key)
@@ -298,16 +270,7 @@ bool IniFile::DeleteKey(const char* sectionName, const char* key)
 	Section* section = GetSection(sectionName);
 	if (!section)
 		return false;
-	std::string* line = section->GetLine(key, 0);
-	for (std::vector<std::string>::iterator liter = section->lines.begin(); liter != section->lines.end(); ++liter)
-	{
-		if (line == &(*liter))
-		{
-			section->lines.erase(liter);
-			return true;
-		}
-	}
-	return false; //shouldn't happen
+	return section->Delete(key);
 }
 
 // Return a list of all keys in a section
@@ -316,13 +279,7 @@ bool IniFile::GetKeys(const char* sectionName, std::vector<std::string>& keys) c
 	const Section* section = GetSection(sectionName);
 	if (!section)
 		return false;
-	keys.clear();
-	for (std::vector<std::string>::const_iterator liter = section->lines.begin(); liter != section->lines.end(); ++liter)
-	{
-		std::string key;
-		ParseLine(*liter, &key, 0);
-		keys.push_back(key);
-	}
+	keys = section->keys_order;
 	return true;
 }
 
@@ -364,13 +321,13 @@ void IniFile::SortSections()
 	std::sort(sections.begin(), sections.end());
 }
 
-bool IniFile::Load(const char* filename)
+bool IniFile::Load(const char* filename, bool keep_current_data)
 {
 	// Maximum number of letters in a line
 	static const int MAX_BYTES = 1024*32;
 
-	sections.clear();
-	sections.push_back(Section(""));
+	if (!keep_current_data)
+		sections.clear();
 	// first section consists of the comments before the first real section
 
 	// Open file
@@ -379,12 +336,13 @@ bool IniFile::Load(const char* filename)
 
 	if (in.fail()) return false;
 
+	Section* current_section = NULL;
 	while (!in.eof())
 	{
 		char templine[MAX_BYTES];
 		in.getline(templine, MAX_BYTES);
 		std::string line = templine;
-		 
+
 #ifndef _WIN32
 		// Check for CRLF eol and convert it to LF
 		if (!line.empty() && line.at(line.size()-1) == '\r')
@@ -405,12 +363,25 @@ bool IniFile::Load(const char* filename)
 				{
 					// New section!
 					std::string sub = line.substr(1, endpos - 1);
-					sections.push_back(Section(sub));
+					current_section = GetOrCreateSection(sub.c_str());
 				}
 			}
 			else
 			{
-				sections[sections.size() - 1].lines.push_back(line);
+				if (current_section)
+				{
+					std::string key, value;
+					ParseLine(line, &key, &value);
+
+					// Lines starting with '$' or '+' are kept verbatim. Kind
+					// of a hack, but the support for raw lines inside an INI
+					// is a hack anyway.
+					if ((key == "" && value == "")
+					        || (line.size() >= 1 && (line[0] == '$' || line[0] == '+')))
+						current_section->lines.push_back(line.c_str());
+					else
+						current_section->Set(key, value.c_str());
+				}
 			}
 		}
 	}
@@ -429,27 +400,33 @@ bool IniFile::Save(const char* filename)
 		return false;
 	}
 
-	// Currently testing if dolphin community can handle the requirements of C++11 compilation
-	// If you get a compiler error on this line, your compiler is probably old.
-	// Update to g++ 4.4 or a recent version of clang (XCode 4.2 on OS X).
-	// If you don't want to update, complain in a google code issue, the dolphin forums or #dolphin-emu.
 	for (auto iter = sections.begin(); iter != sections.end(); ++iter)
 	{
 		const Section& section = *iter;
 
-		if (section.name != "")
-		{
+		if (section.keys_order.size() != 0 || section.lines.size() != 0)
 			out << "[" << section.name << "]" << std::endl;
-		}
 
-		for (std::vector<std::string>::const_iterator liter = section.lines.begin(); liter != section.lines.end(); ++liter)
+		if (section.keys_order.size() == 0)
 		{
-			std::string s = *liter;
-			out << s << std::endl;
+			for (auto liter = section.lines.begin(); liter != section.lines.end(); ++liter)
+			{
+				std::string s = *liter;
+				out << s << std::endl;
+			}
+		}
+		else
+		{
+			for (auto kvit = section.keys_order.begin(); kvit != section.keys_order.end(); ++kvit)
+			{
+				auto pair = section.values.find(*kvit);
+				out << pair->first << " = " << pair->second << std::endl;
+			}
 		}
 	}
 
 	out.close();
+
 	return true;
 }
 
diff --git a/Source/Core/Common/Src/IniFile.h b/Source/Core/Common/Src/IniFile.h
index bad26ca090..0cf4ab902b 100644
--- a/Source/Core/Common/Src/IniFile.h
+++ b/Source/Core/Common/Src/IniFile.h
@@ -6,11 +6,21 @@
 #ifndef _INIFILE_H_
 #define _INIFILE_H_
 
+#include <map>
 #include <string>
+#include <set>
 #include <vector>
 
 #include "StringUtil.h"
 
+struct CaseInsensitiveStringCompare
+{
+	bool operator() (const std::string& a, const std::string& b) const
+	{
+		return strcasecmp(a.c_str(), b.c_str()) < 0;
+	}
+};
+
 class IniFile
 {
 public:
@@ -25,7 +35,6 @@ public:
 		bool Exists(const char *key) const;
 		bool Delete(const char *key);
 
-		std::string* GetLine(const char* key, std::string* valueOut);
 		void Set(const char* key, const char* newValue);
 		void Set(const char* key, const std::string& newValue, const std::string& defaultValue);
 
@@ -68,12 +77,24 @@ public:
 		}
 
 	protected:
-		std::vector<std::string> lines;
 		std::string name;
+
+		std::vector<std::string> keys_order;
+		std::map<std::string, std::string, CaseInsensitiveStringCompare> values;
+
+		std::vector<std::string> lines;
 	};
 
-	bool Load(const char* filename);
-	bool Load(const std::string &filename) { return Load(filename.c_str()); }
+	/**
+	 * Loads sections and keys.
+	 * @param filename filename of the ini file which should be loaded
+	 * @param keep_current_data If true, "extends" the currently loaded list of sections and keys with the loaded data (and replaces existing entries). If false, existing data will be erased.
+	 * @warning Using any other operations than "Get*" and "Exists" is untested and will behave unexpectedly
+	 * @todo This really is just a hack to support having two levels of gameinis (defaults and user-specified) and should eventually be replaced with a less stupid system.
+	 */
+	bool Load(const char* filename, bool keep_current_data = false);
+	bool Load(const std::string &filename, bool keep_current_data = false) { return Load(filename.c_str(), keep_current_data); }
+
 	bool Save(const char* filename);
 	bool Save(const std::string &filename) { return Save(filename.c_str()); }
 
diff --git a/Source/Core/Core/Src/ActionReplay.cpp b/Source/Core/Core/Src/ActionReplay.cpp
index 1ca57979e4..771ef5700b 100644
--- a/Source/Core/Core/Src/ActionReplay.cpp
+++ b/Source/Core/Core/Src/ActionReplay.cpp
@@ -111,115 +111,121 @@ bool CompareValues(const u32 val1, const u32 val2, const int type);
 
 // ----------------------
 // AR Remote Functions
-void LoadCodes(IniFile &ini, bool forceLoad)
+void LoadCodes(IniFile &globalIni, IniFile &localIni, bool forceLoad)
 {
 	// Parses the Action Replay section of a game ini file.
 	if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bEnableCheats 
 		&& !forceLoad) 
 		return;
 
-	std::vector<std::string> lines;
-	std::vector<std::string> encryptedLines;
-	ARCode currentCode;
 	arCodes.clear();
 
-	if (!ini.GetLines("ActionReplay", lines))
-		return;  // no codes found.
-
-	std::vector<std::string>::const_iterator
-		it = lines.begin(),
-		lines_end = lines.end();
-	for (; it != lines_end; ++it)
+	std::vector<std::string> enabledLines;
+	std::set<std::string> enabledNames;
+	localIni.GetLines("ActionReplay_Enabled", enabledLines);
+	for (auto iter = enabledLines.begin(); iter != enabledLines.end(); ++iter)
 	{
-		const std::string line = *it;
-		
-		if (line.empty())
-			continue;
-
-		std::vector<std::string> pieces;
-
-		// Check if the line is a name of the code
-		if (line[0] == '+' || line[0] == '$')
+		const std::string& line = *iter;
+		if (line.size() != 0 && line[0] == '$')
 		{
-			if (currentCode.ops.size())
-			{
-				arCodes.push_back(currentCode);
-				currentCode.ops.clear();
-			}
-			if (encryptedLines.size())
-			{
-				DecryptARCode(encryptedLines, currentCode.ops);
-				arCodes.push_back(currentCode);
-				currentCode.ops.clear();
-				encryptedLines.clear();
-			}
-
-			if (line.size() > 1)
-			{
-				if (line[0] == '+')
-				{
-					currentCode.active = true;
-					currentCode.name = line.substr(2, line.size() - 2);;
-					if (!forceLoad)
-						Core::DisplayMessage("AR code active: " + currentCode.name, 5000);
-				}
-				else
-				{
-					currentCode.active = false;
-					currentCode.name = line.substr(1, line.size() - 1);
-				}
-			}
-			continue;
+			std::string name = line.substr(1, line.size() - 1);
+			enabledNames.insert(name);
 		}
+	}
 
-		SplitString(line, ' ', pieces);
+	IniFile* inis[] = {&globalIni, &localIni};
+	for (size_t i = 0; i < ArraySize(inis); ++i)
+	{
+		std::vector<std::string> lines;
+		std::vector<std::string> encryptedLines;
+		ARCode currentCode;
+		
+		inis[i]->GetLines("ActionReplay", lines);
 
-		// Check if the AR code is decrypted
-		if (pieces.size() == 2 && pieces[0].size() == 8 && pieces[1].size() == 8)
+		std::vector<std::string>::const_iterator
+			it = lines.begin(),
+			lines_end = lines.end();
+		for (; it != lines_end; ++it)
 		{
-			AREntry op;
-			bool success_addr = TryParse(std::string("0x") + pieces[0], &op.cmd_addr);
-			bool success_val = TryParse(std::string("0x") + pieces[1], &op.value);
-			if (!(success_addr | success_val)) {
-				PanicAlertT("Action Replay Error: invalid AR code line: %s", line.c_str());
-				if (!success_addr) PanicAlertT("The address is invalid");
-				if (!success_val) PanicAlertT("The value is invalid");
+			const std::string line = *it;
+			
+			if (line.empty())
+				continue;
+
+			std::vector<std::string> pieces;
+
+			// Check if the line is a name of the code
+			if (line[0] == '$')
+			{
+				if (currentCode.ops.size())
+				{
+					arCodes.push_back(currentCode);
+					currentCode.ops.clear();
+				}
+				if (encryptedLines.size())
+				{
+					DecryptARCode(encryptedLines, currentCode.ops);
+					arCodes.push_back(currentCode);
+					currentCode.ops.clear();
+					encryptedLines.clear();
+				}
+
+				currentCode.name = line.substr(1, line.size() - 1);
+				currentCode.active = enabledNames.find(currentCode.name) != enabledNames.end();
+				currentCode.user_defined = (i == 1);
 			}
 			else
 			{
-				currentCode.ops.push_back(op);
-			}
-		}
-		else
-		{
-			SplitString(line, '-', pieces);
-			if (pieces.size() == 3 && pieces[0].size() == 4 && pieces[1].size() == 4 && pieces[2].size() == 5) 
-			{
-				// Encrypted AR code
-				// Decryption is done in "blocks", so we must push blocks into a vector,
-				//	then send to decrypt when a new block is encountered, or if it's the last block.
-				encryptedLines.push_back(pieces[0]+pieces[1]+pieces[2]);
-			}
-		}
-	}
+				SplitString(line, ' ', pieces);
 
-	// Handle the last code correctly.
-	if (currentCode.ops.size())
-	{
-		arCodes.push_back(currentCode);
-	}
-	if (encryptedLines.size())
-	{
-		DecryptARCode(encryptedLines, currentCode.ops);
-		arCodes.push_back(currentCode);
+				// Check if the AR code is decrypted
+				if (pieces.size() == 2 && pieces[0].size() == 8 && pieces[1].size() == 8)
+				{
+					AREntry op;
+					bool success_addr = TryParse(std::string("0x") + pieces[0], &op.cmd_addr);
+					bool success_val = TryParse(std::string("0x") + pieces[1], &op.value);
+					if (!(success_addr | success_val)) {
+						PanicAlertT("Action Replay Error: invalid AR code line: %s", line.c_str());
+						if (!success_addr) PanicAlertT("The address is invalid");
+						if (!success_val) PanicAlertT("The value is invalid");
+					}
+					else
+					{
+						currentCode.ops.push_back(op);
+					}
+				}
+				else
+				{
+					SplitString(line, '-', pieces);
+					if (pieces.size() == 3 && pieces[0].size() == 4 && pieces[1].size() == 4 && pieces[2].size() == 5) 
+					{
+						// Encrypted AR code
+						// Decryption is done in "blocks", so we must push blocks into a vector,
+						//	then send to decrypt when a new block is encountered, or if it's the last block.
+						encryptedLines.push_back(pieces[0]+pieces[1]+pieces[2]);
+					}
+				}
+			}
+		}
+
+		// Handle the last code correctly.
+		if (currentCode.ops.size())
+		{
+			arCodes.push_back(currentCode);
+		}
+		if (encryptedLines.size())
+		{
+			DecryptARCode(encryptedLines, currentCode.ops);
+			arCodes.push_back(currentCode);
+		}
 	}
 
 	UpdateActiveList();
 }
 
-void LoadCodes(std::vector<ARCode> &_arCodes, IniFile &ini)
+void LoadCodes(std::vector<ARCode> &_arCodes, IniFile &globalIni, IniFile& localIni)
 {
-	LoadCodes(ini, true);
+	LoadCodes(globalIni, localIni, true);
 	_arCodes = arCodes;
 }
 
diff --git a/Source/Core/Core/Src/ActionReplay.h b/Source/Core/Core/Src/ActionReplay.h
index 42c40f08c4..ac2bb7bd2a 100644
--- a/Source/Core/Core/Src/ActionReplay.h
+++ b/Source/Core/Core/Src/ActionReplay.h
@@ -23,12 +23,13 @@ struct ARCode
 	std::string name;
 	std::vector<AREntry> ops;
 	bool active;
+	bool user_defined;
 };
 
 void RunAllActive();
 bool RunCode(const ARCode &arcode);
-void LoadCodes(IniFile &ini, bool forceLoad);
-void LoadCodes(std::vector<ARCode> &_arCodes, IniFile &ini);
+void LoadCodes(IniFile &globalIni, IniFile &localIni, bool forceLoad);
+void LoadCodes(std::vector<ARCode> &_arCodes, IniFile &globalIni, IniFile &localIni);
 size_t GetCodeListSize();
 ARCode GetARCode(size_t index);
 void SetARCode_IsActive(bool active, size_t index);
diff --git a/Source/Core/Core/Src/Boot/Boot.cpp b/Source/Core/Core/Src/Boot/Boot.cpp
index f35c24c594..1d53f9814b 100644
--- a/Source/Core/Core/Src/Boot/Boot.cpp
+++ b/Source/Core/Core/Src/Boot/Boot.cpp
@@ -71,59 +71,73 @@ void CBoot::UpdateDebugger_MapLoaded(const char *_gameID)
 	Host_NotifyMapLoaded();
 }
 
-std::string CBoot::GenerateMapFilename()
+bool CBoot::FindMapFile(std::string* existing_map_file,
+                        std::string* writable_map_file)
 {
+	std::string title_id_str;
+
 	SCoreStartupParameter& _StartupPara = SConfig::GetInstance().m_LocalCoreStartupParameter;
 	switch (_StartupPara.m_BootType)
 	{
 	case SCoreStartupParameter::BOOT_WII_NAND:
 	{
-		const DiscIO::INANDContentLoader& Loader = DiscIO::CNANDContentManager::Access().GetNANDLoader(_StartupPara.m_strFilename);
+		const DiscIO::INANDContentLoader& Loader =
+				DiscIO::CNANDContentManager::Access().GetNANDLoader(_StartupPara.m_strFilename);
 		if (Loader.IsValid())
 		{
 			u64 TitleID = Loader.GetTitleID();
-			char tmpBuffer[32];
-			sprintf(tmpBuffer, "%08x_%08x", (u32)(TitleID >> 32) & 0xFFFFFFFF , (u32)TitleID & 0xFFFFFFFF );
-			return File::GetUserPath(D_MAPS_IDX) + std::string(tmpBuffer) + ".map";
+			title_id_str = StringFromFormat("%08X_%08X",
+					(u32)(TitleID >> 32) & 0xFFFFFFFF,
+					(u32)TitleID & 0xFFFFFFFF);
 		}
 		break;
 	}
 
 	case SCoreStartupParameter::BOOT_ELF:
 	case SCoreStartupParameter::BOOT_DOL:
-		return _StartupPara.m_strFilename.substr(0, _StartupPara.m_strFilename.size()-4) + ".map";
+		// Strip the .elf/.dol file extension
+		title_id_str = _StartupPara.m_strFilename.substr(
+				0, _StartupPara.m_strFilename.size() - 4);
+		break;
+
 	default:
-		return File::GetUserPath(D_MAPS_IDX) + _StartupPara.GetUniqueID() + ".map";
+		title_id_str = _StartupPara.GetUniqueID();
+		break;
 	}
 
-	return std::string("unknown map");
-}
+	if (writable_map_file)
+		*writable_map_file = File::GetUserPath(D_MAPS_IDX) + title_id_str + ".map";
 
-bool CBoot::LoadMapFromFilename(const std::string &_rFilename, const char *_gameID)
-{
-	if (_rFilename.size() == 0)
-		return false;
-
-	std::string strMapFilename = GenerateMapFilename();
-
-	bool success = false;
-	if (!g_symbolDB.LoadMap(strMapFilename.c_str()))
+	bool found = false;
+	static const std::string maps_directories[] = {
+		File::GetUserPath(D_MAPS_IDX),
+		File::GetSysDirectory() + MAPS_DIR DIR_SEP
+	};
+	for (size_t i = 0; !found && i < ArraySize(maps_directories); ++i)
 	{
-		if (_gameID != NULL)
+		std::string path = maps_directories[i] + title_id_str + ".map";
+		if (File::Exists(path))
 		{
-			BuildCompleteFilename(strMapFilename, "maps", std::string(_gameID) + ".map");
-			success = g_symbolDB.LoadMap(strMapFilename.c_str());
+			found = true;
+			if (existing_map_file)
+				*existing_map_file = path;
 		}
 	}
-	else
+
+	return found;
+}
+
+bool CBoot::LoadMapFromFilename()
+{
+	std::string strMapFilename;
+	bool found = FindMapFile(&strMapFilename, NULL);
+	if (found && g_symbolDB.LoadMap(strMapFilename.c_str()))
 	{
-		success = true;
+		UpdateDebugger_MapLoaded();
+		return true;
 	}
 
-	if (success)
-		UpdateDebugger_MapLoaded();
-
-	return success;
+	return false;
 }
 
 // If ipl.bin is not found, this function does *some* of what BS1 does: 
@@ -201,10 +215,6 @@ bool CBoot::BootUp()
 			PanicAlertT("Warning - starting ISO in wrong console mode!");
 		}
 
-		char gameID[7];
-		memcpy(gameID, pVolume->GetUniqueID().c_str(), 6);
-		gameID[6] = 0;
-
 		// setup the map from ISOFile ID
 		VolumeHandler::SetVolumeName(_StartupPara.m_strFilename);
 
@@ -252,7 +262,7 @@ bool CBoot::BootUp()
 
 		/* Try to load the symbol map if there is one, and then scan it for
 			and eventually replace code */
-		if (LoadMapFromFilename(_StartupPara.m_strFilename, gameID))
+		if (LoadMapFromFilename())
 			HLE::PatchFunctions();
 
 		// We don't need the volume any more
@@ -298,7 +308,7 @@ bool CBoot::BootUp()
 			PC = dolLoader.GetEntryPoint();
 		}
 
-		if (LoadMapFromFilename(_StartupPara.m_strFilename))
+		if (LoadMapFromFilename())
 			HLE::PatchFunctions();
 
 		break;
@@ -368,7 +378,7 @@ bool CBoot::BootUp()
 	case SCoreStartupParameter::BOOT_WII_NAND:
 		Boot_WiiWAD(_StartupPara.m_strFilename.c_str());
 
-		if (LoadMapFromFilename(_StartupPara.m_strFilename))
+		if (LoadMapFromFilename())
 			HLE::PatchFunctions();
 
 		// load default image or create virtual drive from directory
@@ -387,7 +397,7 @@ bool CBoot::BootUp()
 		DVDInterface::SetDiscInside(VolumeHandler::IsValid());
 		if (Load_BS2(_StartupPara.m_strBootROM))
 		{
-			if (LoadMapFromFilename(_StartupPara.m_strFilename))
+			if (LoadMapFromFilename())
 				HLE::PatchFunctions();
 		}
 		else
diff --git a/Source/Core/Core/Src/Boot/Boot.h b/Source/Core/Core/Src/Boot/Boot.h
index 69053b0f71..94b26273a8 100644
--- a/Source/Core/Core/Src/Boot/Boot.h
+++ b/Source/Core/Core/Src/Boot/Boot.h
@@ -16,14 +16,26 @@ public:
 
 	static bool BootUp();
 	static bool IsElfWii(const char *filename);
-	static std::string GenerateMapFilename();
+
+	// Tries to find a map file for the current game by looking first in the
+	// local user directory, then in the shared user directory.
+	//
+	// If existing_map_file is not NULL and a map file exists, it is set to the
+	// path to the existing map file.
+	//
+	// If writable_map_file is not NULL, it is set to the path to where a map
+	// file should be saved.
+	//
+	// Returns true if a map file exists, false if none could be found.
+	static bool FindMapFile(std::string* existing_map_file,
+	                        std::string* writable_map_file);
 
 private:
 	static void RunFunction(u32 _iAddr);
 
 	static void UpdateDebugger_MapLoaded(const char* _gameID = NULL);
 
-	static bool LoadMapFromFilename(const std::string& _rFilename, const char* _gameID = NULL);
+	static bool LoadMapFromFilename();
 	static bool Boot_ELF(const char *filename);
 	static bool Boot_WiiWAD(const char *filename);
 
diff --git a/Source/Core/Core/Src/Boot/Boot_ELF.cpp b/Source/Core/Core/Src/Boot/Boot_ELF.cpp
index 06e4a33bd8..99b0c3c0a3 100644
--- a/Source/Core/Core/Src/Boot/Boot_ELF.cpp
+++ b/Source/Core/Core/Src/Boot/Boot_ELF.cpp
@@ -68,7 +68,7 @@ bool CBoot::Boot_ELF(const char *filename)
 	reader.LoadInto(0x80000000);
 	if (!reader.LoadSymbols())
 	{
-		if (LoadMapFromFilename(filename))
+		if (LoadMapFromFilename())
 			HLE::PatchFunctions();
 	}
 	else
diff --git a/Source/Core/Core/Src/BootManager.cpp b/Source/Core/Core/Src/BootManager.cpp
index ec388e4974..a7051dd127 100644
--- a/Source/Core/Core/Src/BootManager.cpp
+++ b/Source/Core/Core/Src/BootManager.cpp
@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "Common.h"
+#include "CommonPaths.h"
 #include "IniFile.h"
 #include "BootManager.h"
 #include "Volume.h"
@@ -73,11 +74,16 @@ bool BootCore(const std::string& _rFilename)
 		return false;
 
 	// Load game specific settings
-	IniFile game_ini;
 	std::string unique_id = StartUp.GetUniqueID();
-	StartUp.m_strGameIni = File::GetUserPath(D_GAMECONFIG_IDX) + unique_id + ".ini";
-	if (unique_id.size() == 6 && game_ini.Load(StartUp.m_strGameIni.c_str()))
+	StartUp.m_strGameIniDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + unique_id + ".ini";
+	StartUp.m_strGameIniLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + unique_id + ".ini";
+
+	if (unique_id.size() == 6)
 	{
+		IniFile game_ini;
+		game_ini.Load(StartUp.m_strGameIniDefault);
+		game_ini.Load(StartUp.m_strGameIniLocal, true);
+
 		config_cache.valid = true;
 		config_cache.bCPUThread = StartUp.bCPUThread;
 		config_cache.bSkipIdle = StartUp.bSkipIdle;
diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp
index a84b235b04..a4298949f0 100644
--- a/Source/Core/Core/Src/ConfigManager.cpp
+++ b/Source/Core/Core/Src/ConfigManager.cpp
@@ -167,7 +167,7 @@ void SConfig::SaveSettings()
 	}
 
 	ini.Set("General", "RecursiveGCMPaths", m_RecursiveISOFolder);
-	ini.Set("General", "NANDRoot",			m_NANDPath);
+	ini.Set("General", "NANDRootPath",		m_NANDPath);
 	ini.Set("General", "WirelessMac",		m_WirelessMac);
 	#ifdef USE_GDBSTUB
 	ini.Set("General", "GDBPort", m_LocalCoreStartupParameter.iGDBPort);
@@ -244,8 +244,8 @@ void SConfig::SaveSettings()
 	ini.Set("Core", "SelectedLanguage",	m_LocalCoreStartupParameter.SelectedLanguage);
 	ini.Set("Core", "DPL2Decoder",		m_LocalCoreStartupParameter.bDPL2Decoder);
 	ini.Set("Core", "Latency",			m_LocalCoreStartupParameter.iLatency);
-	ini.Set("Core", "MemcardA",			m_strMemoryCardA);
-	ini.Set("Core", "MemcardB",			m_strMemoryCardB);
+	ini.Set("Core", "MemcardAPath",		m_strMemoryCardA);
+	ini.Set("Core", "MemcardBPath",		m_strMemoryCardB);
 	ini.Set("Core", "SlotA",			m_EXIDevice[0]);
 	ini.Set("Core", "SlotB",			m_EXIDevice[1]);
 	ini.Set("Core", "SerialPort1",		m_EXIDevice[2]);
@@ -318,7 +318,7 @@ void SConfig::LoadSettings()
 
 		ini.Get("General", "RecursiveGCMPaths",		&m_RecursiveISOFolder,							false);
 
-		ini.Get("General", "NANDRoot",		&m_NANDPath);
+		ini.Get("General", "NANDRootPath",		&m_NANDPath);
 		m_NANDPath = File::GetUserPath(D_WIIROOT_IDX, m_NANDPath);
 		DiscIO::cUIDsys::AccessInstance().UpdateLocation();
 		DiscIO::CSharedContent::AccessInstance().UpdateLocation();
@@ -403,8 +403,8 @@ void SConfig::LoadSettings()
 		ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage,		0);
 		ini.Get("Core", "DPL2Decoder",	&m_LocalCoreStartupParameter.bDPL2Decoder,	false);
 		ini.Get("Core", "Latency",		&m_LocalCoreStartupParameter.iLatency,		2);
-		ini.Get("Core", "MemcardA",		&m_strMemoryCardA);
-		ini.Get("Core", "MemcardB",		&m_strMemoryCardB);
+		ini.Get("Core", "MemcardAPath",	&m_strMemoryCardA);
+		ini.Get("Core", "MemcardBPath",	&m_strMemoryCardB);
 		ini.Get("Core", "SlotA",		(int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD);
 		ini.Get("Core", "SlotB",		(int*)&m_EXIDevice[1], EXIDEVICE_NONE);
 		ini.Get("Core", "SerialPort1",	(int*)&m_EXIDevice[2], EXIDEVICE_NONE);
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp
index bfb80ff626..4974635ea4 100644
--- a/Source/Core/Core/Src/Core.cpp
+++ b/Source/Core/Core/Src/Core.cpp
@@ -205,7 +205,8 @@ bool Init()
 	if (g_aspect_wide)
 	{
 		IniFile gameIni;
-		gameIni.Load(_CoreParameter.m_strGameIni.c_str());
+		gameIni.Load(_CoreParameter.m_strGameIniDefault.c_str());
+		gameIni.Load(_CoreParameter.m_strGameIniLocal.c_str(), true);
 		gameIni.Get("Wii", "Widescreen", &g_aspect_wide,
 			!!SConfig::GetInstance().m_SYSCONF->
 				GetData<u8>("IPL.AR"));
diff --git a/Source/Core/Core/Src/CoreParameter.cpp b/Source/Core/Core/Src/CoreParameter.cpp
index 93dd4be5a2..462a7e8474 100644
--- a/Source/Core/Core/Src/CoreParameter.cpp
+++ b/Source/Core/Core/Src/CoreParameter.cpp
@@ -351,11 +351,7 @@ void SCoreStartupParameter::CheckMemcardPath(std::string& memcardPath, std::stri
 	{
 		// Use default memcard path if there is no user defined name
 		std::string defaultFilename = isSlotA ? GC_MEMCARDA : GC_MEMCARDB;
-		#ifdef _WIN32
-			memcardPath = "." + File::GetUserPath(D_GCUSER_IDX).substr(File::GetExeDirectory().size()) + defaultFilename + ext;
-		#else
-			memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext;
-		#endif
+		memcardPath = File::GetUserPath(D_GCUSER_IDX) + defaultFilename + ext;
 	}
 	else
 	{
diff --git a/Source/Core/Core/Src/CoreParameter.h b/Source/Core/Core/Src/CoreParameter.h
index 5666049b2f..6e87673f95 100644
--- a/Source/Core/Core/Src/CoreParameter.h
+++ b/Source/Core/Core/Src/CoreParameter.h
@@ -198,7 +198,8 @@ struct SCoreStartupParameter
 	std::string m_strApploader;
 	std::string m_strUniqueID;
 	std::string m_strName;
-	std::string m_strGameIni;
+	std::string m_strGameIniDefault;
+	std::string m_strGameIniLocal;
 
 	// Constructor just calls LoadDefaults
 	SCoreStartupParameter();
diff --git a/Source/Core/Core/Src/GeckoCodeConfig.cpp b/Source/Core/Core/Src/GeckoCodeConfig.cpp
index 6d5b1f782f..54a00d1a47 100644
--- a/Source/Core/Core/Src/GeckoCodeConfig.cpp
+++ b/Source/Core/Core/Src/GeckoCodeConfig.cpp
@@ -15,6 +15,7 @@
 namespace Gecko
 {
 
+// TODO: Support loading codes from default game inis.
 void LoadCodes(const IniFile& inifile, std::vector<GeckoCode>& gcodes)
 {
 	std::vector<std::string> lines;
@@ -96,7 +97,7 @@ void SaveGeckoCode(std::vector<std::string>& lines, const GeckoCode& gcode)
 	}
 
 	lines.push_back(name);
-	
+
 	// save all the code lines
 	std::vector<GeckoCode::Code>::const_iterator
 		codes_iter = gcode.codes.begin(),
diff --git a/Source/Core/Core/Src/PatchEngine.cpp b/Source/Core/Core/Src/PatchEngine.cpp
index 2221fe456f..c7d133132b 100644
--- a/Source/Core/Core/Src/PatchEngine.cpp
+++ b/Source/Core/Core/Src/PatchEngine.cpp
@@ -20,6 +20,7 @@
 #include <map>
 #include <algorithm>
 
+#include "CommonPaths.h"
 #include "StringUtil.h"
 #include "PatchEngine.h"
 #include "HW/Memmap.h"
@@ -44,22 +45,40 @@ std::vector<Patch> onFrame;
 std::map<u32, int> speedHacks;
 std::vector<std::string> discList;
 
-void LoadPatchSection(const char *section, std::vector<Patch> &patches, IniFile &ini)
+void LoadPatchSection(const char *section, std::vector<Patch> &patches,
+                      IniFile &globalIni, IniFile &localIni)
 {
-	std::vector<std::string> lines;
-
-	if (!ini.GetLines(section, lines))
-		return;
-
-	Patch currentPatch;
-
-	for (std::vector<std::string>::const_iterator iter = lines.begin(); iter != lines.end(); ++iter)
+	// Load the name of all enabled patches
+	std::string enabledSectionName = std::string(section) + "_Enabled";
+	std::vector<std::string> enabledLines;
+	std::set<std::string> enabledNames;
+	localIni.GetLines(enabledSectionName.c_str(), enabledLines);
+	for (auto iter = enabledLines.begin(); iter != enabledLines.end(); ++iter)
 	{
-		std::string line = *iter;
-
-		if (line.size())
+		const std::string& line = *iter;
+		if (line.size() != 0 && line[0] == '$')
 		{
-			if (line[0] == '+' || line[0] == '$')
+			std::string name = line.substr(1, line.size() - 1);
+			enabledNames.insert(name);
+		}
+	}
+
+	IniFile* inis[] = {&globalIni, &localIni};
+
+	for (size_t i = 0; i < ArraySize(inis); ++i)
+	{
+		std::vector<std::string> lines;
+		Patch currentPatch;
+		inis[i]->GetLines(section, lines);
+
+		for (auto iter = lines.begin(); iter != lines.end(); ++iter)
+		{
+			std::string line = *iter;
+
+			if (line.size() == 0)
+				continue;
+
+			if (line[0] == '$')
 			{
 				// Take care of the previous code
 				if (currentPatch.name.size())
@@ -67,39 +86,38 @@ void LoadPatchSection(const char *section, std::vector<Patch> &patches, IniFile
 				currentPatch.entries.clear();
 
 				// Set active and name
-				currentPatch.active = (line[0] == '+') ? true : false;
-				if (currentPatch.active)
-					currentPatch.name = line.substr(2, line.size() - 2);
-				else
-					currentPatch.name = line.substr(1, line.size() - 1);
-				continue;
+				currentPatch.name = line.substr(1, line.size() - 1);
+				currentPatch.active = enabledNames.find(currentPatch.name) != enabledNames.end();
+				currentPatch.user_defined = (i == 1);
 			}
-
-			std::string::size_type loc = line.find_first_of('=', 0);
-
-			if (loc != std::string::npos)
-				line[loc] = ':';
-
-			std::vector<std::string> items;
-			SplitString(line, ':', items);
-
-			if (items.size() >= 3)
+			else
 			{
-				PatchEntry pE;
-				bool success = true;
-				success &= TryParse(items[0], &pE.address);
-				success &= TryParse(items[2], &pE.value);
+				std::string::size_type loc = line.find_first_of('=', 0);
 
-				pE.type = PatchType(std::find(PatchTypeStrings, PatchTypeStrings + 3, items[1]) - PatchTypeStrings);
-				success &= (pE.type != (PatchType)3);
-				if (success)
-					currentPatch.entries.push_back(pE);
+				if (loc != std::string::npos)
+					line[loc] = ':';
+
+				std::vector<std::string> items;
+				SplitString(line, ':', items);
+
+				if (items.size() >= 3)
+				{
+					PatchEntry pE;
+					bool success = true;
+					success &= TryParse(items[0], &pE.address);
+					success &= TryParse(items[2], &pE.value);
+
+					pE.type = PatchType(std::find(PatchTypeStrings, PatchTypeStrings + 3, items[1]) - PatchTypeStrings);
+					success &= (pE.type != (PatchType)3);
+					if (success)
+						currentPatch.entries.push_back(pE);
+				}
 			}
 		}
-	}
 
-	if (currentPatch.name.size() && currentPatch.entries.size())
-		patches.push_back(currentPatch);
+		if (currentPatch.name.size() && currentPatch.entries.size())
+			patches.push_back(currentPatch);
+	}
 }
 
 static void LoadDiscList(const char *section, std::vector<std::string> &_discList, IniFile &ini)
@@ -150,22 +168,24 @@ int GetSpeedhackCycles(const u32 addr)
 
 void LoadPatches(const char *gameID)
 {
-	IniFile ini;
-	std::string filename = File::GetUserPath(D_GAMECONFIG_IDX) + gameID + ".ini";
+	IniFile globalIni, localIni;
+	globalIni.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + gameID + ".ini");
+	localIni.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + gameID + ".ini", true);
 
-	if (ini.Load(filename.c_str()))
-	{
-		LoadPatchSection("OnFrame", onFrame, ini);
-		ActionReplay::LoadCodes(ini, false);
-		
-		// lil silly
-		std::vector<Gecko::GeckoCode> gcodes;
-		Gecko::LoadCodes(ini, gcodes);
-		Gecko::SetActiveCodes(gcodes);
+	IniFile merged;
+	merged.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + gameID + ".ini");
+	merged.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + gameID + ".ini", true);
 
-		LoadSpeedhacks("Speedhacks", speedHacks, ini);
-		LoadDiscList("DiscList", discList, ini);
-	}
+	LoadPatchSection("OnFrame", onFrame, globalIni, localIni);
+	ActionReplay::LoadCodes(globalIni, localIni, false);
+
+	// lil silly
+	std::vector<Gecko::GeckoCode> gcodes;
+	Gecko::LoadCodes(localIni, gcodes);
+	Gecko::SetActiveCodes(gcodes);
+
+	LoadSpeedhacks("Speedhacks", speedHacks, merged);
+	LoadDiscList("DiscList", discList, merged);
 }
 
 void ApplyPatches(const std::vector<Patch> &patches)
diff --git a/Source/Core/Core/Src/PatchEngine.h b/Source/Core/Core/Src/PatchEngine.h
index 87b3e8c901..13de073eb9 100644
--- a/Source/Core/Core/Src/PatchEngine.h
+++ b/Source/Core/Core/Src/PatchEngine.h
@@ -33,10 +33,12 @@ struct Patch
 	std::string name;
 	std::vector<PatchEntry> entries;
 	bool active;
+	bool user_defined; // False if this code is shipped with Dolphin.
 };
 
 int GetSpeedhackCycles(const u32 addr);
-void LoadPatchSection(const char *section, std::vector<Patch> &patches, IniFile &ini);
+void LoadPatchSection(const char *section, std::vector<Patch> &patches,
+                      IniFile &globalIni, IniFile &localIni);
 void LoadPatches(const char *gameID);
 void ApplyFramePatches();
 void ApplyARPatches();
diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt
index cf75db6a75..9c7f2af3de 100644
--- a/Source/Core/DolphinWX/CMakeLists.txt
+++ b/Source/Core/DolphinWX/CMakeLists.txt
@@ -212,9 +212,6 @@ if(ANDROID)
 	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
 		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/GC/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/
 	)
-	add_custom_command(TARGET ${DOLPHIN_EXE} POST_BUILD
-		COMMAND cp ARGS ${CMAKE_SOURCE_DIR}/Data/Sys/Wii/* ${CMAKE_SOURCE_DIR}/Source/Android/assets/
-	)
 else()
 	add_executable(${DOLPHIN_EXE} ${SRCS})
 	target_link_libraries(${DOLPHIN_EXE} ${LIBS} ${WXLIBS})
@@ -247,14 +244,14 @@ else()
 
 		# Copy data files into application bundle.
 		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/copy_data_into_bundle.cmake "
-			file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User
+			file(INSTALL ${CMAKE_SOURCE_DIR}/Data/Sys
 				DESTINATION ${BUNDLE_PATH}/Contents/Resources
 				)
 			file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/did_copy_data_into_bundle \"\")
 			")
 		add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/did_copy_data_into_bundle
 			COMMAND ${CMAKE_COMMAND} -P copy_data_into_bundle.cmake
-			DEPENDS ${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User
+			DEPENDS ${CMAKE_SOURCE_DIR}/Data/Sys
 			VERBATIM
 			)
 		add_custom_target(CopyDataIntoBundle ALL
@@ -291,7 +288,7 @@ else()
 			add_custom_command(OUTPUT ${BUNDLE_PATH}/Contents/Resources/en.lproj
 				COMMAND ${CMAKE_COMMAND} -P copy_translations_into_bundle.cmake
 				DEPENDS ${GMO_FILES}
-				${CMAKE_SOURCE_DIR}/Data/Sys ${CMAKE_SOURCE_DIR}/Data/User
+				${CMAKE_SOURCE_DIR}/Data/Sys
 				VERBATIM
 				)
 			add_custom_target(CopyTranslationsIntoBundle ALL
diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.cpp b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
index 7d92d7cb04..1fe6f750ba 100644
--- a/Source/Core/DolphinWX/Src/CheatsWindow.cpp
+++ b/Source/Core/DolphinWX/Src/CheatsWindow.cpp
@@ -5,6 +5,7 @@
 #include "Globals.h"
 #include "CheatsWindow.h"
 #include "ActionReplay.h"
+#include "CommonPaths.h"
 #include "Core.h"
 #include "ConfigManager.h"
 #include "VolumeHandler.h"
@@ -243,8 +244,10 @@ void wxCheatsWindow::OnEvent_Close(wxCloseEvent& ev)
 void wxCheatsWindow::UpdateGUI()
 {
 	// load code
-	m_gameini_path = File::GetUserPath(D_GAMECONFIG_IDX) + Core::g_CoreStartupParameter.GetUniqueID() + ".ini";
-	m_gameini.Load(m_gameini_path);
+	m_gameini_default_path = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + Core::g_CoreStartupParameter.GetUniqueID() + ".ini";
+	m_gameini_default.Load(m_gameini_default_path);
+	m_gameini_local_path = File::GetUserPath(D_GAMESETTINGS_IDX) + Core::g_CoreStartupParameter.GetUniqueID() + ".ini";
+	m_gameini_local.Load(m_gameini_local_path, true);
 	Load_ARCodes();
 	Load_GeckoCodes();
 
@@ -283,7 +286,7 @@ void wxCheatsWindow::Load_ARCodes()
 
 void wxCheatsWindow::Load_GeckoCodes()
 {
-	m_geckocode_panel->LoadCodes(m_gameini, Core::g_CoreStartupParameter.GetUniqueID(), true);
+	m_geckocode_panel->LoadCodes(m_gameini_local, Core::g_CoreStartupParameter.GetUniqueID(), true);
 }
 
 void wxCheatsWindow::OnEvent_CheatsList_ItemSelected(wxCommandEvent& WXUNUSED (event))
@@ -338,10 +341,10 @@ void wxCheatsWindow::OnEvent_ApplyChanges_Press(wxCommandEvent& ev)
 	Gecko::SetActiveCodes(m_geckocode_panel->GetCodes());
 
 	// Save gameini, with changed gecko codes
-	if (m_gameini_path.size())
+	if (m_gameini_local_path.size())
 	{
-		Gecko::SaveCodes(m_gameini, m_geckocode_panel->GetCodes());
-		m_gameini.Save(m_gameini_path);
+		Gecko::SaveCodes(m_gameini_local, m_geckocode_panel->GetCodes());
+		m_gameini_local.Save(m_gameini_local_path);
 	}
 
 	ev.Skip();
diff --git a/Source/Core/DolphinWX/Src/CheatsWindow.h b/Source/Core/DolphinWX/Src/CheatsWindow.h
index 244e4d5b48..ee2d0e1892 100644
--- a/Source/Core/DolphinWX/Src/CheatsWindow.h
+++ b/Source/Core/DolphinWX/Src/CheatsWindow.h
@@ -130,8 +130,10 @@ class wxCheatsWindow : public wxDialog
 		std::vector<ARCodeIndex> indexList;
 
 		Gecko::CodeConfigPanel *m_geckocode_panel;
-		IniFile m_gameini;
-		std::string m_gameini_path;
+		IniFile m_gameini_default;
+		IniFile m_gameini_local;
+		std::string m_gameini_default_path;
+		std::string m_gameini_local_path;
 
 		void Init_ChildControls();
 
diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp
index 168e046c29..7da1226d64 100644
--- a/Source/Core/DolphinWX/Src/ConfigMain.cpp
+++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp
@@ -598,9 +598,7 @@ void CConfigMain::CreateGUIControls()
 
 	CFileSearch::XStringVector theme_dirs;
 	theme_dirs.push_back(File::GetUserPath(D_THEMES_IDX));
-#if !defined(_WIN32)
-	theme_dirs.push_back(SHARED_USER_DIR THEMES_DIR);
-#endif
+	theme_dirs.push_back(File::GetSysDirectory() + THEMES_DIR);
 
 	CFileSearch cfs(CFileSearch::XStringVector(1, "*"), theme_dirs);
 	auto const& sv = cfs.GetFileNames();
diff --git a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
index c8f7b63eb4..d9fe275abd 100644
--- a/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
+++ b/Source/Core/DolphinWX/Src/Debugger/CodeWindowFunctions.cpp
@@ -211,7 +211,9 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
 
 	if (Core::GetState() == Core::CORE_UNINITIALIZED) return;
 
-	std::string mapfile = CBoot::GenerateMapFilename();
+	std::string existing_map_file, writable_map_file;
+	bool map_exists = CBoot::FindMapFile(&existing_map_file,
+	                                     &writable_map_file);
 	switch (event.GetId())
 	{
 	case IDM_CLEARSYMBOLS:
@@ -238,28 +240,28 @@ void CCodeWindow::OnSymbolsMenu(wxCommandEvent& event)
 		break;
 		}
 	case IDM_LOADMAPFILE:
-		if (!File::Exists(mapfile))
+		if (!map_exists)
 		{
 			g_symbolDB.Clear();
 			PPCAnalyst::FindFunctions(0x81300000, 0x81800000, &g_symbolDB);
 			SignatureDB db;
 			if (db.Load((File::GetSysDirectory() + TOTALDB).c_str()))
 				db.Apply(&g_symbolDB);
-			Parent->StatusBarMessage("'%s' not found, scanning for common functions instead", mapfile.c_str());
+			Parent->StatusBarMessage("'%s' not found, scanning for common functions instead", writable_map_file.c_str());
 		}
 		else
 		{
-			g_symbolDB.LoadMap(mapfile.c_str());
-			Parent->StatusBarMessage("Loaded symbols from '%s'", mapfile.c_str());
+			g_symbolDB.LoadMap(existing_map_file.c_str());
+			Parent->StatusBarMessage("Loaded symbols from '%s'", existing_map_file.c_str());
 		}
 		HLE::PatchFunctions();
 		NotifyMapLoaded();
 		break;
 	case IDM_SAVEMAPFILE:
-		g_symbolDB.SaveMap(mapfile.c_str());
+		g_symbolDB.SaveMap(writable_map_file.c_str());
 		break;
 	case IDM_SAVEMAPFILEWITHCODES:
-		g_symbolDB.SaveMap(mapfile.c_str(), true);
+		g_symbolDB.SaveMap(writable_map_file.c_str(), true);
 		break;
 
 	case IDM_RENAME_SYMBOLS:
diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp
index a763fad3fc..8f2ce68a0d 100644
--- a/Source/Core/DolphinWX/Src/ISOFile.cpp
+++ b/Source/Core/DolphinWX/Src/ISOFile.cpp
@@ -115,7 +115,8 @@ GameListItem::GameListItem(const std::string& _rFileName)
 	if (IsValid())
 	{
 		IniFile ini;
-		ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + m_UniqueID + ".ini");
+		ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + m_UniqueID + ".ini");
+		ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + m_UniqueID + ".ini", true);
 		ini.Get("EmuState", "EmulationStateId", &m_emu_state);
 		ini.Get("EmuState", "EmulationIssues", &m_issues);
 	}
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index 945257ab88..a158c37278 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -6,6 +6,8 @@
 #import <Cocoa/Cocoa.h>
 #endif
 
+#include <type_traits>
+
 #include "Common.h"
 #include "CommonPaths.h"
 #include "Globals.h"
@@ -45,6 +47,7 @@ BEGIN_EVENT_TABLE(CISOProperties, wxDialog)
 	EVT_CLOSE(CISOProperties::OnClose)
 	EVT_BUTTON(wxID_OK, CISOProperties::OnCloseClick)
 	EVT_BUTTON(ID_EDITCONFIG, CISOProperties::OnEditConfig)
+	EVT_BUTTON(ID_SHOWDEFAULTCONFIG, CISOProperties::OnShowDefaultConfig)
 	EVT_CHOICE(ID_EMUSTATE, CISOProperties::SetRefresh)
 	EVT_CHOICE(ID_EMU_ISSUES, CISOProperties::SetRefresh)
 	EVT_BUTTON(ID_PHSETTINGS, CISOProperties::PHackButtonClicked)
@@ -70,6 +73,7 @@ END_EVENT_TABLE()
 CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& position, const wxSize& size, long style)
 	: wxDialog(parent, id, title, position, size, style)
 {
+	// Load ISO data
 	OpenISO = DiscIO::CreateVolumeFromFilename(fileName);
 	if (DiscIO::IsVolumeWiiDisc(OpenISO))
 	{
@@ -102,12 +106,7 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 		}
 	}
 
-	OpenGameListItem = new GameListItem(fileName);
-
-	bRefreshList = false;
-
-	CreateGUIControls(DiscIO::IsVolumeWadFile(OpenISO));
-
+	// Load game ini
 	std::string _iniFilename = OpenISO->GetUniqueID();
 
 	if (!_iniFilename.length())
@@ -121,34 +120,21 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
 		}
 	}
 
-	GameIniFile = File::GetUserPath(D_GAMECONFIG_IDX) + _iniFilename + ".ini";
+	GameIniFileDefault = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + _iniFilename + ".ini";
+	GameIniFileLocal = File::GetUserPath(D_GAMESETTINGS_IDX) + _iniFilename + ".ini";
 
-	if (GameIni.Load(GameIniFile.c_str()))
-	{
-		LoadGameConfig();
-	}
-	else
-	{
-		// Will fail out if GameConfig folder doesn't exist
-		std::ofstream f;
-		OpenFStream(f, GameIniFile, std::ios_base::out);
-		if (f)
-		{
-			f << "# " << OpenISO->GetUniqueID() << " - " << OpenISO->GetName() << '\n'
-				<< "[Core] Values set here will override the main dolphin settings.\n"
-				<< "[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.\n"
-				<< "[OnFrame] Add memory patches to be applied every frame here.\n"
-				<< "[ActionReplay] Add action replay cheats here.\n";
-			f.close();
-		}
+	printf("Loading\n");
+	GameIniDefault.Load(GameIniFileDefault);
+	GameIniLocal.Load(GameIniFileLocal);
 
-		if (GameIni.Load(GameIniFile.c_str()))
-			LoadGameConfig();
-		else
-			wxMessageBox(wxString::Format(_("Could not create %s"),
-						StrToWxStr(GameIniFile).c_str()),
-					_("Error"), wxOK|wxICON_ERROR, this);
-	}
+	// Setup GUI
+	OpenGameListItem = new GameListItem(fileName);
+
+	bRefreshList = false;
+
+	CreateGUIControls(DiscIO::IsVolumeWadFile(OpenISO));
+
+	LoadGameConfig();
 
 	// Disk header and apploader
 
@@ -280,6 +266,15 @@ size_t CISOProperties::CreateDirectoryTree(wxTreeItemId& parent,
 	return CurrentIndex;
 }
 
+long CISOProperties::GetElementStyle(const char* section, const char* key)
+{
+	// Disable 3rd state if default gameini overrides the setting
+	if (GameIniDefault.Exists(section, key))
+		return 0;
+
+	return wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER;
+}
+
 void CISOProperties::CreateGUIControls(bool IsWad)
 {
 	wxButton * const EditConfig =
@@ -287,13 +282,9 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 	EditConfig->SetToolTip(_("This will let you Manually Edit the INI config file"));
 
 	wxButton * const EditConfigDefault =
-		new wxButton(this, ID_EDITCONFIG, _("Show Defaults"), wxDefaultPosition, wxDefaultSize);
+		new wxButton(this, ID_SHOWDEFAULTCONFIG, _("Show Defaults"), wxDefaultPosition, wxDefaultSize);
 	EditConfigDefault->SetToolTip(_("Opens the default (read-only) configuration for this game in an external text editor."));
 
-	wxButton * const EditConfigLocal =
-		new wxButton(this, ID_EDITCONFIG, _("Edit Local Overrides"), wxDefaultPosition, wxDefaultSize);
-	EditConfigLocal->SetToolTip(_("Opens the user specified overrides in an external text editor."));
-
 	// Notebook
 	wxNotebook * const m_Notebook =
 		new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
@@ -314,32 +305,33 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 
 	// GameConfig editing - Overrides and emulation state
 	wxStaticText * const OverrideText = new wxStaticText(m_GameConfig, wxID_ANY, _("These settings override core Dolphin settings.\nUndetermined means the game uses Dolphin's setting."));
+
 	// Core
-	CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	CPUThread = new wxCheckBox(m_GameConfig, ID_USEDUALCORE, _("Enable Dual Core"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "CPUThread"), wxDefaultValidator);
+	SkipIdle = new wxCheckBox(m_GameConfig, ID_IDLESKIP, _("Enable Idle Skipping"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SkipIdle"), wxDefaultValidator);
+	MMU = new wxCheckBox(m_GameConfig, ID_MMU, _("Enable MMU"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "MMU"), wxDefaultValidator);
 	MMU->SetToolTip(_("Enables the Memory Management Unit, needed for some games. (ON = Compatible, OFF = Fast)"));
-	TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	TLBHack = new wxCheckBox(m_GameConfig, ID_TLBHACK, _("MMU Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "TLBHack"), wxDefaultValidator);
 	TLBHack->SetToolTip(_("Fast version of the MMU.  Does not work for every game."));
-	DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	DCBZOFF = new wxCheckBox(m_GameConfig, ID_DCBZOFF, _("Skip DCBZ clearing"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DCBZ"), wxDefaultValidator);
 	DCBZOFF->SetToolTip(_("Bypass the clearing of the data cache by the DCBZ instruction. Usually leave this option disabled."));
-	VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	VBeam = new wxCheckBox(m_GameConfig, ID_VBEAM, _("VBeam Speed Hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "VBeam"), wxDefaultValidator);
 	VBeam->SetToolTip(_("Doubles the emulated GPU clock rate. May speed up some games (ON = Fast, OFF = Compatible)"));
-	SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	SyncGPU = new wxCheckBox(m_GameConfig, ID_SYNCGPU, _("Synchronize GPU thread"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "SyncGPU"), wxDefaultValidator);
 	SyncGPU->SetToolTip(_("Synchronizes the GPU and CPU threads to help prevent random freezes in Dual Core mode. (ON = Compatible, OFF = Fast)"));
-	FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	FastDiscSpeed = new wxCheckBox(m_GameConfig, ID_DISCSPEED, _("Speed up Disc Transfer Rate"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "FastDiscSpeed"), wxDefaultValidator);
 	FastDiscSpeed->SetToolTip(_("Enable fast disc access.  Needed for a few games. (ON = Fast, OFF = Compatible)"));
-	BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
-	DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	BlockMerging = new wxCheckBox(m_GameConfig, ID_MERGEBLOCKS, _("Enable Block Merging"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "BlockMerging"), wxDefaultValidator);
+	DSPHLE = new wxCheckBox(m_GameConfig, ID_AUDIO_DSP_HLE, _("DSP HLE emulation (fast)"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Core", "DSPHLE"), wxDefaultValidator);
 
 	// Wii Console
-	EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
+	EnableWideScreen = new wxCheckBox(m_GameConfig, ID_ENABLEWIDESCREEN, _("Enable WideScreen"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Wii", "Widescreen"), wxDefaultValidator);
 
 	// Video
-	UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+	UseBBox = new wxCheckBox(m_GameConfig, ID_USE_BBOX, _("Enable Bounding Box Calculation"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video", "UseBBox"));
 	UseBBox->SetToolTip(_("If checked, the bounding box registers will be updated. Used by the Paper Mario games."));
 
-	UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER);
+	UseZTPSpeedupHack = new wxCheckBox(m_GameConfig, ID_ZTP_SPEEDUP, _("ZTP hack"), wxDefaultPosition, wxDefaultSize, GetElementStyle("Video", "ZTPSpeedupHack"));
 	UseZTPSpeedupHack->SetToolTip(_("Enable this to speed up The Legend of Zelda: Twilight Princess. Disable for ANY other game."));
 	
 	// Hack
@@ -567,10 +559,13 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 
 	wxSizer* sButtons = CreateButtonSizer(wxNO_DEFAULT);
 	sButtons->Prepend(EditConfigDefault);
-	sButtons->Prepend(EditConfigLocal);
 	sButtons->Prepend(EditConfig);
 	sButtons->Add(new wxButton(this, wxID_OK, _("Close")));
 
+	// If there is no default gameini, disable the button.
+	if (!File::Exists(GameIniFileDefault))
+		EditConfigDefault->Disable();
+
 	// Add notebook and buttons to the dialog
 	wxBoxSizer* sMain;
 	sMain = new wxBoxSizer(wxVERTICAL);
@@ -586,7 +581,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
 void CISOProperties::OnClose(wxCloseEvent& WXUNUSED (event))
 {
 	if (!SaveGameConfig())
-		PanicAlertT("Could not save %s", GameIniFile.c_str());
+		PanicAlertT("Could not save %s", GameIniFileLocal.c_str());
 
 	EndModal(bRefreshList ? wxID_OK : wxID_CANCEL);
 }
@@ -945,234 +940,193 @@ void CISOProperties::SetRefresh(wxCommandEvent& event)
 		EmuIssues->Enable(event.GetSelection() != 0);
 }
 
+void CISOProperties::SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox)
+{
+	// Prefer local gameini value over default gameini value.
+	bool value;
+	if (GameIniLocal.Get(section, key, &value))
+		checkbox->Set3StateValue((wxCheckBoxState)value);
+	else if (GameIniDefault.Get(section, key, &value))
+		checkbox->Set3StateValue((wxCheckBoxState)value);
+	else
+		checkbox->Set3StateValue(wxCHK_UNDETERMINED);
+}
+
 void CISOProperties::LoadGameConfig()
 {
+	SetCheckboxValueFromGameini("Core", "CPUThread", CPUThread);
+	SetCheckboxValueFromGameini("Core", "SkipIdle", SkipIdle);
+	SetCheckboxValueFromGameini("Core", "MMU", MMU);
+	SetCheckboxValueFromGameini("Core", "TLBHack", TLBHack);
+	SetCheckboxValueFromGameini("Core", "DCBZ", DCBZOFF);
+	SetCheckboxValueFromGameini("Core", "VBeam", VBeam);
+	SetCheckboxValueFromGameini("Core", "SyncGPU", SyncGPU);
+	SetCheckboxValueFromGameini("Core", "FastDiscSpeed", FastDiscSpeed);
+	SetCheckboxValueFromGameini("Core", "BlockMerging", BlockMerging);
+	SetCheckboxValueFromGameini("Core", "DSPHLE", DSPHLE);
+	SetCheckboxValueFromGameini("Wii", "Widescreen", EnableWideScreen);
+	SetCheckboxValueFromGameini("Video", "UseBBox", UseBBox);
+	SetCheckboxValueFromGameini("Video", "ZTPSpeedupHack", UseZTPSpeedupHack);
+
+	// First set values from default gameini, then apply values from local gameini
 	bool bTemp;
+	GameIniDefault.Get("Video", "ProjectionHack", &bTemp);
+	PHackEnable->SetValue(bTemp);
+	if (GameIniLocal.Get("Video", "ProjectionHack", &bTemp))
+		PHackEnable->SetValue(bTemp);
+
+	GameIniDefault.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear);
+	GameIniLocal.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear);
+	GameIniDefault.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar);
+	GameIniLocal.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar);
+	GameIniDefault.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP);
+	GameIniLocal.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP);
+
+	GameIniDefault.Get("Video", "PH_ZNear", &PHack_Data.PHZNear);
+	GameIniLocal.Get("Video", "PH_ZNear", &PHack_Data.PHZNear);
+	GameIniDefault.Get("Video", "PH_ZFar", &PHack_Data.PHZFar);
+	GameIniLocal.Get("Video", "PH_ZFar", &PHack_Data.PHZFar);
+
 	int iTemp;
-	std::string sTemp;
-
-	if (GameIni.Get("Core", "CPUThread", &bTemp))
-		CPUThread->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		CPUThread->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Core", "SkipIdle", &bTemp))
-		SkipIdle->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		SkipIdle->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Core", "MMU", &bTemp))
-		MMU->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		MMU->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Core", "TLBHack", &bTemp))
-		TLBHack->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		TLBHack->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Core", "DCBZ", &bTemp))
-		DCBZOFF->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		DCBZOFF->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Core", "VBeam", &bTemp))
-		VBeam->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		VBeam->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Core", "SyncGPU", &bTemp))
-		SyncGPU->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		SyncGPU->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Core", "FastDiscSpeed", &bTemp))
-		FastDiscSpeed->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		FastDiscSpeed->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Core", "BlockMerging", &bTemp))
-		BlockMerging->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		BlockMerging->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Core", "DSPHLE", &bTemp))
-		DSPHLE->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		DSPHLE->Set3StateValue(wxCHK_UNDETERMINED);
-
-	// ??
-	if (GameIni.Get("Wii", "Widescreen", &bTemp))
-		EnableWideScreen->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		EnableWideScreen->Set3StateValue(wxCHK_UNDETERMINED);
-
-	if (GameIni.Get("Video", "UseBBox", &bTemp))
-		UseBBox->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		UseBBox->Set3StateValue(wxCHK_UNDETERMINED);
-
-
-	if (GameIni.Get("Video", "ZTPSpeedupHack", &bTemp))
-		UseZTPSpeedupHack->Set3StateValue((wxCheckBoxState)bTemp);
-	else
-		UseZTPSpeedupHack->Set3StateValue(wxCHK_UNDETERMINED);
-
-	GameIni.Get("Video", "ProjectionHack", &bTemp);
-	PHackEnable->Set3StateValue((wxCheckBoxState)bTemp);
-	
-	GameIni.Get("Video", "PH_SZNear", &PHack_Data.PHackSZNear);
-	GameIni.Get("Video", "PH_SZFar", &PHack_Data.PHackSZFar);
-	GameIni.Get("Video", "PH_ExtraParam", &PHack_Data.PHackExP);
-
-	GameIni.Get("Video", "PH_ZNear", &PHack_Data.PHZNear);
-	GameIni.Get("Video", "PH_ZFar", &PHack_Data.PHZFar);
-
-	GameIni.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/);
+	GameIniDefault.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/);
 	EmuState->SetSelection(iTemp);
+	if (GameIniLocal.Get("EmuState", "EmulationStateId", &iTemp, 0/*Not Set*/))
+		EmuState->SetSelection(iTemp);
 
-	GameIni.Get("EmuState", "EmulationIssues", &sTemp);
+	std::string sTemp;
+	GameIniDefault.Get("EmuState", "EmulationIssues", &sTemp);
 	if (!sTemp.empty())
-	{
 		EmuIssues->SetValue(StrToWxStr(sTemp));
-	}
+	if (GameIniLocal.Get("EmuState", "EmulationIssues", &sTemp))
+		EmuIssues->SetValue(StrToWxStr(sTemp));
+
 	EmuIssues->Enable(EmuState->GetSelection() != 0);
 
 	PatchList_Load();
 	ActionReplayList_Load();
-	m_geckocode_panel->LoadCodes(GameIni, OpenISO->GetUniqueID());
+	m_geckocode_panel->LoadCodes(GameIniLocal, OpenISO->GetUniqueID());
+}
+
+void CISOProperties::SaveGameIniValueFrom3StateCheckbox(const char* section, const char* key, wxCheckBox* checkbox)
+{
+	// Delete any existing entries from the local gameini if checkbox is undetermined.
+	// Otherwise, write the current value to the local gameini if the value differs from the default gameini values.
+	// Delete any existing entry from the local gameini if the value does not differ from the default gameini value.
+	bool checkbox_val = (checkbox->Get3StateValue() == wxCHK_CHECKED);
+
+	if (checkbox->Get3StateValue() == wxCHK_UNDETERMINED)
+		GameIniLocal.DeleteKey(section, key);
+	else if (!GameIniDefault.Exists(section, key))
+		GameIniLocal.Set(section, key, checkbox_val);
+	else
+	{
+		bool default_value;
+		GameIniDefault.Get(section, key, &default_value);
+		if (default_value != checkbox_val)
+			GameIniLocal.Set(section, key, checkbox_val);
+		else
+			GameIniLocal.DeleteKey(section, key);
+	}
 }
 
 bool CISOProperties::SaveGameConfig()
 {
-	if (CPUThread->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "CPUThread");
-	else
-		GameIni.Set("Core", "CPUThread", CPUThread->Get3StateValue());
+	SaveGameIniValueFrom3StateCheckbox("Core", "CPUThread", CPUThread);
+	SaveGameIniValueFrom3StateCheckbox("Core", "SkipIdle", SkipIdle);
+	SaveGameIniValueFrom3StateCheckbox("Core", "MMU", MMU);
+	SaveGameIniValueFrom3StateCheckbox("Core", "TLBHack", TLBHack);
+	SaveGameIniValueFrom3StateCheckbox("Core", "DCBZ", DCBZOFF);
+	SaveGameIniValueFrom3StateCheckbox("Core", "VBeam", VBeam);
+	SaveGameIniValueFrom3StateCheckbox("Core", "SyncGPU", SyncGPU);
+	SaveGameIniValueFrom3StateCheckbox("Core", "FastDiscSpeed", FastDiscSpeed);
+	SaveGameIniValueFrom3StateCheckbox("Core", "BlockMerging", BlockMerging);
+	SaveGameIniValueFrom3StateCheckbox("Core", "DSPHLE", DSPHLE);
+	SaveGameIniValueFrom3StateCheckbox("Wii", "Widescreen", EnableWideScreen);
+	SaveGameIniValueFrom3StateCheckbox("Video", "UseBBox", UseBBox);
+	SaveGameIniValueFrom3StateCheckbox("Video", "ZTPSpeedupHack", UseZTPSpeedupHack);
 
-	if (SkipIdle->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "SkipIdle");
-	else
-		GameIni.Set("Core", "SkipIdle", SkipIdle->Get3StateValue());
+	#define SAVE_IF_NOT_DEFAULT(section, key, val, def) do { \
+		if (GameIniDefault.Exists((section), (key))) { \
+			std::remove_reference<decltype((val))>::type tmp__; \
+			GameIniDefault.Get((section), (key), &tmp__); \
+			if ((val) != tmp__) \
+				GameIniLocal.Set((section), (key), (val)); \
+			else \
+				GameIniLocal.DeleteKey((section), (key)); \
+		} else if ((val) != (def)) \
+			GameIniLocal.Set((section), (key), (val)); \
+		else \
+			GameIniLocal.DeleteKey((section), (key)); \
+	} while (0)
 
-	if (MMU->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "MMU");
-	else
-		GameIni.Set("Core", "MMU", MMU->Get3StateValue());
+	SAVE_IF_NOT_DEFAULT("Video", "ProjectionHack", PHackEnable->GetValue(), false);
+	SAVE_IF_NOT_DEFAULT("Video", "PH_SZNear", (PHack_Data.PHackSZNear ? 1 : 0), 0);
+	SAVE_IF_NOT_DEFAULT("Video", "PH_SZFar", (PHack_Data.PHackSZFar ? 1 : 0), 0);
+	SAVE_IF_NOT_DEFAULT("Video", "PH_ExtraParam", (PHack_Data.PHackExP ? 1 : 0), 0);
+	SAVE_IF_NOT_DEFAULT("Video", "PH_ZNear", PHack_Data.PHZNear, "");
+	SAVE_IF_NOT_DEFAULT("Video", "PH_ZFar", PHack_Data.PHZFar, "");
+	SAVE_IF_NOT_DEFAULT("EmuState", "EmulationStateId", EmuState->GetSelection(), 0);
 
-	if (TLBHack->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "TLBHack");
-	else
-		GameIni.Set("Core", "TLBHack", TLBHack->Get3StateValue());
-
-	if (DCBZOFF->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "DCBZ");
-	else
-		GameIni.Set("Core", "DCBZ", DCBZOFF->Get3StateValue());
-
-	if (VBeam->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "VBeam");
-	else
-		GameIni.Set("Core", "VBeam", VBeam->Get3StateValue());
-
-	if (SyncGPU->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "SyncGPU");
-	else
-		GameIni.Set("Core", "SyncGPU", SyncGPU->Get3StateValue());
-
-	if (FastDiscSpeed->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "FastDiscSpeed");
-	else
-		GameIni.Set("Core", "FastDiscSpeed", FastDiscSpeed->Get3StateValue());
-
-	if (BlockMerging->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "BlockMerging");
-	else
-		GameIni.Set("Core", "BlockMerging", BlockMerging->Get3StateValue());
-
-	if (DSPHLE->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Core", "DSPHLE");
-	else
-		GameIni.Set("Core", "DSPHLE", DSPHLE->Get3StateValue());
-
-	if (EnableWideScreen->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Wii", "Widescreen");
-	else
-		GameIni.Set("Wii", "Widescreen", EnableWideScreen->Get3StateValue());
-
-	if (UseBBox->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Video", "UseBBox");
-	else
-		GameIni.Set("Video", "UseBBox", UseBBox->Get3StateValue());
-
-	if (UseZTPSpeedupHack->Get3StateValue() == wxCHK_UNDETERMINED)
-		GameIni.DeleteKey("Video", "ZTPSpeedupHack");
-	else
-		GameIni.Set("Video", "ZTPSpeedupHack", UseZTPSpeedupHack->Get3StateValue());
-
-	GameIni.Set("Video", "ProjectionHack", PHackEnable->Get3StateValue());
-
-	GameIni.Set("Video", "PH_SZNear", PHack_Data.PHackSZNear ? 1 : 0);
-	GameIni.Set("Video", "PH_SZFar", PHack_Data.PHackSZFar ? 1 : 0);
-	GameIni.Set("Video", "PH_ExtraParam", PHack_Data.PHackExP ? 1 : 0);
-
-	GameIni.Set("Video", "PH_ZNear", PHack_Data.PHZNear);
-	GameIni.Set("Video", "PH_ZFar", PHack_Data.PHZFar);
-
-	GameIni.Set("EmuState", "EmulationStateId", EmuState->GetSelection());
-
-	std::string sTemp;
-	GameIni.Get("EmuState","EmulationIssues", &sTemp);
-	if (EmuIssues->GetValue() != sTemp)
-		bRefreshList = true;
-	GameIni.Set("EmuState", "EmulationIssues", WxStrToStr(EmuIssues->GetValue()));
+	std::string emu_issues = EmuIssues->GetValue().ToStdString();
+	SAVE_IF_NOT_DEFAULT("EmuState", "EmulationIssues", emu_issues, "");
 
 	PatchList_Save();
 	ActionReplayList_Save();
-	Gecko::SaveCodes(GameIni, m_geckocode_panel->GetCodes());
+	Gecko::SaveCodes(GameIniLocal, m_geckocode_panel->GetCodes());
 
-	return GameIni.Save(GameIniFile.c_str());
+	bool success = GameIniLocal.Save(GameIniFileLocal.c_str());
+
+	// If the resulting file is empty, delete it. Kind of a hack, but meh.
+	if (success && File::GetSize(GameIniFileLocal) == 0)
+		File::Delete(GameIniFileLocal);
+
+	return success;
+}
+
+void CISOProperties::LaunchExternalEditor(const std::string& filename)
+{
+#ifdef __APPLE__
+	// wxTheMimeTypesManager is not yet implemented for wxCocoa
+	[[NSWorkspace sharedWorkspace] openFile:
+		[NSString stringWithUTF8String: filename.c_str()]
+		withApplication: @"TextEdit"];
+#else
+	wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("ini"));
+	if(filetype == NULL) // From extension failed, trying with MIME type now
+	{
+		filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain"));
+		if(filetype == NULL) // MIME type failed, aborting mission
+		{
+			PanicAlertT("Filetype 'ini' is unknown! Will not open!");
+			return;
+		}
+	}
+	wxString OpenCommand;
+	OpenCommand = filetype->GetOpenCommand(StrToWxStr(filename));
+	if(OpenCommand.IsEmpty())
+		PanicAlertT("Couldn't find open command for extension 'ini'!");
+	else
+		if(wxExecute(OpenCommand, wxEXEC_SYNC) == -1)
+			PanicAlertT("wxExecute returned -1 on application run!");
+#endif
+
+	bRefreshList = true; // Just in case
+
+	// Once we're done with the ini edit, give the focus back to Dolphin 
+	SetFocus();
 }
 
 void CISOProperties::OnEditConfig(wxCommandEvent& WXUNUSED (event))
 {
-	if (File::Exists(GameIniFile))
-	{
-		SaveGameConfig();
+	SaveGameConfig();
+	LaunchExternalEditor(GameIniFileLocal);
+	GameIniLocal.Load(GameIniFileLocal);
+	LoadGameConfig();
+}
 
-#ifdef __APPLE__
-		// wxTheMimeTypesManager is not yet implemented for wxCocoa
-		[[NSWorkspace sharedWorkspace] openFile:
-			[NSString stringWithUTF8String: GameIniFile.c_str()]
-			withApplication: @"TextEdit"];
-#else
-		wxFileType* filetype = wxTheMimeTypesManager->GetFileTypeFromExtension(_T("ini"));
-		if(filetype == NULL) // From extension failed, trying with MIME type now
-		{
-			filetype = wxTheMimeTypesManager->GetFileTypeFromMimeType(_T("text/plain"));
-			if(filetype == NULL) // MIME type failed, aborting mission
-			{
-				PanicAlertT("Filetype 'ini' is unknown! Will not open!");
-				return;
-			}
-		}
-		wxString OpenCommand;
-		OpenCommand = filetype->GetOpenCommand(StrToWxStr(GameIniFile));
-		if(OpenCommand.IsEmpty())
-			PanicAlertT("Couldn't find open command for extension 'ini'!");
-		else
-			if(wxExecute(OpenCommand, wxEXEC_SYNC) == -1)
-				PanicAlertT("wxExecute returned -1 on application run!");
-#endif
-
-		GameIni.Load(GameIniFile.c_str());
-		LoadGameConfig();
-
-		bRefreshList = true; // Just in case
-	}
-
-	// Once we're done with the ini edit, give the focus back to Dolphin 
-	SetFocus();
+void CISOProperties::OnShowDefaultConfig(wxCommandEvent& WXUNUSED (event))
+{
+	LaunchExternalEditor(GameIniFileDefault);
 }
 
 void CISOProperties::ListSelectionChanged(wxCommandEvent& event)
@@ -1180,14 +1134,26 @@ void CISOProperties::ListSelectionChanged(wxCommandEvent& event)
 	switch (event.GetId())
 	{
 	case ID_PATCHES_LIST:
-		if (Patches->GetSelection() != wxNOT_FOUND)
+		if (Patches->GetSelection() == wxNOT_FOUND
+		        || DefaultPatches.find(Patches->GetString(Patches->GetSelection()).ToStdString()) != DefaultPatches.end())
+		{
+			EditPatch->Disable();
+			RemovePatch->Disable();
+		}
+		else
 		{
 			EditPatch->Enable();
 			RemovePatch->Enable();
 		}
 		break;
 	case ID_CHEATS_LIST:
-		if (Cheats->GetSelection() != wxNOT_FOUND)
+		if (Cheats->GetSelection() == wxNOT_FOUND
+		        || DefaultCheats.find(Cheats->GetString(Cheats->GetSelection()).ToStdString()) != DefaultCheats.end())
+		{
+			EditCheat->Disable();
+			RemoveCheat->Disable();
+		}
+		else
 		{
 			EditCheat->Enable();
 			RemoveCheat->Enable();
@@ -1200,14 +1166,17 @@ void CISOProperties::PatchList_Load()
 {
 	onFrame.clear();
 	Patches->Clear();
-	PatchEngine::LoadPatchSection("OnFrame", onFrame, GameIni);
+
+	PatchEngine::LoadPatchSection("OnFrame", onFrame, GameIniDefault, GameIniLocal);
 
 	u32 index = 0;
-	for (std::vector<PatchEngine::Patch>::const_iterator it = onFrame.begin(); it != onFrame.end(); ++it)
+	for (auto it = onFrame.begin(); it != onFrame.end(); ++it)
 	{
 		PatchEngine::Patch p = *it;
 		Patches->Append(StrToWxStr(p.name));
 		Patches->Check(index, p.active);
+		if (!p.user_defined)
+			DefaultPatches.insert(p.name);
 		++index;
 	}
 }
@@ -1215,20 +1184,27 @@ void CISOProperties::PatchList_Load()
 void CISOProperties::PatchList_Save()
 {
 	std::vector<std::string> lines;
+	std::vector<std::string> enabledLines;
 	u32 index = 0;
-	for (std::vector<PatchEngine::Patch>::const_iterator onFrame_it = onFrame.begin(); onFrame_it != onFrame.end(); ++onFrame_it)
+	for (auto onFrame_it = onFrame.begin(); onFrame_it != onFrame.end(); ++onFrame_it)
 	{
-		lines.push_back(Patches->IsChecked(index) ? "+$" + onFrame_it->name : "$" + onFrame_it->name);
+		if (Patches->IsChecked(index))
+			enabledLines.push_back("$" + onFrame_it->name);
 
-		for (std::vector<PatchEngine::PatchEntry>::const_iterator iter2 = onFrame_it->entries.begin(); iter2 != onFrame_it->entries.end(); ++iter2)
+		// Do not save default patches.
+		if (DefaultPatches.find(onFrame_it->name) == DefaultPatches.end())
 		{
-			std::string temp = StringFromFormat("0x%08X:%s:0x%08X", iter2->address, PatchEngine::PatchTypeStrings[iter2->type], iter2->value);			
-			lines.push_back(temp);
+			lines.push_back("$" + onFrame_it->name);
+			for (auto iter2 = onFrame_it->entries.begin(); iter2 != onFrame_it->entries.end(); ++iter2)
+			{
+				std::string temp = StringFromFormat("0x%08X:%s:0x%08X", iter2->address, PatchEngine::PatchTypeStrings[iter2->type], iter2->value);
+				lines.push_back(temp);
+			}
 		}
 		++index;
 	}
-	GameIni.SetLines("OnFrame", lines);
-	lines.clear();
+	GameIniLocal.SetLines("OnFrame_Enabled", enabledLines);
+	GameIniLocal.SetLines("OnFrame", lines);
 }
 
 void CISOProperties::PHackButtonClicked(wxCommandEvent& event)
@@ -1282,7 +1258,7 @@ void CISOProperties::ActionReplayList_Load()
 {
 	arCodes.clear();
 	Cheats->Clear();
-	ActionReplay::LoadCodes(arCodes, GameIni);
+	ActionReplay::LoadCodes(arCodes, GameIniDefault, GameIniLocal);
 
 	u32 index = 0;
 	for (std::vector<ActionReplay::ARCode>::const_iterator it = arCodes.begin(); it != arCodes.end(); ++it)
@@ -1290,6 +1266,8 @@ void CISOProperties::ActionReplayList_Load()
 		ActionReplay::ARCode arCode = *it;
 		Cheats->Append(StrToWxStr(arCode.name));
 		Cheats->Check(index, arCode.active);
+		if (!arCode.user_defined)
+			DefaultCheats.insert(arCode.name);
 		++index;
 	}
 }
@@ -1297,20 +1275,28 @@ void CISOProperties::ActionReplayList_Load()
 void CISOProperties::ActionReplayList_Save()
 {
 	std::vector<std::string> lines;
+	std::vector<std::string> enabledLines;
 	u32 index = 0;
-	for (std::vector<ActionReplay::ARCode>::const_iterator iter = arCodes.begin(); iter != arCodes.end(); ++iter)
+	for (auto iter = arCodes.begin(); iter != arCodes.end(); ++iter)
 	{
 		ActionReplay::ARCode code = *iter;
 
-		lines.push_back(Cheats->IsChecked(index) ? "+$" + code.name : "$" + code.name);
+		if (Cheats->IsChecked(index))
+			enabledLines.push_back("$" + code.name);
 
-		for (std::vector<ActionReplay::AREntry>::const_iterator iter2 = code.ops.begin(); iter2 != code.ops.end(); ++iter2)
+		// Do not save default cheats.
+		if (DefaultCheats.find(code.name) == DefaultCheats.end())
 		{
-			lines.push_back(WxStrToStr(wxString::Format(wxT("%08X %08X"), iter2->cmd_addr, iter2->value)));
+			lines.push_back("$" + code.name);
+			for (auto iter2 = code.ops.begin(); iter2 != code.ops.end(); ++iter2)
+			{
+				lines.push_back(WxStrToStr(wxString::Format(wxT("%08X %08X"), iter2->cmd_addr, iter2->value)));
+			}
 		}
 		++index;
 	}
-	GameIni.SetLines("ActionReplay", lines);
+	GameIniLocal.SetLines("ActionReplay_Enabled", enabledLines);
+	GameIniLocal.SetLines("ActionReplay", lines);
 }
 
 void CISOProperties::ActionReplayButtonClicked(wxCommandEvent& event)
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.h b/Source/Core/DolphinWX/Src/ISOProperties.h
index 019992a9f3..f58c51dbee 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.h
+++ b/Source/Core/DolphinWX/Src/ISOProperties.h
@@ -129,6 +129,7 @@ private:
 		ID_ENABLEPROGRESSIVESCAN,
 		ID_ENABLEWIDESCREEN,
 		ID_EDITCONFIG,
+		ID_SHOWDEFAULTCONFIG,
 		ID_EMUSTATE,
 		ID_EMU_ISSUES,
 		ID_PATCHES_LIST,
@@ -163,10 +164,13 @@ private:
 		IDM_BNRSAVEAS
 	};
 
+	void LaunchExternalEditor(const std::string& filename);
+
 	void CreateGUIControls(bool);
 	void OnClose(wxCloseEvent& event);
 	void OnCloseClick(wxCommandEvent& event);
 	void OnEditConfig(wxCommandEvent& event);
+	void OnShowDefaultConfig(wxCommandEvent& event);
 	void ListSelectionChanged(wxCommandEvent& event);
 	void PatchButtonClicked(wxCommandEvent& event);
 	void ActionReplayButtonClicked(wxCommandEvent& event);
@@ -193,13 +197,22 @@ private:
 	void ExportDir(const char* _rFullPath, const char* _rExportFilename,
 			const int partitionNum = 0);
 
-	IniFile GameIni;
-	std::string GameIniFile;
+	IniFile GameIniDefault;
+	IniFile GameIniLocal;
+	std::string GameIniFileDefault;
+	std::string GameIniFileLocal;
+
+	std::set<std::string> DefaultPatches;
+	std::set<std::string> DefaultCheats;
 
 	void LoadGameConfig();
 	void PatchList_Load();
 	void PatchList_Save();
 	void ActionReplayList_Save();
 	void ChangeBannerDetails(int lang);
+
+	long GetElementStyle(const char* section, const char* key);
+	void SetCheckboxValueFromGameini(const char* section, const char* key, wxCheckBox* checkbox);
+	void SaveGameIniValueFrom3StateCheckbox(const char* section, const char* key, wxCheckBox* checkbox);
 };
 #endif
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index 30593ac637..858ce1f588 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -249,37 +249,28 @@ bool DolphinApp::OnInit()
 	}
 #endif
 
-#ifdef _WIN32
-	if (!wxSetWorkingDirectory(StrToWxStr(File::GetExeDirectory())))
-	{
-		INFO_LOG(CONSOLE, "Set working directory failed");
-	}
-#else
-	//create all necessary directories in user directory
-	//TODO : detect the revision and upgrade where necessary
-	File::CopyDir(std::string(SHARED_USER_DIR GAMECONFIG_DIR DIR_SEP),
-			File::GetUserPath(D_GAMECONFIG_IDX));
-	File::CopyDir(std::string(SHARED_USER_DIR MAPS_DIR DIR_SEP),
-			File::GetUserPath(D_MAPS_IDX));
-	File::CopyDir(std::string(SHARED_USER_DIR SHADERS_DIR DIR_SEP),
-			File::GetUserPath(D_SHADERS_IDX));
-	File::CopyDir(std::string(SHARED_USER_DIR WII_USER_DIR DIR_SEP),
-			File::GetUserPath(D_WIIUSER_IDX));
-	File::CopyDir(std::string(SHARED_USER_DIR OPENCL_DIR DIR_SEP),
-			File::GetUserPath(D_OPENCL_IDX));
-#endif
-	File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX));
-	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
+	// Copy initial Wii NAND data from Sys to User.
+	File::CopyDir(File::GetSysDirectory() + WII_USER_DIR,
+	              File::GetUserPath(D_WIIUSER_IDX));
+
+	File::CreateFullPath(File::GetUserPath(D_USER_IDX));
 	File::CreateFullPath(File::GetUserPath(D_CACHE_IDX));
+	File::CreateFullPath(File::GetUserPath(D_CONFIG_IDX));
 	File::CreateFullPath(File::GetUserPath(D_DUMPDSP_IDX));
 	File::CreateFullPath(File::GetUserPath(D_DUMPTEXTURES_IDX));
-	File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
-	File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
-	File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
-	File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_GAMESETTINGS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX));
 	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + USA_DIR DIR_SEP);
 	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + EUR_DIR DIR_SEP);
 	File::CreateFullPath(File::GetUserPath(D_GCUSER_IDX) + JAP_DIR DIR_SEP);
+	File::CreateFullPath(File::GetUserPath(D_HIRESTEXTURES_IDX));
+	File::CreateFullPath(File::GetUserPath(D_MAILLOGS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_MAPS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_OPENCL_IDX));
+	File::CreateFullPath(File::GetUserPath(D_SCREENSHOTS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_SHADERS_IDX));
+	File::CreateFullPath(File::GetUserPath(D_STATESAVES_IDX));
+	File::CreateFullPath(File::GetUserPath(D_THEMES_IDX));
 
 	LogManager::Init();
 	SConfig::Init();
diff --git a/Source/Core/DolphinWX/Src/PHackSettings.cpp b/Source/Core/DolphinWX/Src/PHackSettings.cpp
index 9fb93d3d73..3db44891e6 100644
--- a/Source/Core/DolphinWX/Src/PHackSettings.cpp
+++ b/Source/Core/DolphinWX/Src/PHackSettings.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include "CommonPaths.h"
 #include "PHackSettings.h"
 #include "ConfigManager.h"
 #include "WxUtils.h"
@@ -18,10 +19,9 @@ CPHackSettings::CPHackSettings(wxWindow* parent, wxWindowID id, const wxString&
 {
 	CreateGUIControls();
 	std::string _iniFilename;
-	_iniFilename = File::GetUserPath(D_GAMECONFIG_IDX) + "PH_PRESETS.ini";
+	_iniFilename = File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP "PH_PRESETS.ini";
 	PHPresetsIni.Load(_iniFilename.c_str());
-	//PHPresetsIni.SortSections();
-	//PHPresetsIni.Save(_iniFilename.c_str());
+	PHPresetsIni.SortSections();
 
 	LoadPHackData();
 }
diff --git a/Source/Core/InputCommon/Src/InputConfig.cpp b/Source/Core/InputCommon/Src/InputConfig.cpp
index 96fc6205db..9382138c43 100644
--- a/Source/Core/InputCommon/Src/InputConfig.cpp
+++ b/Source/Core/InputCommon/Src/InputConfig.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "InputConfig.h"
+#include "CommonPaths.h"
 #include "../../Core/Src/ConfigManager.h"
 #include "../../Core/Src/HW/Wiimote.h"
 
@@ -37,7 +38,8 @@ bool InputPlugin::LoadConfig(bool isGC)
 			type = "Wiimote";
 			path = "Profiles/Wiimote/";
 		}
-		game_ini.Load(File::GetUserPath(D_GAMECONFIG_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini");
+		game_ini.Load(File::GetSysDirectory() + GAMESETTINGS_DIR DIR_SEP + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini");
+		game_ini.Load(File::GetUserPath(D_GAMESETTINGS_IDX) + SConfig::GetInstance().m_LocalCoreStartupParameter.GetUniqueID() + ".ini", true);
 		for (int i = 0; i < 4; i++)
 		{
 			if (game_ini.Exists("Controls", (type + "Profile" + num[i]).c_str()))
@@ -46,7 +48,10 @@ bool InputPlugin::LoadConfig(bool isGC)
 				if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + path + profile[i] + ".ini"))
 					useProfile[i] = true;
 				else
+				{
+					// TODO: Having a PanicAlert for this is dumb.
 					PanicAlertT("Selected controller profile does not exist");
+				}
 			}
 		}
 	}
@@ -94,6 +99,6 @@ void InputPlugin::SaveConfig()
 		e = controllers.end();
 	for ( ; i!=e; ++i )
 		(*i)->SaveConfig(inifile.GetOrCreateSection((*i)->GetName().c_str()));
-	
+
 	inifile.Save(ini_filename);
 }
diff --git a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
index a9c6977d42..211244c457 100644
--- a/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
+++ b/Source/Core/VideoCommon/Src/OpenCL/OCLTextureDecoder.cpp
@@ -5,6 +5,7 @@
 #include "OCLTextureDecoder.h"
 
 #include "../OpenCL.h"
+#include "CommonPaths.h"
 #include "FileUtil.h"
 
 #include <fcntl.h>
@@ -138,7 +139,7 @@ void TexDecoder_OpenCL_Initialize()
 		if (err)
 		{
 			std::string code;
-			filename = File::GetUserPath(D_OPENCL_IDX) + "TextureDecoder.cl";
+			filename = File::GetSysDirectory() + OPENCL_DIR DIR_SEP "TextureDecoder.cl";
 			if (!File::ReadFileToString(true, filename.c_str(), code))
 			{
 				ERROR_LOG(VIDEO, "Failed to load OpenCL code %s - file is missing?", filename.c_str());
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 707aec734c..e81807985a 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -120,30 +120,45 @@ void VideoConfig::Load(const char *ini_file)
 		OSD::AddMessage("Warning: Shader Debugging is enabled, performance will suffer heavily", 15000);
 }
 
-void VideoConfig::GameIniLoad(const char *ini_file)
+void VideoConfig::GameIniLoad(const char* default_ini_file, const char* local_ini_file)
 {
+	bool gfx_override_exists = false;
+
+	// XXX: Again, bad place to put OSD messages at (see delroth's comment above)
+	// XXX: This will add an OSD message for each projection hack value... meh
+#define CHECK_SETTING(section, key, var) do { \
+		decltype(var) temp = var; \
+		if (iniFile.GetIfExists(section, key, &var) && var != temp) { \
+			char buf[256]; \
+			snprintf(buf, sizeof(buf), "Note: Option \"%s\" is overridden by game ini.", key); \
+			OSD::AddMessage(buf, 7500); \
+			gfx_override_exists = true; \
+		} \
+	} while (0)
+
 	IniFile iniFile;
-	iniFile.Load(ini_file);
+	iniFile.Load(default_ini_file);
+	iniFile.Load(local_ini_file, true);
 
-	iniFile.GetIfExists("Video_Hardware", "VSync", &bVSync);
+	CHECK_SETTING("Video_Hardware", "VSync", bVSync);
 
-	iniFile.GetIfExists("Video_Settings", "wideScreenHack", &bWidescreenHack);
-	iniFile.GetIfExists("Video_Settings", "AspectRatio", &iAspectRatio);
-	iniFile.GetIfExists("Video_Settings", "Crop", &bCrop);
-	iniFile.GetIfExists("Video_Settings", "UseXFB", &bUseXFB);
-	iniFile.GetIfExists("Video_Settings", "UseRealXFB", &bUseRealXFB);
-	iniFile.GetIfExists("Video_Settings", "SafeTextureCacheColorSamples", &iSafeTextureCache_ColorSamples);
-	iniFile.GetIfExists("Video_Settings", "DLOptimize", &iCompileDLsLevel);
-	iniFile.GetIfExists("Video_Settings", "HiresTextures", &bHiresTextures);
-	iniFile.GetIfExists("Video_Settings", "AnaglyphStereo", &bAnaglyphStereo);
-	iniFile.GetIfExists("Video_Settings", "AnaglyphStereoSeparation", &iAnaglyphStereoSeparation);
-	iniFile.GetIfExists("Video_Settings", "AnaglyphFocalAngle", &iAnaglyphFocalAngle);
-	iniFile.GetIfExists("Video_Settings", "EnablePixelLighting", &bEnablePixelLighting);
-	iniFile.GetIfExists("Video_Settings", "HackedBufferUpload", &bHackedBufferUpload);
-	iniFile.GetIfExists("Video_Settings", "FastDepthCalc", &bFastDepthCalc);
-	iniFile.GetIfExists("Video_Settings", "MSAA", &iMultisampleMode);
+	CHECK_SETTING("Video_Settings", "wideScreenHack", bWidescreenHack);
+	CHECK_SETTING("Video_Settings", "AspectRatio", iAspectRatio);
+	CHECK_SETTING("Video_Settings", "Crop", bCrop);
+	CHECK_SETTING("Video_Settings", "UseXFB", bUseXFB);
+	CHECK_SETTING("Video_Settings", "UseRealXFB", bUseRealXFB);
+	CHECK_SETTING("Video_Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples);
+	CHECK_SETTING("Video_Settings", "DLOptimize", iCompileDLsLevel);
+	CHECK_SETTING("Video_Settings", "HiresTextures", bHiresTextures);
+	CHECK_SETTING("Video_Settings", "AnaglyphStereo", bAnaglyphStereo);
+	CHECK_SETTING("Video_Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation);
+	CHECK_SETTING("Video_Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle);
+	CHECK_SETTING("Video_Settings", "EnablePixelLighting", bEnablePixelLighting);
+	CHECK_SETTING("Video_Settings", "HackedBufferUpload", bHackedBufferUpload);
+	CHECK_SETTING("Video_Settings", "FastDepthCalc", bFastDepthCalc);
+	CHECK_SETTING("Video_Settings", "MSAA", iMultisampleMode);
 	int tmp = -9000;
-	iniFile.GetIfExists("Video_Settings", "EFBScale", &tmp); // integral
+	CHECK_SETTING("Video_Settings", "EFBScale", tmp); // integral
 	if (tmp != -9000)
 	{
 		if (tmp != SCALE_FORCE_INTEGRAL)
@@ -169,33 +184,36 @@ void VideoConfig::GameIniLoad(const char *ini_file)
 		}
 	}
 
-	iniFile.GetIfExists("Video_Settings", "DstAlphaPass", &bDstAlphaPass);
-	iniFile.GetIfExists("Video_Settings", "DisableFog", &bDisableFog);
-	iniFile.GetIfExists("Video_Settings", "EnableOpenCL", &bEnableOpenCL);
-	iniFile.GetIfExists("Video_Settings", "OMPDecoder", &bOMPDecoder);
+	CHECK_SETTING("Video_Settings", "DstAlphaPass", bDstAlphaPass);
+	CHECK_SETTING("Video_Settings", "DisableFog", bDisableFog);
+	CHECK_SETTING("Video_Settings", "EnableOpenCL", bEnableOpenCL);
+	CHECK_SETTING("Video_Settings", "OMPDecoder", bOMPDecoder);
 
-	iniFile.GetIfExists("Video_Enhancements", "ForceFiltering", &bForceFiltering);
-	iniFile.GetIfExists("Video_Enhancements", "MaxAnisotropy", &iMaxAnisotropy);  // NOTE - this is x in (1 << x)
-	iniFile.GetIfExists("Video_Enhancements", "PostProcessingShader", &sPostProcessingShader);
-	iniFile.GetIfExists("Video_Enhancements", "Enable3dVision", &b3DVision);
+	CHECK_SETTING("Video_Enhancements", "ForceFiltering", bForceFiltering);
+	CHECK_SETTING("Video_Enhancements", "MaxAnisotropy", iMaxAnisotropy);  // NOTE - this is x in (1 << x)
+	CHECK_SETTING("Video_Enhancements", "PostProcessingShader", sPostProcessingShader);
+	CHECK_SETTING("Video_Enhancements", "Enable3dVision", b3DVision);
 
-	iniFile.GetIfExists("Video_Hacks", "EFBAccessEnable", &bEFBAccessEnable);
-	iniFile.GetIfExists("Video_Hacks", "DlistCachingEnable", &bDlistCachingEnable);
-	iniFile.GetIfExists("Video_Hacks", "EFBCopyEnable", &bEFBCopyEnable);
-	iniFile.GetIfExists("Video_Hacks", "EFBToTextureEnable", &bCopyEFBToTexture);
-	iniFile.GetIfExists("Video_Hacks", "EFBScaledCopy", &bCopyEFBScaled);
-	iniFile.GetIfExists("Video_Hacks", "EFBCopyCacheEnable", &bEFBCopyCacheEnable);
-	iniFile.GetIfExists("Video_Hacks", "EFBEmulateFormatChanges", &bEFBEmulateFormatChanges);
+	CHECK_SETTING("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable);
+	CHECK_SETTING("Video_Hacks", "DlistCachingEnable", bDlistCachingEnable);
+	CHECK_SETTING("Video_Hacks", "EFBCopyEnable", bEFBCopyEnable);
+	CHECK_SETTING("Video_Hacks", "EFBToTextureEnable", bCopyEFBToTexture);
+	CHECK_SETTING("Video_Hacks", "EFBScaledCopy", bCopyEFBScaled);
+	CHECK_SETTING("Video_Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable);
+	CHECK_SETTING("Video_Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges);
 
-	iniFile.GetIfExists("Video", "ProjectionHack", &iPhackvalue[0]);
-	iniFile.GetIfExists("Video", "PH_SZNear", &iPhackvalue[1]);
-	iniFile.GetIfExists("Video", "PH_SZFar", &iPhackvalue[2]);
-	iniFile.GetIfExists("Video", "PH_ExtraParam", &iPhackvalue[3]);
-	iniFile.GetIfExists("Video", "PH_ZNear", &sPhackvalue[0]);
-	iniFile.GetIfExists("Video", "PH_ZFar", &sPhackvalue[1]);
-	iniFile.GetIfExists("Video", "ZTPSpeedupHack", &bZTPSpeedHack);
-	iniFile.GetIfExists("Video", "UseBBox", &bUseBBox);
-	iniFile.GetIfExists("Video", "PerfQueriesEnable", &bPerfQueriesEnable);
+	CHECK_SETTING("Video", "ProjectionHack", iPhackvalue[0]);
+	CHECK_SETTING("Video", "PH_SZNear", iPhackvalue[1]);
+	CHECK_SETTING("Video", "PH_SZFar", iPhackvalue[2]);
+	CHECK_SETTING("Video", "PH_ExtraParam", iPhackvalue[3]);
+	CHECK_SETTING("Video", "PH_ZNear", sPhackvalue[0]);
+	CHECK_SETTING("Video", "PH_ZFar", sPhackvalue[1]);
+	CHECK_SETTING("Video", "ZTPSpeedupHack", bZTPSpeedHack);
+	CHECK_SETTING("Video", "UseBBox", bUseBBox);
+	CHECK_SETTING("Video", "PerfQueriesEnable", bPerfQueriesEnable);
+
+	if (gfx_override_exists)
+		OSD::AddMessage("Warning: Opening the graphics configuration will reset settings and might cause issues!", 10000);
 }
 
 void VideoConfig::VerifyValidity()
@@ -262,7 +280,7 @@ void VideoConfig::Save(const char *ini_file)
 	iniFile.Set("Hacks", "EFBAccessEnable", bEFBAccessEnable);
 	iniFile.Set("Hacks", "DlistCachingEnable", bDlistCachingEnable);
 	iniFile.Set("Hacks", "EFBCopyEnable", bEFBCopyEnable);
-	iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToTexture);	
+	iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToTexture);
 	iniFile.Set("Hacks", "EFBScaledCopy", bCopyEFBScaled);
 	iniFile.Set("Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable);
 	iniFile.Set("Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges);
@@ -273,60 +291,6 @@ void VideoConfig::Save(const char *ini_file)
 	iniFile.Save(ini_file);
 }
 
-void VideoConfig::GameIniSave(const char* default_ini, const char* game_ini)
-{
-	// wxWidgets doesn't provide us with a nice way to change 3-state checkboxes into 2-state ones
-	// This would allow us to make the "default config" dialog layout to be 2-state based, but the
-	// "game config" layout to be 3-state based (with the 3rd state being "use default")
-	// Since we can't do that, we instead just save anything which differs from the default config
-	// TODO: Make this less ugly
-
-	VideoConfig defCfg;
-	defCfg.Load(default_ini);
-
-	IniFile iniFile;
-	iniFile.Load(game_ini);
-
-	#define SET_IF_DIFFERS(section, key, member) { if ((member) != (defCfg.member)) iniFile.Set((section), (key), (member)); else iniFile.DeleteKey((section), (key)); }
-
-	SET_IF_DIFFERS("Video_Hardware", "VSync", bVSync);
-
-	SET_IF_DIFFERS("Video_Settings", "wideScreenHack", bWidescreenHack);
-	SET_IF_DIFFERS("Video_Settings", "AspectRatio", iAspectRatio);
-	SET_IF_DIFFERS("Video_Settings", "Crop", bCrop);
-	SET_IF_DIFFERS("Video_Settings", "UseXFB", bUseXFB);
-	SET_IF_DIFFERS("Video_Settings", "UseRealXFB", bUseRealXFB);
-	SET_IF_DIFFERS("Video_Settings", "SafeTextureCacheColorSamples", iSafeTextureCache_ColorSamples);
-	SET_IF_DIFFERS("Video_Settings", "DLOptimize", iCompileDLsLevel);
-	SET_IF_DIFFERS("Video_Settings", "HiresTextures", bHiresTextures);
-	SET_IF_DIFFERS("Video_Settings", "AnaglyphStereo", bAnaglyphStereo);
-	SET_IF_DIFFERS("Video_Settings", "AnaglyphStereoSeparation", iAnaglyphStereoSeparation);
-	SET_IF_DIFFERS("Video_Settings", "AnaglyphFocalAngle", iAnaglyphFocalAngle);
-	SET_IF_DIFFERS("Video_Settings", "EnablePixelLighting", bEnablePixelLighting);
-	SET_IF_DIFFERS("Video_Settings", "FastDepthCalc", bFastDepthCalc);
-	SET_IF_DIFFERS("Video_Settings", "MSAA", iMultisampleMode);
-	SET_IF_DIFFERS("Video_Settings", "EFBScale", iEFBScale); // integral
-	SET_IF_DIFFERS("Video_Settings", "DstAlphaPass", bDstAlphaPass);
-	SET_IF_DIFFERS("Video_Settings", "DisableFog", bDisableFog);
-	SET_IF_DIFFERS("Video_Settings", "EnableOpenCL", bEnableOpenCL);
-	SET_IF_DIFFERS("Video_Settings", "OMPDecoder", bOMPDecoder);
-
-	SET_IF_DIFFERS("Video_Enhancements", "ForceFiltering", bForceFiltering);
-	SET_IF_DIFFERS("Video_Enhancements", "MaxAnisotropy", iMaxAnisotropy);  // NOTE - this is x in (1 << x)
-	SET_IF_DIFFERS("Video_Enhancements", "PostProcessingShader", sPostProcessingShader);
-	SET_IF_DIFFERS("Video_Enhancements", "Enable3dVision", b3DVision);
-
-	SET_IF_DIFFERS("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable);
-	SET_IF_DIFFERS("Video_Hacks", "DlistCachingEnable", bDlistCachingEnable);
-	SET_IF_DIFFERS("Video_Hacks", "EFBCopyEnable", bEFBCopyEnable);
-	SET_IF_DIFFERS("Video_Hacks", "EFBToTextureEnable", bCopyEFBToTexture);
-	SET_IF_DIFFERS("Video_Hacks", "EFBScaledCopy", bCopyEFBScaled);
-	SET_IF_DIFFERS("Video_Hacks", "EFBCopyCacheEnable", bEFBCopyCacheEnable);
-	SET_IF_DIFFERS("Video_Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges);
-
-	iniFile.Save(game_ini);
-}
-
 bool VideoConfig::IsVSync()
 {
 	return Core::isTabPressed ? false : bVSync;
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index 4a773d30e7..cfb4a1ccde 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -50,7 +50,7 @@ struct VideoConfig
 {
 	VideoConfig();
 	void Load(const char *ini_file);
-	void GameIniLoad(const char *ini_file);
+	void GameIniLoad(const char* default_ini, const char* game_ini);
 	void VerifyValidity();
 	void Save(const char *ini_file);
 	void GameIniSave(const char* default_ini, const char* game_ini);
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
index 10369a1329..328cb5fa31 100644
--- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp
@@ -154,8 +154,10 @@ bool VideoBackend::Initialize(void *&window_handle)
 
 	frameCount = 0;
 
+	const SCoreStartupParameter& core_params = SConfig::GetInstance().m_LocalCoreStartupParameter;
+
 	g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini").c_str());
-	g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());
+	g_Config.GameIniLoad(core_params.m_strGameIniDefault.c_str(), core_params.m_strGameIniLocal.c_str());
 	g_Config.UpdateProjectionHack();
 	g_Config.VerifyValidity();
 	UpdateActiveConfig();
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
index f3ca31ba82..08c76f4a49 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/main.cpp
@@ -150,7 +150,8 @@ bool VideoBackend::Initialize(void *&window_handle)
 	frameCount = 0;
 
 	g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_dx9.ini").c_str());
-	g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());
+	g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniDefault.c_str(),
+	                     SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniLocal.c_str());
 	g_Config.UpdateProjectionHack();
 	g_Config.VerifyValidity();
 	// as only some driver/hardware configurations support dual source blending only enable it if is 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
index d5899038fc..c1563a74e2 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
@@ -2,6 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.
 
+#include "CommonPaths.h"
 #include "FileUtil.h"
 #include "VideoCommon.h"
 #include "VideoConfig.h"
@@ -150,7 +151,12 @@ void ApplyShader()
 	
 	// loading shader code
 	std::string code;
-	std::string path = File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".txt";
+	std::string path = File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".glsl";
+	if (!File::Exists(path))
+	{
+		// Fallback to shared user dir
+		path = File::GetSysDirectory() + SHADERS_DIR DIR_SEP + g_ActiveConfig.sPostProcessingShader + ".glsl";
+	}
 	if(!File::ReadFileToString(true, path.c_str(), code)) {
 		ERROR_LOG(VIDEO, "Post-processing shader not found: %s", path.c_str());
 		return;
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
index 1eb986fe74..60f2748eeb 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp
@@ -38,6 +38,7 @@ Make AA apply instantly during gameplay if possible
 
 #include "Globals.h"
 #include "Atomic.h"
+#include "CommonPaths.h"
 #include "Thread.h"
 #include "LogManager.h"
 
@@ -102,25 +103,37 @@ std::string VideoBackend::GetDisplayName()
 
 void GetShaders(std::vector<std::string> &shaders)
 {
+	std::set<std::string> already_found;
+
 	shaders.clear();
-	if (File::IsDirectory(File::GetUserPath(D_SHADERS_IDX)))
+	static const std::string directories[] = {
+		File::GetUserPath(D_SHADERS_IDX),
+		File::GetSysDirectory() + SHADERS_DIR DIR_SEP,
+	};
+	for (size_t i = 0; i < ArraySize(directories); ++i)
 	{
+		if (!File::IsDirectory(directories[i]))
+			continue;
+
 		File::FSTEntry entry;
-		File::ScanDirectoryTree(File::GetUserPath(D_SHADERS_IDX), entry);
-		for (u32 i = 0; i < entry.children.size(); i++) 
+		File::ScanDirectoryTree(directories[i], entry);
+		for (u32 j = 0; j < entry.children.size(); j++)
 		{
-			std::string name = entry.children[i].virtualName.c_str();
-			if (!strcasecmp(name.substr(name.size() - 4).c_str(), ".txt")) {
-				name = name.substr(0, name.size() - 4);
-				shaders.push_back(name);
-			}
+			std::string name = entry.children[j].virtualName.c_str();
+			if (name.size() < 5)
+				continue;
+			if (strcasecmp(name.substr(name.size() - 5).c_str(), ".glsl"))
+				continue;
+
+			name = name.substr(0, name.size() - 5);
+			if (already_found.find(name) != already_found.end())
+				continue;
+
+			already_found.insert(name);
+			shaders.push_back(name);
 		}
-		std::sort(shaders.begin(), shaders.end());
-	}
-	else
-	{
-		File::CreateDir(File::GetUserPath(D_SHADERS_IDX).c_str());
 	}
+	std::sort(shaders.begin(), shaders.end());
 }
 
 void InitBackendInfo()
@@ -159,7 +172,8 @@ bool VideoBackend::Initialize(void *&window_handle)
 	frameCount = 0;
 
 	g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini").c_str());
-	g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());
+	g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniDefault.c_str(),
+	                     SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIniLocal.c_str());
 	g_Config.UpdateProjectionHack();
 	g_Config.VerifyValidity();
 	UpdateActiveConfig();