diff --git a/keyboards/acr60/acr60.c b/keyboards/mechkeys/acr60/acr60.c
similarity index 100%
rename from keyboards/acr60/acr60.c
rename to keyboards/mechkeys/acr60/acr60.c
diff --git a/keyboards/acr60/acr60.h b/keyboards/mechkeys/acr60/acr60.h
similarity index 100%
rename from keyboards/acr60/acr60.h
rename to keyboards/mechkeys/acr60/acr60.h
diff --git a/keyboards/acr60/config.h b/keyboards/mechkeys/acr60/config.h
similarity index 100%
rename from keyboards/acr60/config.h
rename to keyboards/mechkeys/acr60/config.h
diff --git a/keyboards/acr60/info.json b/keyboards/mechkeys/acr60/info.json
similarity index 100%
rename from keyboards/acr60/info.json
rename to keyboards/mechkeys/acr60/info.json
diff --git a/keyboards/acr60/keymaps/default/keymap.c b/keyboards/mechkeys/acr60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/acr60/keymaps/default/keymap.c
rename to keyboards/mechkeys/acr60/keymaps/default/keymap.c
diff --git a/keyboards/acr60/keymaps/mitch/keymap.c b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
similarity index 100%
rename from keyboards/acr60/keymaps/mitch/keymap.c
rename to keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
diff --git a/keyboards/acr60/readme.md b/keyboards/mechkeys/acr60/readme.md
similarity index 93%
rename from keyboards/acr60/readme.md
rename to keyboards/mechkeys/acr60/readme.md
index 70b617dfda..4d8bffa364 100644
--- a/keyboards/acr60/readme.md
+++ b/keyboards/mechkeys/acr60/readme.md
@@ -10,11 +10,11 @@ A customizable 60% keyboard made and sold by mechkeys.ca [More info on MECHKEYS]
 
 Make example for this keyboard (after setting up your build environment):
 
-    make acr60:default
+    make mechkeys/acr60:default
 
 Flashing example for this keyboard:
 
-    make acr60:default:flash
+    make mechkeys/acr60:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/acr60/rules.mk b/keyboards/mechkeys/acr60/rules.mk
similarity index 100%
rename from keyboards/acr60/rules.mk
rename to keyboards/mechkeys/acr60/rules.mk
diff --git a/keyboards/alu84/alu84.c b/keyboards/mechkeys/alu84/alu84.c
similarity index 100%
rename from keyboards/alu84/alu84.c
rename to keyboards/mechkeys/alu84/alu84.c
diff --git a/keyboards/alu84/alu84.h b/keyboards/mechkeys/alu84/alu84.h
similarity index 100%
rename from keyboards/alu84/alu84.h
rename to keyboards/mechkeys/alu84/alu84.h
diff --git a/keyboards/alu84/config.h b/keyboards/mechkeys/alu84/config.h
similarity index 100%
rename from keyboards/alu84/config.h
rename to keyboards/mechkeys/alu84/config.h
diff --git a/keyboards/alu84/info.json b/keyboards/mechkeys/alu84/info.json
similarity index 100%
rename from keyboards/alu84/info.json
rename to keyboards/mechkeys/alu84/info.json
diff --git a/keyboards/alu84/keymaps/default/keymap.c b/keyboards/mechkeys/alu84/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/alu84/keymaps/default/keymap.c
rename to keyboards/mechkeys/alu84/keymaps/default/keymap.c
diff --git a/keyboards/alu84/keymaps/turbomech/config.h b/keyboards/mechkeys/alu84/keymaps/turbomech/config.h
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/config.h
rename to keyboards/mechkeys/alu84/keymaps/turbomech/config.h
diff --git a/keyboards/alu84/keymaps/turbomech/keymap.c b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/keymap.c
rename to keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
diff --git a/keyboards/alu84/keymaps/turbomech/readme.md b/keyboards/mechkeys/alu84/keymaps/turbomech/readme.md
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/readme.md
rename to keyboards/mechkeys/alu84/keymaps/turbomech/readme.md
diff --git a/keyboards/alu84/keymaps/turbomech/rules.mk b/keyboards/mechkeys/alu84/keymaps/turbomech/rules.mk
similarity index 100%
rename from keyboards/alu84/keymaps/turbomech/rules.mk
rename to keyboards/mechkeys/alu84/keymaps/turbomech/rules.mk
diff --git a/keyboards/alu84/readme.md b/keyboards/mechkeys/alu84/readme.md
similarity index 91%
rename from keyboards/alu84/readme.md
rename to keyboards/mechkeys/alu84/readme.md
index 12da1d8a8f..ca2afbe970 100644
--- a/keyboards/alu84/readme.md
+++ b/keyboards/mechkeys/alu84/readme.md
@@ -10,11 +10,11 @@ A 75% keyboard made and sold by MECHKEYS.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make alu84:default
+    make mechkeys/alu84:default
 
 Flashing example for this keyboard:
 
-    make alu84:default:flash
+    make mechkeys/alu84:default:flash
 
 To reset the board into bootloader mode, hold Space+B while plugging the cable in.
 
diff --git a/keyboards/alu84/rules.mk b/keyboards/mechkeys/alu84/rules.mk
similarity index 100%
rename from keyboards/alu84/rules.mk
rename to keyboards/mechkeys/alu84/rules.mk
diff --git a/keyboards/espectro/config.h b/keyboards/mechkeys/espectro/config.h
similarity index 100%
rename from keyboards/espectro/config.h
rename to keyboards/mechkeys/espectro/config.h
diff --git a/keyboards/espectro/espectro.c b/keyboards/mechkeys/espectro/espectro.c
similarity index 100%
rename from keyboards/espectro/espectro.c
rename to keyboards/mechkeys/espectro/espectro.c
diff --git a/keyboards/espectro/espectro.h b/keyboards/mechkeys/espectro/espectro.h
similarity index 100%
rename from keyboards/espectro/espectro.h
rename to keyboards/mechkeys/espectro/espectro.h
diff --git a/keyboards/espectro/info.json b/keyboards/mechkeys/espectro/info.json
similarity index 100%
rename from keyboards/espectro/info.json
rename to keyboards/mechkeys/espectro/info.json
diff --git a/keyboards/espectro/keymaps/default/keymap.c b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/default/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/default/keymap.c
diff --git a/keyboards/espectro/keymaps/iso/keymap.c b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/iso/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/iso/keymap.c
diff --git a/keyboards/espectro/keymaps/mac/config.h b/keyboards/mechkeys/espectro/keymaps/mac/config.h
similarity index 100%
rename from keyboards/espectro/keymaps/mac/config.h
rename to keyboards/mechkeys/espectro/keymaps/mac/config.h
diff --git a/keyboards/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/mac/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/mac/keymap.c
diff --git a/keyboards/espectro/keymaps/mac/readme.md b/keyboards/mechkeys/espectro/keymaps/mac/readme.md
similarity index 100%
rename from keyboards/espectro/keymaps/mac/readme.md
rename to keyboards/mechkeys/espectro/keymaps/mac/readme.md
diff --git a/keyboards/espectro/keymaps/mapdev/keymap.c b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/mapdev/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
diff --git a/keyboards/espectro/keymaps/mikethetiger/keymap.c b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
similarity index 100%
rename from keyboards/espectro/keymaps/mikethetiger/keymap.c
rename to keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
diff --git a/keyboards/espectro/readme.md b/keyboards/mechkeys/espectro/readme.md
similarity index 95%
rename from keyboards/espectro/readme.md
rename to keyboards/mechkeys/espectro/readme.md
index c4c0edc7f7..fca7ad7308 100644
--- a/keyboards/espectro/readme.md
+++ b/keyboards/mechkeys/espectro/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [MECHKEYS](https://mechkeys.ca)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make espectro:default
+    make mechkeys/espectro:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/espectro/rules.mk b/keyboards/mechkeys/espectro/rules.mk
similarity index 100%
rename from keyboards/espectro/rules.mk
rename to keyboards/mechkeys/espectro/rules.mk
diff --git a/keyboards/mechmini/mechmini.c b/keyboards/mechkeys/mechmini/mechmini.c
similarity index 100%
rename from keyboards/mechmini/mechmini.c
rename to keyboards/mechkeys/mechmini/mechmini.c
diff --git a/keyboards/mechmini/mechmini.h b/keyboards/mechkeys/mechmini/mechmini.h
similarity index 90%
rename from keyboards/mechmini/mechmini.h
rename to keyboards/mechkeys/mechmini/mechmini.h
index cbd405285f..9420b3e161 100644
--- a/keyboards/mechmini/mechmini.h
+++ b/keyboards/mechkeys/mechmini/mechmini.h
@@ -18,8 +18,8 @@
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_mechmini_v1)
+#if defined(KEYBOARD_mechkeys_mechmini_v1)
 #    include "v1.h"
-#elif defined(KEYBOARD_mechmini_v2)
+#elif defined(KEYBOARD_mechkeys_mechmini_v2)
 #    include "v2.h"
 #endif
diff --git a/keyboards/mechmini/readme.md b/keyboards/mechkeys/mechmini/readme.md
similarity index 97%
rename from keyboards/mechmini/readme.md
rename to keyboards/mechkeys/mechmini/readme.md
index fc43eb1248..f9c0264273 100644
--- a/keyboards/mechmini/readme.md
+++ b/keyboards/mechkeys/mechmini/readme.md
@@ -17,7 +17,7 @@ Hardware Availability: [MECHKEYS](https://mechkeys.ca/collections/keyboards/prod
 
 Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space) - please see v1 readme for v1 make instructions:
 
-    make mechmini:default
+    make mechkeys/mechmini:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/mechkeys/mechmini/rules.mk b/keyboards/mechkeys/mechmini/rules.mk
new file mode 100644
index 0000000000..9d63d875eb
--- /dev/null
+++ b/keyboards/mechkeys/mechmini/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = mechkeys/mechmini/v2
diff --git a/keyboards/mechmini/v1/.noci b/keyboards/mechkeys/mechmini/v1/.noci
similarity index 100%
rename from keyboards/mechmini/v1/.noci
rename to keyboards/mechkeys/mechmini/v1/.noci
diff --git a/keyboards/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
similarity index 100%
rename from keyboards/mechmini/v1/config.h
rename to keyboards/mechkeys/mechmini/v1/config.h
diff --git a/keyboards/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
similarity index 100%
rename from keyboards/mechmini/v1/info.json
rename to keyboards/mechkeys/mechmini/v1/info.json
diff --git a/keyboards/mechmini/v1/keymaps/default/keymap.c b/keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mechmini/v1/keymaps/default/keymap.c
rename to keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c
diff --git a/keyboards/mechmini/v1/keymaps/pitty/keymap.c b/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
similarity index 100%
rename from keyboards/mechmini/v1/keymaps/pitty/keymap.c
rename to keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
diff --git a/keyboards/mechmini/v1/readme.md b/keyboards/mechkeys/mechmini/v1/readme.md
similarity index 92%
rename from keyboards/mechmini/v1/readme.md
rename to keyboards/mechkeys/mechmini/v1/readme.md
index 902948c24d..d6b88d9c04 100644
--- a/keyboards/mechmini/v1/readme.md
+++ b/keyboards/mechkeys/mechmini/v1/readme.md
@@ -8,11 +8,11 @@ A 40% ortholinear/staggered keyboard, that was originally bootmapper and can be
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mechmini/v1:default
+    make mechkeys/mechmini/v1:default
 
 Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
 
-    make mechmini/v1:default:flash
+    make mechkeys/mechmini/v1:default:flash
 
 **Reset Key**: Hold down the key commonly programmed as *L_Ctrl* while plugging in the keyboard.
 
diff --git a/keyboards/mechmini/v1/rules.mk b/keyboards/mechkeys/mechmini/v1/rules.mk
similarity index 100%
rename from keyboards/mechmini/v1/rules.mk
rename to keyboards/mechkeys/mechmini/v1/rules.mk
diff --git a/keyboards/mechmini/v1/v1.c b/keyboards/mechkeys/mechmini/v1/v1.c
similarity index 100%
rename from keyboards/mechmini/v1/v1.c
rename to keyboards/mechkeys/mechmini/v1/v1.c
diff --git a/keyboards/mechmini/v1/v1.h b/keyboards/mechkeys/mechmini/v1/v1.h
similarity index 98%
rename from keyboards/mechmini/v1/v1.h
rename to keyboards/mechkeys/mechmini/v1/v1.h
index 526f12e410..07d1e683f7 100644
--- a/keyboards/mechmini/v1/v1.h
+++ b/keyboards/mechkeys/mechmini/v1/v1.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "mechmini.h"
+#include "../mechmini.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/mechmini/v2/config.h b/keyboards/mechkeys/mechmini/v2/config.h
similarity index 100%
rename from keyboards/mechmini/v2/config.h
rename to keyboards/mechkeys/mechmini/v2/config.h
diff --git a/keyboards/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
similarity index 100%
rename from keyboards/mechmini/v2/info.json
rename to keyboards/mechkeys/mechmini/v2/info.json
diff --git a/keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/625_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/arkag/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/arkag/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/arkag/config.h
diff --git a/keyboards/mechmini/v2/keymaps/arkag/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/arkag/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/arkag/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/arkag/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/arkag/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/arkag/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/default/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/default/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/default/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/default/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/ortho/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/ortho/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/config.h
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/split_space/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/split_space/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/split_space/readme.md b/keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/split_space/readme.md
rename to keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md
diff --git a/keyboards/mechmini/v2/keymaps/via/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/via/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/via/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/via/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/via/rules.mk
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/config.h b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/wsturgiss/config.h
rename to keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/keymap.c b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/wsturgiss/keymap.c
rename to keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c
diff --git a/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk
rename to keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk
diff --git a/keyboards/mechmini/v2/readme.md b/keyboards/mechkeys/mechmini/v2/readme.md
similarity index 95%
rename from keyboards/mechmini/v2/readme.md
rename to keyboards/mechkeys/mechmini/v2/readme.md
index fdc9fef9bf..8724f16a0f 100644
--- a/keyboards/mechmini/v2/readme.md
+++ b/keyboards/mechkeys/mechmini/v2/readme.md
@@ -13,7 +13,7 @@ Hardware Availability: [MECHKEYS Mechmini 2.0](https://mechkeys.ca/collections/k
 
 Make example for this keyboard (after setting up your build environment), this will make the Mechmini 2.0 default keymap (split space):
 
-    make mechmini/v2:default
+    make mechkeys/mechmini/v2:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/mechmini/v2/rules.mk b/keyboards/mechkeys/mechmini/v2/rules.mk
similarity index 100%
rename from keyboards/mechmini/v2/rules.mk
rename to keyboards/mechkeys/mechmini/v2/rules.mk
diff --git a/keyboards/mechmini/v2/v2.c b/keyboards/mechkeys/mechmini/v2/v2.c
similarity index 100%
rename from keyboards/mechmini/v2/v2.c
rename to keyboards/mechkeys/mechmini/v2/v2.c
diff --git a/keyboards/mechmini/v2/v2.h b/keyboards/mechkeys/mechmini/v2/v2.h
similarity index 100%
rename from keyboards/mechmini/v2/v2.h
rename to keyboards/mechkeys/mechmini/v2/v2.h
diff --git a/keyboards/mechmini/rules.mk b/keyboards/mechmini/rules.mk
deleted file mode 100644
index 71dae51277..0000000000
--- a/keyboards/mechmini/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = mechmini/v2