diff --git a/config/mp-v1.088/NESemu/splits.txt b/config/GM8E01_00/NESemu/splits.txt
similarity index 100%
rename from config/mp-v1.088/NESemu/splits.txt
rename to config/GM8E01_00/NESemu/splits.txt
diff --git a/config/mp-v1.088/NESemu/symbols.txt b/config/GM8E01_00/NESemu/symbols.txt
similarity index 100%
rename from config/mp-v1.088/NESemu/symbols.txt
rename to config/GM8E01_00/NESemu/symbols.txt
diff --git a/config/GM8E01_00/build.sha1 b/config/GM8E01_00/build.sha1
new file mode 100644
index 00000000..8c2d6448
--- /dev/null
+++ b/config/GM8E01_00/build.sha1
@@ -0,0 +1 @@
+949c5ed7368aef547e0b0db1c3678f466e2afbff  build/GM8E01_00/main.dol
diff --git a/config/mp-v1.088/build_string.txt b/config/GM8E01_00/build_string.txt
similarity index 100%
rename from config/mp-v1.088/build_string.txt
rename to config/GM8E01_00/build_string.txt
diff --git a/config/GM8E01_00/config.yml b/config/GM8E01_00/config.yml
new file mode 100644
index 00000000..eb127186
--- /dev/null
+++ b/config/GM8E01_00/config.yml
@@ -0,0 +1,12 @@
+object: orig/GM8E01_00/sys/main.dol
+hash: 949c5ed7368aef547e0b0db1c3678f466e2afbff
+symbols: config/GM8E01_00/symbols.txt
+splits: config/GM8E01_00/splits.txt
+mw_comment_version: 8
+fill_gaps: false
+
+#modules:
+#- object: orig/GM8E01_00/files/NESemuP.rel
+  #hash: 5ad6bb727d6dd220e6aceef9143c61a86a6f2bb5
+  #symbols: config/GM8E01_00/NESemu/symbols.txt
+  #splits: config/GM8E01_00/NESemu/splits.txt
diff --git a/config/mp-v1.088/splits.txt b/config/GM8E01_00/splits.txt
similarity index 100%
rename from config/mp-v1.088/splits.txt
rename to config/GM8E01_00/splits.txt
diff --git a/config/mp-v1.088/symbols.txt b/config/GM8E01_00/symbols.txt
similarity index 100%
rename from config/mp-v1.088/symbols.txt
rename to config/GM8E01_00/symbols.txt
diff --git a/config/mp-v1.088/build.sha1 b/config/mp-v1.088/build.sha1
deleted file mode 100644
index eb712412..00000000
--- a/config/mp-v1.088/build.sha1
+++ /dev/null
@@ -1 +0,0 @@
-949c5ed7368aef547e0b0db1c3678f466e2afbff  build/mp-v1.088/main.dol
diff --git a/config/mp-v1.088/config.yml b/config/mp-v1.088/config.yml
deleted file mode 100644
index 089fa1a0..00000000
--- a/config/mp-v1.088/config.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-object: orig/mp-v1.088/sys/main.dol
-hash: 949c5ed7368aef547e0b0db1c3678f466e2afbff
-symbols: config/mp-v1.088/symbols.txt
-splits: config/mp-v1.088/splits.txt
-mw_comment_version: 8
-fill_gaps: false
-
-#modules:
-#- object: orig/mp-v1.088/files/NESemuP.rel
-  #hash: 5ad6bb727d6dd220e6aceef9143c61a86a6f2bb5
-  #symbols: config/mp-v1.088/NESemu/symbols.txt
-  #splits: config/mp-v1.088/NESemu/splits.txt
diff --git a/configure.py b/configure.py
index d15b55ce..9a0566a7 100755
--- a/configure.py
+++ b/configure.py
@@ -27,15 +27,15 @@ from tools.project import (
 # Game versions
 DEFAULT_VERSION = 0
 VERSIONS = [
-    "mp-v1.088",  # 0-00
-    # "mp-v1.093",	# 0-01
-    # "mp-v1.097",	# 0-30 NTSC-K
-    # "mp-v1.110",	# 0-00 PAL
-    # "mp-v1.111_j",	# 0-00 NTSC-J
-    # "mp-v1.111_u",	# 0-02 NTSC-U
-    # "mp-v3.570",	# New Play Controls
-    # "mp-v3.593",	# Trilogy NTSC
-    # "mp-v3.629",	# Trilogy PAL
+    "GM8E01_00",  # mp-v1.088 NTSC-U
+    #"GM8E01_01",  # mp-v1.093 NTSC-U
+    #"GM8E01_30",  # mp-v1.097 NTSC-K
+    #"GM8P01_00",  # mp-v1.110 PAL
+    #"GM8J01_00",  # mp-v1.111 NTSC-J
+    #"GM8E01_02",  # mp-v1.111 NTSC-U
+    #"R3IJ01_00",  # mp-v3.570 New Play Controls
+    #"R3ME01_00",  # mp-v3.593 Trilogy NTSC
+    #"R3MP01_00",  # mp-v3.629 Trilogy PAL
 ]
 
 if len(VERSIONS) > 1:
@@ -155,8 +155,7 @@ cflags_base = [
     "-nosyspath",
     "-i include",
     "-i libc",
-    "-DPRIME1"
-    "-DVERSION={version_num}",
+    "-DPRIME1" "-DVERSION={version_num}",
     "-DNONMATCHING=0",
 ]
 
diff --git a/orig/GM8E01_00/.gitkeep b/orig/GM8E01_00/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/orig/GM8E01_01/.gitkeep b/orig/GM8E01_01/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/orig/GM8E01_02/.gitkeep b/orig/GM8E01_02/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/orig/GM8E01_30/.gitkeep b/orig/GM8E01_30/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/orig/GM8J01_00/.gitkeep b/orig/GM8J01_00/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/orig/GM8P01_00/.gitkeep b/orig/GM8P01_00/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/orig/R3IJ01_00/.gitkeep b/orig/R3IJ01_00/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/orig/R3ME01_00/.gitkeep b/orig/R3ME01_00/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/orig/R3MP01_00/.gitkeep b/orig/R3MP01_00/.gitkeep
new file mode 100644
index 00000000..e69de29b