diff --git a/keyboards/mechwild/obe/f401/base/keyboard.json b/keyboards/mechwild/obe/f401/base/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/mechwild/obe/f401/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/mechwild/obe/f401/eeprom/keyboard.json b/keyboards/mechwild/obe/f401/eeprom/keyboard.json
new file mode 100644
index 0000000000..12d3baee14
--- /dev/null
+++ b/keyboards/mechwild/obe/f401/eeprom/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
diff --git a/keyboards/mechwild/obe/f401/eeprom/rules.mk b/keyboards/mechwild/obe/f401/eeprom/rules.mk
deleted file mode 100644
index 44adba039b..0000000000
--- a/keyboards/mechwild/obe/f401/eeprom/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
diff --git a/keyboards/mechwild/obe/f401/keyboard.json b/keyboards/mechwild/obe/f401/info.json
similarity index 100%
rename from keyboards/mechwild/obe/f401/keyboard.json
rename to keyboards/mechwild/obe/f401/info.json
diff --git a/keyboards/mechwild/obe/f401/rules.mk b/keyboards/mechwild/obe/f401/rules.mk
new file mode 100644
index 0000000000..8709dbb4de
--- /dev/null
+++ b/keyboards/mechwild/obe/f401/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/obe/f401/base
diff --git a/keyboards/mechwild/obe/f411/base/keyboard.json b/keyboards/mechwild/obe/f411/base/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/mechwild/obe/f411/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/mechwild/obe/f411/eeprom/keyboard.json b/keyboards/mechwild/obe/f411/eeprom/keyboard.json
new file mode 100644
index 0000000000..12d3baee14
--- /dev/null
+++ b/keyboards/mechwild/obe/f411/eeprom/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
diff --git a/keyboards/mechwild/obe/f411/eeprom/rules.mk b/keyboards/mechwild/obe/f411/eeprom/rules.mk
deleted file mode 100644
index 44adba039b..0000000000
--- a/keyboards/mechwild/obe/f411/eeprom/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
diff --git a/keyboards/mechwild/obe/f411/keyboard.json b/keyboards/mechwild/obe/f411/info.json
similarity index 100%
rename from keyboards/mechwild/obe/f411/keyboard.json
rename to keyboards/mechwild/obe/f411/info.json
diff --git a/keyboards/mechwild/obe/f411/rules.mk b/keyboards/mechwild/obe/f411/rules.mk
new file mode 100644
index 0000000000..e24fe60509
--- /dev/null
+++ b/keyboards/mechwild/obe/f411/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/obe/f411/base
diff --git a/keyboards/mechwild/obe/rules.mk b/keyboards/mechwild/obe/rules.mk
index 8fb92c3a6b..8709dbb4de 100644
--- a/keyboards/mechwild/obe/rules.mk
+++ b/keyboards/mechwild/obe/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = mechwild/obe/f401
+DEFAULT_FOLDER = mechwild/obe/f401/base
diff --git a/keyboards/mechwild/waka60/f401/base/keyboard.json b/keyboards/mechwild/waka60/f401/base/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/mechwild/waka60/f401/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/mechwild/waka60/f401/config.h b/keyboards/mechwild/waka60/f401/eeprom/config.h
similarity index 100%
rename from keyboards/mechwild/waka60/f401/config.h
rename to keyboards/mechwild/waka60/f401/eeprom/config.h
diff --git a/keyboards/mechwild/waka60/f401/eeprom/keyboard.json b/keyboards/mechwild/waka60/f401/eeprom/keyboard.json
new file mode 100644
index 0000000000..12d3baee14
--- /dev/null
+++ b/keyboards/mechwild/waka60/f401/eeprom/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
diff --git a/keyboards/mechwild/waka60/f401/eeprom/rules.mk b/keyboards/mechwild/waka60/f401/eeprom/rules.mk
deleted file mode 100644
index 44adba039b..0000000000
--- a/keyboards/mechwild/waka60/f401/eeprom/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
diff --git a/keyboards/mechwild/waka60/f401/keyboard.json b/keyboards/mechwild/waka60/f401/info.json
similarity index 100%
rename from keyboards/mechwild/waka60/f401/keyboard.json
rename to keyboards/mechwild/waka60/f401/info.json
diff --git a/keyboards/mechwild/waka60/f401/rules.mk b/keyboards/mechwild/waka60/f401/rules.mk
new file mode 100644
index 0000000000..a0d74c14eb
--- /dev/null
+++ b/keyboards/mechwild/waka60/f401/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/waka60/f401/base
diff --git a/keyboards/mechwild/waka60/f411/base/keyboard.json b/keyboards/mechwild/waka60/f411/base/keyboard.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/keyboards/mechwild/waka60/f411/base/keyboard.json
@@ -0,0 +1 @@
+{}
diff --git a/keyboards/mechwild/waka60/f411/config.h b/keyboards/mechwild/waka60/f411/eeprom/config.h
similarity index 100%
rename from keyboards/mechwild/waka60/f411/config.h
rename to keyboards/mechwild/waka60/f411/eeprom/config.h
diff --git a/keyboards/mechwild/waka60/f411/eeprom/keyboard.json b/keyboards/mechwild/waka60/f411/eeprom/keyboard.json
new file mode 100644
index 0000000000..12d3baee14
--- /dev/null
+++ b/keyboards/mechwild/waka60/f411/eeprom/keyboard.json
@@ -0,0 +1,5 @@
+{
+    "eeprom": {
+        "driver": "i2c"
+    }
+}
diff --git a/keyboards/mechwild/waka60/f411/eeprom/rules.mk b/keyboards/mechwild/waka60/f411/eeprom/rules.mk
deleted file mode 100644
index 44adba039b..0000000000
--- a/keyboards/mechwild/waka60/f411/eeprom/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-EEPROM_DRIVER = i2c
diff --git a/keyboards/mechwild/waka60/f411/keyboard.json b/keyboards/mechwild/waka60/f411/info.json
similarity index 100%
rename from keyboards/mechwild/waka60/f411/keyboard.json
rename to keyboards/mechwild/waka60/f411/info.json
diff --git a/keyboards/mechwild/waka60/f411/rules.mk b/keyboards/mechwild/waka60/f411/rules.mk
new file mode 100644
index 0000000000..0dd69ff65f
--- /dev/null
+++ b/keyboards/mechwild/waka60/f411/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechwild/waka60/f411/base
diff --git a/keyboards/mechwild/waka60/rules.mk b/keyboards/mechwild/waka60/rules.mk
index d3be506b16..a0d74c14eb 100644
--- a/keyboards/mechwild/waka60/rules.mk
+++ b/keyboards/mechwild/waka60/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = mechwild/waka60/f401
+DEFAULT_FOLDER = mechwild/waka60/f401/base