summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/mechkeys/acr60/acr60.c (renamed from keyboards/acr60/acr60.c)0
-rw-r--r--keyboards/mechkeys/acr60/acr60.h (renamed from keyboards/acr60/acr60.h)0
-rw-r--r--keyboards/mechkeys/acr60/config.h (renamed from keyboards/acr60/config.h)0
-rw-r--r--keyboards/mechkeys/acr60/info.json (renamed from keyboards/acr60/info.json)0
-rw-r--r--keyboards/mechkeys/acr60/keymaps/default/keymap.c (renamed from keyboards/acr60/keymaps/default/keymap.c)0
-rw-r--r--keyboards/mechkeys/acr60/keymaps/mitch/keymap.c (renamed from keyboards/acr60/keymaps/mitch/keymap.c)0
-rw-r--r--keyboards/mechkeys/acr60/readme.md (renamed from keyboards/acr60/readme.md)4
-rw-r--r--keyboards/mechkeys/acr60/rules.mk (renamed from keyboards/acr60/rules.mk)0
-rwxr-xr-xkeyboards/mechkeys/alu84/alu84.c (renamed from keyboards/alu84/alu84.c)0
-rwxr-xr-xkeyboards/mechkeys/alu84/alu84.h (renamed from keyboards/alu84/alu84.h)0
-rwxr-xr-xkeyboards/mechkeys/alu84/config.h (renamed from keyboards/alu84/config.h)0
-rw-r--r--keyboards/mechkeys/alu84/info.json (renamed from keyboards/alu84/info.json)0
-rwxr-xr-xkeyboards/mechkeys/alu84/keymaps/default/keymap.c (renamed from keyboards/alu84/keymaps/default/keymap.c)0
-rw-r--r--keyboards/mechkeys/alu84/keymaps/turbomech/config.h (renamed from keyboards/alu84/keymaps/turbomech/config.h)0
-rw-r--r--keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c (renamed from keyboards/alu84/keymaps/turbomech/keymap.c)0
-rw-r--r--keyboards/mechkeys/alu84/keymaps/turbomech/readme.md (renamed from keyboards/alu84/keymaps/turbomech/readme.md)0
-rw-r--r--keyboards/mechkeys/alu84/keymaps/turbomech/rules.mk (renamed from keyboards/alu84/keymaps/turbomech/rules.mk)0
-rw-r--r--keyboards/mechkeys/alu84/readme.md (renamed from keyboards/alu84/readme.md)4
-rwxr-xr-xkeyboards/mechkeys/alu84/rules.mk (renamed from keyboards/alu84/rules.mk)0
-rwxr-xr-xkeyboards/mechkeys/espectro/config.h (renamed from keyboards/espectro/config.h)0
-rwxr-xr-xkeyboards/mechkeys/espectro/espectro.c (renamed from keyboards/espectro/espectro.c)0
-rwxr-xr-xkeyboards/mechkeys/espectro/espectro.h (renamed from keyboards/espectro/espectro.h)0
-rw-r--r--keyboards/mechkeys/espectro/info.json (renamed from keyboards/espectro/info.json)0
-rwxr-xr-xkeyboards/mechkeys/espectro/keymaps/default/keymap.c (renamed from keyboards/espectro/keymaps/default/keymap.c)0
-rwxr-xr-xkeyboards/mechkeys/espectro/keymaps/iso/keymap.c (renamed from keyboards/espectro/keymaps/iso/keymap.c)0
-rw-r--r--keyboards/mechkeys/espectro/keymaps/mac/config.h (renamed from keyboards/espectro/keymaps/mac/config.h)0
-rw-r--r--keyboards/mechkeys/espectro/keymaps/mac/keymap.c (renamed from keyboards/espectro/keymaps/mac/keymap.c)0
-rw-r--r--keyboards/mechkeys/espectro/keymaps/mac/readme.md (renamed from keyboards/espectro/keymaps/mac/readme.md)0
-rw-r--r--keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c (renamed from keyboards/espectro/keymaps/mapdev/keymap.c)0
-rw-r--r--keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c (renamed from keyboards/espectro/keymaps/mikethetiger/keymap.c)0
-rw-r--r--keyboards/mechkeys/espectro/readme.md (renamed from keyboards/espectro/readme.md)2
-rwxr-xr-xkeyboards/mechkeys/espectro/rules.mk (renamed from keyboards/espectro/rules.mk)0
-rw-r--r--keyboards/mechkeys/mechmini/mechmini.c (renamed from keyboards/mechmini/mechmini.c)0
-rw-r--r--keyboards/mechkeys/mechmini/mechmini.h (renamed from keyboards/mechmini/mechmini.h)4
-rw-r--r--keyboards/mechkeys/mechmini/readme.md (renamed from keyboards/mechmini/readme.md)2
-rw-r--r--keyboards/mechkeys/mechmini/rules.mk1
-rw-r--r--keyboards/mechkeys/mechmini/v1/.noci (renamed from keyboards/mechmini/v1/.noci)0
-rw-r--r--keyboards/mechkeys/mechmini/v1/config.h (renamed from keyboards/mechmini/v1/config.h)0
-rw-r--r--keyboards/mechkeys/mechmini/v1/info.json (renamed from keyboards/mechmini/v1/info.json)0
-rw-r--r--keyboards/mechkeys/mechmini/v1/keymaps/default/keymap.c (renamed from keyboards/mechmini/v1/keymaps/default/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c (renamed from keyboards/mechmini/v1/keymaps/pitty/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v1/readme.md (renamed from keyboards/mechmini/v1/readme.md)4
-rw-r--r--keyboards/mechkeys/mechmini/v1/rules.mk (renamed from keyboards/mechmini/v1/rules.mk)0
-rw-r--r--keyboards/mechkeys/mechmini/v1/v1.c (renamed from keyboards/mechmini/v1/v1.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v1/v1.h (renamed from keyboards/mechmini/v1/v1.h)2
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/config.h (renamed from keyboards/mechmini/v2/config.h)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/info.json (renamed from keyboards/mechmini/v2/info.json)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/2u_space_ortho/keymap.c (renamed from keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/625_space/keymap.c (renamed from keyboards/mechmini/v2/keymaps/625_space/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/arkag/config.h (renamed from keyboards/mechmini/v2/keymaps/arkag/config.h)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/arkag/keymap.c (renamed from keyboards/mechmini/v2/keymaps/arkag/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/arkag/rules.mk (renamed from keyboards/mechmini/v2/keymaps/arkag/rules.mk)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/default/keymap.c (renamed from keyboards/mechmini/v2/keymaps/default/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/default/readme.md (renamed from keyboards/mechmini/v2/keymaps/default/readme.md)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/config.h (renamed from keyboards/mechmini/v2/keymaps/lbibass_625_space/config.h)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/keymap.c (renamed from keyboards/mechmini/v2/keymaps/lbibass_625_space/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/readme.md (renamed from keyboards/mechmini/v2/keymaps/lbibass_625_space/readme.md)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/lbibass_625_space/rules.mk (renamed from keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/config.h (renamed from keyboards/mechmini/v2/keymaps/lbibass_split_space/config.h)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/keymap.c (renamed from keyboards/mechmini/v2/keymaps/lbibass_split_space/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/readme.md (renamed from keyboards/mechmini/v2/keymaps/lbibass_split_space/readme.md)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/lbibass_split_space/rules.mk (renamed from keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/ortho/keymap.c (renamed from keyboards/mechmini/v2/keymaps/ortho/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/config.h (renamed from keyboards/mechmini/v2/keymaps/spacebarracecar/config.h)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/keymap.c (renamed from keyboards/mechmini/v2/keymaps/spacebarracecar/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/readme.md (renamed from keyboards/mechmini/v2/keymaps/spacebarracecar/readme.md)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/spacebarracecar/rules.mk (renamed from keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/split_space/keymap.c (renamed from keyboards/mechmini/v2/keymaps/split_space/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/split_space/readme.md (renamed from keyboards/mechmini/v2/keymaps/split_space/readme.md)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/via/keymap.c (renamed from keyboards/mechmini/v2/keymaps/via/keymap.c)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/via/rules.mk (renamed from keyboards/mechmini/v2/keymaps/via/rules.mk)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/config.h (renamed from keyboards/mechmini/v2/keymaps/wsturgiss/config.h)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/keymap.c (renamed from keyboards/mechmini/v2/keymaps/wsturgiss/keymap.c)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk (renamed from keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk)0
-rw-r--r--keyboards/mechkeys/mechmini/v2/readme.md (renamed from keyboards/mechmini/v2/readme.md)2
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/rules.mk (renamed from keyboards/mechmini/v2/rules.mk)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/v2.c (renamed from keyboards/mechmini/v2/v2.c)0
-rwxr-xr-xkeyboards/mechkeys/mechmini/v2/v2.h (renamed from keyboards/mechmini/v2/v2.h)0
-rw-r--r--keyboards/mechmini/rules.mk1
79 files changed, 13 insertions, 13 deletions
diff --git a/keyboards/acr60/acr60.c b/keyboards/mechkeys/acr60/acr60.c
index 7cba669b84..7cba669b84 100644
--- a/keyboards/acr60/acr60.c
+++ b/keyboards/mechkeys/acr60/acr60.c
diff --git a/keyboards/acr60/acr60.h b/keyboards/mechkeys/acr60/acr60.h
index 5a52a3bc86..5a52a3bc86 100644
--- a/keyboards/acr60/acr60.h
+++ b/keyboards/mechkeys/acr60/acr60.h
diff --git a/keyboards/acr60/config.h b/keyboards/mechkeys/acr60/config.h
index 7fb907153a..7fb907153a 100644
--- a/keyboards/acr60/config.h
+++ b/keyboards/mechkeys/acr60/config.h
diff --git a/keyboards/acr60/info.json b/keyboards/mechkeys/acr60/info.json
index 0e42e5162e..0e42e5162e 100644
--- a/keyboards/acr60/info.json
+++ b/keyboards/mechkeys/acr60/info.json
diff --git a/keyboards/acr60/keymaps/default/keymap.c b/keyboards/mechkeys/acr60/keymaps/default/keymap.c
index e7381c5783..e7381c5783 100644
--- a/keyboards/acr60/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/acr60/keymaps/default/keymap.c
diff --git a/keyboards/acr60/keymaps/mitch/keymap.c b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
index 1567b14813..1567b14813 100644
--- a/keyboards/acr60/keymaps/mitch/keymap.c
+++ b/keyboards/mechkeys/acr60/keymaps/mitch/keymap.c
diff --git a/keyboards/acr60/readme.md b/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
index 9ccce6abf4..9ccce6abf4 100644
--- a/keyboards/acr60/rules.mk
+++ b/keyboards/mechkeys/acr60/rules.mk
diff --git a/keyboards/alu84/alu84.c b/keyboards/mechkeys/alu84/alu84.c
index 3e058d3ed5..3e058d3ed5 100755
--- a/keyboards/alu84/alu84.c
+++ b/keyboards/mechkeys/alu84/alu84.c
diff --git a/keyboards/alu84/alu84.h b/keyboards/mechkeys/alu84/alu84.h
index dc263eb8d1..dc263eb8d1 100755
--- a/keyboards/alu84/alu84.h
+++ b/keyboards/mechkeys/alu84/alu84.h
diff --git a/keyboards/alu84/config.h b/keyboards/mechkeys/alu84/config.h
index 3700ced8cf..3700ced8cf 100755
--- a/keyboards/alu84/config.h
+++ b/keyboards/mechkeys/alu84/config.h
diff --git a/keyboards/alu84/info.json b/keyboards/mechkeys/alu84/info.json
index 55d01489dc..55d01489dc 100644
--- a/keyboards/alu84/info.json
+++ b/keyboards/mechkeys/alu84/info.json
diff --git a/keyboards/alu84/keymaps/default/keymap.c b/keyboards/mechkeys/alu84/keymaps/default/keymap.c
index ca370c765a..ca370c765a 100755
--- a/keyboards/alu84/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/alu84/keymaps/default/keymap.c
diff --git a/keyboards/alu84/keymaps/turbomech/config.h b/keyboards/mechkeys/alu84/keymaps/turbomech/config.h
index 2a60c1f381..2a60c1f381 100644
--- a/keyboards/alu84/keymaps/turbomech/config.h
+++ b/keyboards/mechkeys/alu84/keymaps/turbomech/config.h
diff --git a/keyboards/alu84/keymaps/turbomech/keymap.c b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
index 24c0d2c2da..24c0d2c2da 100644
--- a/keyboards/alu84/keymaps/turbomech/keymap.c
+++ b/keyboards/mechkeys/alu84/keymaps/turbomech/keymap.c
diff --git a/keyboards/alu84/keymaps/turbomech/readme.md b/keyboards/mechkeys/alu84/keymaps/turbomech/readme.md
index b78d7a5e7e..b78d7a5e7e 100644
--- a/keyboards/alu84/keymaps/turbomech/readme.md
+++ b/keyboards/mechkeys/alu84/keymaps/turbomech/readme.md
diff --git a/keyboards/alu84/keymaps/turbomech/rules.mk b/keyboards/mechkeys/alu84/keymaps/turbomech/rules.mk
index 6c0a79b110..6c0a79b110 100644
--- a/keyboards/alu84/keymaps/turbomech/rules.mk
+++ b/keyboards/mechkeys/alu84/keymaps/turbomech/rules.mk
diff --git a/keyboards/alu84/readme.md b/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
index 323c6a1b87..323c6a1b87 100755
--- a/keyboards/alu84/rules.mk
+++ b/keyboards/mechkeys/alu84/rules.mk
diff --git a/keyboards/espectro/config.h b/keyboards/mechkeys/espectro/config.h
index e328f276eb..e328f276eb 100755
--- a/keyboards/espectro/config.h
+++ b/keyboards/mechkeys/espectro/config.h
diff --git a/keyboards/espectro/espectro.c b/keyboards/mechkeys/espectro/espectro.c
index 64494c49c1..64494c49c1 100755
--- a/keyboards/espectro/espectro.c
+++ b/keyboards/mechkeys/espectro/espectro.c
diff --git a/keyboards/espectro/espectro.h b/keyboards/mechkeys/espectro/espectro.h
index 98c930f8f5..98c930f8f5 100755
--- a/keyboards/espectro/espectro.h
+++ b/keyboards/mechkeys/espectro/espectro.h
diff --git a/keyboards/espectro/info.json b/keyboards/mechkeys/espectro/info.json
index cb34f6938c..cb34f6938c 100644
--- a/keyboards/espectro/info.json
+++ b/keyboards/mechkeys/espectro/info.json
diff --git a/keyboards/espectro/keymaps/default/keymap.c b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
index 3b23fee190..3b23fee190 100755
--- a/keyboards/espectro/keymaps/default/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/default/keymap.c
diff --git a/keyboards/espectro/keymaps/iso/keymap.c b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
index b001f9417d..b001f9417d 100755
--- a/keyboards/espectro/keymaps/iso/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/iso/keymap.c
diff --git a/keyboards/espectro/keymaps/mac/config.h b/keyboards/mechkeys/espectro/keymaps/mac/config.h
index a18495221b..a18495221b 100644
--- a/keyboards/espectro/keymaps/mac/config.h
+++ b/keyboards/mechkeys/espectro/keymaps/mac/config.h
diff --git a/keyboards/espectro/keymaps/mac/keymap.c b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
index 9bd75d61d6..9bd75d61d6 100644
--- a/keyboards/espectro/keymaps/mac/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mac/keymap.c
diff --git a/keyboards/espectro/keymaps/mac/readme.md b/keyboards/mechkeys/espectro/keymaps/mac/readme.md
index fb62260181..fb62260181 100644
--- a/keyboards/espectro/keymaps/mac/readme.md
+++ b/keyboards/mechkeys/espectro/keymaps/mac/readme.md
diff --git a/keyboards/espectro/keymaps/mapdev/keymap.c b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
index 89d412b2dd..89d412b2dd 100644
--- a/keyboards/espectro/keymaps/mapdev/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mapdev/keymap.c
diff --git a/keyboards/espectro/keymaps/mikethetiger/keymap.c b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
index 30688ab5c4..30688ab5c4 100644
--- a/keyboards/espectro/keymaps/mikethetiger/keymap.c
+++ b/keyboards/mechkeys/espectro/keymaps/mikethetiger/keymap.c
diff --git a/keyboards/espectro/readme.md b/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
index ad15c847bd..ad15c847bd 100755
--- a/keyboards/espectro/rules.mk
+++ b/keyboards/mechkeys/espectro/rules.mk
diff --git a/keyboards/mechmini/mechmini.c b/keyboards/mechkeys/mechmini/mechmini.c
index 46e29ba3e9..46e29ba3e9 100644
--- a/keyboards/mechmini/mechmini.c
+++ b/keyboards/mechkeys/mechmini/mechmini.c
diff --git a/keyboards/mechmini/mechmini.h b/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
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
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/mechmini/v1/.noci
+++ b/keyboards/mechkeys/mechmini/v1/.noci
diff --git a/keyboards/mechmini/v1/config.h b/keyboards/mechkeys/mechmini/v1/config.h
index a64127f597..a64127f597 100644
--- a/keyboards/mechmini/v1/config.h
+++ b/keyboards/mechkeys/mechmini/v1/config.h
diff --git a/keyboards/mechmini/v1/info.json b/keyboards/mechkeys/mechmini/v1/info.json
index f48fddd066..f48fddd066 100644
--- a/keyboards/mechmini/v1/info.json
+++ b/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
index e0b746df9f..e0b746df9f 100644
--- a/keyboards/mechmini/v1/keymaps/default/keymap.c
+++ b/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
index 7db2dc1836..7db2dc1836 100644
--- a/keyboards/mechmini/v1/keymaps/pitty/keymap.c
+++ b/keyboards/mechkeys/mechmini/v1/keymaps/pitty/keymap.c
diff --git a/keyboards/mechmini/v1/readme.md b/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
index a7d4a67a16..a7d4a67a16 100644
--- a/keyboards/mechmini/v1/rules.mk
+++ b/keyboards/mechkeys/mechmini/v1/rules.mk
diff --git a/keyboards/mechmini/v1/v1.c b/keyboards/mechkeys/mechmini/v1/v1.c
index ba0e095209..ba0e095209 100644
--- a/keyboards/mechmini/v1/v1.c
+++ b/keyboards/mechkeys/mechmini/v1/v1.c
diff --git a/keyboards/mechmini/v1/v1.h b/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
index 7936caef00..7936caef00 100755
--- a/keyboards/mechmini/v2/config.h
+++ b/keyboards/mechkeys/mechmini/v2/config.h
diff --git a/keyboards/mechmini/v2/info.json b/keyboards/mechkeys/mechmini/v2/info.json
index 1d0d727a3e..1d0d727a3e 100644
--- a/keyboards/mechmini/v2/info.json
+++ b/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
index 90bb2ddd60..90bb2ddd60 100644
--- a/keyboards/mechmini/v2/keymaps/2u_space_ortho/keymap.c
+++ b/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
index 4344d6d2bc..4344d6d2bc 100755
--- a/keyboards/mechmini/v2/keymaps/625_space/keymap.c
+++ b/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
index 966289459b..966289459b 100644
--- a/keyboards/mechmini/v2/keymaps/arkag/config.h
+++ b/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
index 2c64c5aac0..2c64c5aac0 100644
--- a/keyboards/mechmini/v2/keymaps/arkag/keymap.c
+++ b/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
index 735d573d73..735d573d73 100644
--- a/keyboards/mechmini/v2/keymaps/arkag/rules.mk
+++ b/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
index dae1dc9fd6..dae1dc9fd6 100755
--- a/keyboards/mechmini/v2/keymaps/default/keymap.c
+++ b/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
index 093a7b084a..093a7b084a 100644
--- a/keyboards/mechmini/v2/keymaps/default/readme.md
+++ b/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
index 7adb68d347..7adb68d347 100755
--- a/keyboards/mechmini/v2/keymaps/lbibass_625_space/config.h
+++ b/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
index fba582e1b7..fba582e1b7 100755
--- a/keyboards/mechmini/v2/keymaps/lbibass_625_space/keymap.c
+++ b/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
index e09e520131..e09e520131 100644
--- a/keyboards/mechmini/v2/keymaps/lbibass_625_space/readme.md
+++ b/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
index cf808a2b41..cf808a2b41 100755
--- a/keyboards/mechmini/v2/keymaps/lbibass_625_space/rules.mk
+++ b/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
index 2f35530627..2f35530627 100755
--- a/keyboards/mechmini/v2/keymaps/lbibass_split_space/config.h
+++ b/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
index 7ad2aa81e9..7ad2aa81e9 100755
--- a/keyboards/mechmini/v2/keymaps/lbibass_split_space/keymap.c
+++ b/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
index 34888fbb19..34888fbb19 100644
--- a/keyboards/mechmini/v2/keymaps/lbibass_split_space/readme.md
+++ b/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
index 7d50540f14..7d50540f14 100755
--- a/keyboards/mechmini/v2/keymaps/lbibass_split_space/rules.mk
+++ b/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
index 31ccfa82a3..31ccfa82a3 100755
--- a/keyboards/mechmini/v2/keymaps/ortho/keymap.c
+++ b/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
index 45dcbb04b5..45dcbb04b5 100644
--- a/keyboards/mechmini/v2/keymaps/spacebarracecar/config.h
+++ b/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
index c0fb3695f9..c0fb3695f9 100644
--- a/keyboards/mechmini/v2/keymaps/spacebarracecar/keymap.c
+++ b/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
index d4039713a5..d4039713a5 100644
--- a/keyboards/mechmini/v2/keymaps/spacebarracecar/readme.md
+++ b/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
index 82f1f96f64..82f1f96f64 100644
--- a/keyboards/mechmini/v2/keymaps/spacebarracecar/rules.mk
+++ b/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
index 635b4eacb3..635b4eacb3 100755
--- a/keyboards/mechmini/v2/keymaps/split_space/keymap.c
+++ b/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
index 9c2dad396f..9c2dad396f 100644
--- a/keyboards/mechmini/v2/keymaps/split_space/readme.md
+++ b/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
index e77d9d8859..e77d9d8859 100644
--- a/keyboards/mechmini/v2/keymaps/via/keymap.c
+++ b/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
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/mechmini/v2/keymaps/via/rules.mk
+++ b/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
index 262c423cc4..262c423cc4 100755
--- a/keyboards/mechmini/v2/keymaps/wsturgiss/config.h
+++ b/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
index 218936a19b..218936a19b 100644
--- a/keyboards/mechmini/v2/keymaps/wsturgiss/keymap.c
+++ b/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
index c429a6486f..c429a6486f 100755
--- a/keyboards/mechmini/v2/keymaps/wsturgiss/rules.mk
+++ b/keyboards/mechkeys/mechmini/v2/keymaps/wsturgiss/rules.mk
diff --git a/keyboards/mechmini/v2/readme.md b/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
index 4f6e666b62..4f6e666b62 100755
--- a/keyboards/mechmini/v2/rules.mk
+++ b/keyboards/mechkeys/mechmini/v2/rules.mk
diff --git a/keyboards/mechmini/v2/v2.c b/keyboards/mechkeys/mechmini/v2/v2.c
index caf7c6f0f2..caf7c6f0f2 100755
--- a/keyboards/mechmini/v2/v2.c
+++ b/keyboards/mechkeys/mechmini/v2/v2.c
diff --git a/keyboards/mechmini/v2/v2.h b/keyboards/mechkeys/mechmini/v2/v2.h
index a0a620675e..a0a620675e 100755
--- a/keyboards/mechmini/v2/v2.h
+++ b/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