move keyhive exclusive boards into /keyhive (#16084)

Co-authored-by: Nick Brassel <nick@tzarc.org>

148 files changed, 19 insertions, 19 deletions

diff --git a/keyboards/absinthe/absinthe.c b/keyboards/keyhive/absinthe/absinthe.c
index 502139ed0c..502139ed0c 100644
--- a/keyboards/absinthe/absinthe.c
+++ b/keyboards/keyhive/absinthe/absinthe.c
diff --git a/keyboards/absinthe/absinthe.h b/keyboards/keyhive/absinthe/absinthe.h
index 890aff643e..890aff643e 100644
--- a/keyboards/absinthe/absinthe.h
+++ b/keyboards/keyhive/absinthe/absinthe.h
diff --git a/keyboards/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
index d6acd350cc..d6acd350cc 100644
--- a/keyboards/absinthe/config.h
+++ b/keyboards/keyhive/absinthe/config.h
diff --git a/keyboards/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
index f92e9e10ee..f92e9e10ee 100644
--- a/keyboards/absinthe/info.json
+++ b/keyboards/keyhive/absinthe/info.json
diff --git a/keyboards/absinthe/keymaps/ansi/keymap.c b/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c
index 2177f18146..2177f18146 100644
--- a/keyboards/absinthe/keymaps/ansi/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c
diff --git a/keyboards/absinthe/keymaps/ansi/readme.md b/keyboards/keyhive/absinthe/keymaps/ansi/readme.md
index e88d0cf9dd..e88d0cf9dd 100644
--- a/keyboards/absinthe/keymaps/ansi/readme.md
+++ b/keyboards/keyhive/absinthe/keymaps/ansi/readme.md
diff --git a/keyboards/absinthe/keymaps/default/keymap.c b/keyboards/keyhive/absinthe/keymaps/default/keymap.c
index e5c74366c0..e5c74366c0 100644
--- a/keyboards/absinthe/keymaps/default/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/default/keymap.c
diff --git a/keyboards/absinthe/keymaps/default/readme.md b/keyboards/keyhive/absinthe/keymaps/default/readme.md
index f9ec78d7b4..f9ec78d7b4 100644
--- a/keyboards/absinthe/keymaps/default/readme.md
+++ b/keyboards/keyhive/absinthe/keymaps/default/readme.md
diff --git a/keyboards/absinthe/keymaps/via/keymap.c b/keyboards/keyhive/absinthe/keymaps/via/keymap.c
index 797d14226d..797d14226d 100644
--- a/keyboards/absinthe/keymaps/via/keymap.c
+++ b/keyboards/keyhive/absinthe/keymaps/via/keymap.c
diff --git a/keyboards/absinthe/keymaps/via/rules.mk b/keyboards/keyhive/absinthe/keymaps/via/rules.mk
index eb5b445ddf..eb5b445ddf 100644
--- a/keyboards/absinthe/keymaps/via/rules.mk
+++ b/keyboards/keyhive/absinthe/keymaps/via/rules.mk
diff --git a/keyboards/absinthe/readme.md b/keyboards/keyhive/absinthe/readme.md
index f99d3649f2..518e13e8f0 100644
--- a/keyboards/absinthe/readme.md
+++ b/keyboards/keyhive/absinthe/readme.md
@@ -10,6 +10,6 @@ A budget-friendly F-rowless TKL with a rotary encoder
 
 Make example for this keyboard (after setting up your build environment):
 
-    make absinthe:default
+    make keyhive/absinthe: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/absinthe/rules.mk b/keyboards/keyhive/absinthe/rules.mk
index 5b1bf3cdf3..5b1bf3cdf3 100644
--- a/keyboards/absinthe/rules.mk
+++ b/keyboards/keyhive/absinthe/rules.mk
diff --git a/keyboards/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
index 41f9a09311..41f9a09311 100644
--- a/keyboards/ergosaurus/config.h
+++ b/keyboards/keyhive/ergosaurus/config.h
diff --git a/keyboards/ergosaurus/ergosaurus.c b/keyboards/keyhive/ergosaurus/ergosaurus.c
index 4c31455128..4c31455128 100644
--- a/keyboards/ergosaurus/ergosaurus.c
+++ b/keyboards/keyhive/ergosaurus/ergosaurus.c
diff --git a/keyboards/ergosaurus/ergosaurus.h b/keyboards/keyhive/ergosaurus/ergosaurus.h
index cef594993d..cef594993d 100644
--- a/keyboards/ergosaurus/ergosaurus.h
+++ b/keyboards/keyhive/ergosaurus/ergosaurus.h
diff --git a/keyboards/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
index 8048896be2..8048896be2 100644
--- a/keyboards/ergosaurus/info.json
+++ b/keyboards/keyhive/ergosaurus/info.json
diff --git a/keyboards/ergosaurus/keymaps/default/keymap.c b/keyboards/keyhive/ergosaurus/keymaps/default/keymap.c
index 42cf9082e4..42cf9082e4 100644
--- a/keyboards/ergosaurus/keymaps/default/keymap.c
+++ b/keyboards/keyhive/ergosaurus/keymaps/default/keymap.c
diff --git a/keyboards/ergosaurus/keymaps/default/readme.md b/keyboards/keyhive/ergosaurus/keymaps/default/readme.md
index acd1216c79..acd1216c79 100644
--- a/keyboards/ergosaurus/keymaps/default/readme.md
+++ b/keyboards/keyhive/ergosaurus/keymaps/default/readme.md
diff --git a/keyboards/ergosaurus/keymaps/via/keymap.c b/keyboards/keyhive/ergosaurus/keymaps/via/keymap.c
index 5ae73bfd47..5ae73bfd47 100644
--- a/keyboards/ergosaurus/keymaps/via/keymap.c
+++ b/keyboards/keyhive/ergosaurus/keymaps/via/keymap.c
diff --git a/keyboards/ergosaurus/keymaps/via/rules.mk b/keyboards/keyhive/ergosaurus/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/ergosaurus/keymaps/via/rules.mk
+++ b/keyboards/keyhive/ergosaurus/keymaps/via/rules.mk
diff --git a/keyboards/ergosaurus/readme.md b/keyboards/keyhive/ergosaurus/readme.md
index cb1a02318b..ed01f650f3 100644
--- a/keyboards/ergosaurus/readme.md
+++ b/keyboards/keyhive/ergosaurus/readme.md
@@ -10,6 +10,6 @@ An Arduino Pro Micro driven Alice-clone PCB. Supports all Alice-style cases, giv
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergosaurus:default
+    make keyhive/ergosaurus: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/ergosaurus/rules.mk b/keyboards/keyhive/ergosaurus/rules.mk
index a00db322a6..a00db322a6 100644
--- a/keyboards/ergosaurus/rules.mk
+++ b/keyboards/keyhive/ergosaurus/rules.mk
diff --git a/keyboards/honeycomb/config.h b/keyboards/keyhive/honeycomb/config.h
index 6780c2d41b..6780c2d41b 100755
--- a/keyboards/honeycomb/config.h
+++ b/keyboards/keyhive/honeycomb/config.h
diff --git a/keyboards/honeycomb/honeycomb.c b/keyboards/keyhive/honeycomb/honeycomb.c
index 603400c7a3..603400c7a3 100755
--- a/keyboards/honeycomb/honeycomb.c
+++ b/keyboards/keyhive/honeycomb/honeycomb.c
diff --git a/keyboards/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h
index ec54b59f20..ec54b59f20 100755
--- a/keyboards/honeycomb/honeycomb.h
+++ b/keyboards/keyhive/honeycomb/honeycomb.h
diff --git a/keyboards/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
index b11ece332b..b11ece332b 100644
--- a/keyboards/honeycomb/info.json
+++ b/keyboards/keyhive/honeycomb/info.json
diff --git a/keyboards/honeycomb/keymaps/default/keymap.c b/keyboards/keyhive/honeycomb/keymaps/default/keymap.c
index d0a5961873..d0a5961873 100755
--- a/keyboards/honeycomb/keymaps/default/keymap.c
+++ b/keyboards/keyhive/honeycomb/keymaps/default/keymap.c
diff --git a/keyboards/honeycomb/matrix.c b/keyboards/keyhive/honeycomb/matrix.c
index 9a87ca9a2e..9a87ca9a2e 100755
--- a/keyboards/honeycomb/matrix.c
+++ b/keyboards/keyhive/honeycomb/matrix.c
diff --git a/keyboards/honeycomb/readme.md b/keyboards/keyhive/honeycomb/readme.md
index 955f0ac7a2..611aa63880 100755
--- a/keyboards/honeycomb/readme.md
+++ b/keyboards/keyhive/honeycomb/readme.md
@@ -8,13 +8,13 @@ These configuration files use a completely different 'matrix scan' system than o
 Run the following command in your terminal:
 
 ```
-make honeycomb:default
+make keyhive/honeycomb:default
 # or use this to automatically flash the controller
-make honeycomb:default:avrdude
+make keyhive/honeycomb:default:avrdude
 ```
 
 Follow the QMK guide for this or ask in Discord.
 
 ### Other Keymaps
 
-Because this is a totally custom macropad, it is recommended that you copy the `default/` folder, rename it as desired, and modify the `keymap.c` to your liking.
\ No newline at end of file
+Because this is a totally custom macropad, it is recommended that you copy the `default/` folder, rename it as desired, and modify the `keymap.c` to your liking.
diff --git a/keyboards/honeycomb/rules.mk b/keyboards/keyhive/honeycomb/rules.mk
index 420e409e43..420e409e43 100755
--- a/keyboards/honeycomb/rules.mk
+++ b/keyboards/keyhive/honeycomb/rules.mk
diff --git a/keyboards/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
index c1e067287b..c1e067287b 100644
--- a/keyboards/lattice60/config.h
+++ b/keyboards/keyhive/lattice60/config.h
diff --git a/keyboards/lattice60/info.json b/keyboards/keyhive/lattice60/info.json
index 824884ecbd..824884ecbd 100644
--- a/keyboards/lattice60/info.json
+++ b/keyboards/keyhive/lattice60/info.json
diff --git a/keyboards/lattice60/keymaps/default/config.h b/keyboards/keyhive/lattice60/keymaps/default/config.h
index 88d9334765..88d9334765 100644
--- a/keyboards/lattice60/keymaps/default/config.h
+++ b/keyboards/keyhive/lattice60/keymaps/default/config.h
diff --git a/keyboards/lattice60/keymaps/default/keymap.c b/keyboards/keyhive/lattice60/keymaps/default/keymap.c
index a5102070ea..a5102070ea 100644
--- a/keyboards/lattice60/keymaps/default/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/default/keymap.c
diff --git a/keyboards/lattice60/keymaps/default/readme.md b/keyboards/keyhive/lattice60/keymaps/default/readme.md
index bde2ba9b41..bde2ba9b41 100644
--- a/keyboards/lattice60/keymaps/default/readme.md
+++ b/keyboards/keyhive/lattice60/keymaps/default/readme.md
diff --git a/keyboards/lattice60/keymaps/default_hhkb/config.h b/keyboards/keyhive/lattice60/keymaps/default_hhkb/config.h
index 88d9334765..88d9334765 100644
--- a/keyboards/lattice60/keymaps/default_hhkb/config.h
+++ b/keyboards/keyhive/lattice60/keymaps/default_hhkb/config.h
diff --git a/keyboards/lattice60/keymaps/default_hhkb/keymap.c b/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
index ccdc10ab32..ccdc10ab32 100644
--- a/keyboards/lattice60/keymaps/default_hhkb/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/default_hhkb/keymap.c
diff --git a/keyboards/lattice60/keymaps/default_hhkb/readme.md b/keyboards/keyhive/lattice60/keymaps/default_hhkb/readme.md
index 734ba74b9e..734ba74b9e 100644
--- a/keyboards/lattice60/keymaps/default_hhkb/readme.md
+++ b/keyboards/keyhive/lattice60/keymaps/default_hhkb/readme.md
diff --git a/keyboards/lattice60/keymaps/emdarcher/config.h b/keyboards/keyhive/lattice60/keymaps/emdarcher/config.h
index 88d9334765..88d9334765 100644
--- a/keyboards/lattice60/keymaps/emdarcher/config.h
+++ b/keyboards/keyhive/lattice60/keymaps/emdarcher/config.h
diff --git a/keyboards/lattice60/keymaps/emdarcher/keymap.c b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
index 099e8e9203..099e8e9203 100644
--- a/keyboards/lattice60/keymaps/emdarcher/keymap.c
+++ b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
diff --git a/keyboards/lattice60/keymaps/emdarcher/readme.md b/keyboards/keyhive/lattice60/keymaps/emdarcher/readme.md
index 812351af48..812351af48 100644
--- a/keyboards/lattice60/keymaps/emdarcher/readme.md
+++ b/keyboards/keyhive/lattice60/keymaps/emdarcher/readme.md
diff --git a/keyboards/lattice60/lattice60.c b/keyboards/keyhive/lattice60/lattice60.c
index 6cc0ea42fb..6cc0ea42fb 100644
--- a/keyboards/lattice60/lattice60.c
+++ b/keyboards/keyhive/lattice60/lattice60.c
diff --git a/keyboards/lattice60/lattice60.h b/keyboards/keyhive/lattice60/lattice60.h
index d9f5f37dea..d9f5f37dea 100644
--- a/keyboards/lattice60/lattice60.h
+++ b/keyboards/keyhive/lattice60/lattice60.h
diff --git a/keyboards/lattice60/readme.md b/keyboards/keyhive/lattice60/readme.md
index f5a3dc5942..92fe6198e0 100644
--- a/keyboards/lattice60/readme.md
+++ b/keyboards/keyhive/lattice60/readme.md
@@ -10,12 +10,12 @@ A HHKB layout keyboard using only through-hole components.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lattice60:default
+    make keyhive/lattice60:default
 
 To activate the USBasploader bootloader, hold the BOOT button down during power on or reset. LED2 should light up to indicate that the bootloader is active.
 
 Flash the firmware using the `make` command with the `flash` parameter, example below:
 
-    make lattice60:default:flash
+    make keyhive/lattice60:default:flash
 
 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/lattice60/rules.mk b/keyboards/keyhive/lattice60/rules.mk
index 8539f9f439..8539f9f439 100644
--- a/keyboards/lattice60/rules.mk
+++ b/keyboards/keyhive/lattice60/rules.mk
diff --git a/keyboards/navi10/.noci b/keyboards/keyhive/navi10/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/navi10/.noci
+++ b/keyboards/keyhive/navi10/.noci
diff --git a/keyboards/navi10/info.json b/keyboards/keyhive/navi10/info.json
index e3fc49fbed..e3fc49fbed 100644
--- a/keyboards/navi10/info.json
+++ b/keyboards/keyhive/navi10/info.json
diff --git a/keyboards/navi10/keymaps/default/keymap.c b/keyboards/keyhive/navi10/keymaps/default/keymap.c
index d1b3127760..d1b3127760 100644
--- a/keyboards/navi10/keymaps/default/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/default/keymap.c
diff --git a/keyboards/navi10/keymaps/default/readme.md b/keyboards/keyhive/navi10/keymaps/default/readme.md
index 9e54a3f20a..9e54a3f20a 100644
--- a/keyboards/navi10/keymaps/default/readme.md
+++ b/keyboards/keyhive/navi10/keymaps/default/readme.md
diff --git a/keyboards/navi10/keymaps/default/rules.mk b/keyboards/keyhive/navi10/keymaps/default/rules.mk
index e5ddcae8d9..e5ddcae8d9 100644
--- a/keyboards/navi10/keymaps/default/rules.mk
+++ b/keyboards/keyhive/navi10/keymaps/default/rules.mk
diff --git a/keyboards/navi10/keymaps/devdev/config.h b/keyboards/keyhive/navi10/keymaps/devdev/config.h
index dba45a5f24..dba45a5f24 100644
--- a/keyboards/navi10/keymaps/devdev/config.h
+++ b/keyboards/keyhive/navi10/keymaps/devdev/config.h
diff --git a/keyboards/navi10/keymaps/devdev/keymap.c b/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
index b0d43ebc69..b0d43ebc69 100644
--- a/keyboards/navi10/keymaps/devdev/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
diff --git a/keyboards/navi10/keymaps/devdev/rules.mk b/keyboards/keyhive/navi10/keymaps/devdev/rules.mk
index 1c1ed316a0..1c1ed316a0 100644
--- a/keyboards/navi10/keymaps/devdev/rules.mk
+++ b/keyboards/keyhive/navi10/keymaps/devdev/rules.mk
diff --git a/keyboards/navi10/keymaps/emdarcher/keymap.c b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
index 40efed48d5..40efed48d5 100644
--- a/keyboards/navi10/keymaps/emdarcher/keymap.c
+++ b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
diff --git a/keyboards/navi10/keymaps/emdarcher/readme.md b/keyboards/keyhive/navi10/keymaps/emdarcher/readme.md
index b4ae6d75ff..b4ae6d75ff 100644
--- a/keyboards/navi10/keymaps/emdarcher/readme.md
+++ b/keyboards/keyhive/navi10/keymaps/emdarcher/readme.md
diff --git a/keyboards/navi10/keymaps/emdarcher/rules.mk b/keyboards/keyhive/navi10/keymaps/emdarcher/rules.mk
index e5ddcae8d9..e5ddcae8d9 100644
--- a/keyboards/navi10/keymaps/emdarcher/rules.mk
+++ b/keyboards/keyhive/navi10/keymaps/emdarcher/rules.mk
diff --git a/keyboards/navi10/readme.md b/keyboards/keyhive/navi10/readme.md
index 58a94711f2..06f54b73dd 100644
--- a/keyboards/navi10/readme.md
+++ b/keyboards/keyhive/navi10/readme.md
@@ -10,10 +10,10 @@ A simple and fun navigation cluster macropad with exposed components.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make navi10:default
+    make keyhive/navi10:default
 
 Make example for a specific revision (ex. rev2):
 
-    make navi10/rev2:default
+    make keyhive/navi10/rev2: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/navi10/rev0/.noci b/keyboards/keyhive/navi10/rev0/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/navi10/rev0/.noci
+++ b/keyboards/keyhive/navi10/rev0/.noci
diff --git a/keyboards/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
index 22a985c280..22a985c280 100644
--- a/keyboards/navi10/rev0/config.h
+++ b/keyboards/keyhive/navi10/rev0/config.h
diff --git a/keyboards/navi10/rev0/rev0.c b/keyboards/keyhive/navi10/rev0/rev0.c
index f6c1f362ca..f6c1f362ca 100644
--- a/keyboards/navi10/rev0/rev0.c
+++ b/keyboards/keyhive/navi10/rev0/rev0.c
diff --git a/keyboards/navi10/rev0/rev0.h b/keyboards/keyhive/navi10/rev0/rev0.h
index b162d14425..b162d14425 100644
--- a/keyboards/navi10/rev0/rev0.h
+++ b/keyboards/keyhive/navi10/rev0/rev0.h
diff --git a/keyboards/navi10/rev0/rules.mk b/keyboards/keyhive/navi10/rev0/rules.mk
index 52a1cbb711..52a1cbb711 100644
--- a/keyboards/navi10/rev0/rules.mk
+++ b/keyboards/keyhive/navi10/rev0/rules.mk
diff --git a/keyboards/navi10/rev2/.noci b/keyboards/keyhive/navi10/rev2/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/navi10/rev2/.noci
+++ b/keyboards/keyhive/navi10/rev2/.noci
diff --git a/keyboards/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
index 1dfb210b03..1dfb210b03 100644
--- a/keyboards/navi10/rev2/config.h
+++ b/keyboards/keyhive/navi10/rev2/config.h
diff --git a/keyboards/navi10/rev2/rev2.c b/keyboards/keyhive/navi10/rev2/rev2.c
index fed0e03897..fed0e03897 100644
--- a/keyboards/navi10/rev2/rev2.c
+++ b/keyboards/keyhive/navi10/rev2/rev2.c
diff --git a/keyboards/navi10/rev2/rev2.h b/keyboards/keyhive/navi10/rev2/rev2.h
index b162d14425..b162d14425 100644
--- a/keyboards/navi10/rev2/rev2.h
+++ b/keyboards/keyhive/navi10/rev2/rev2.h
diff --git a/keyboards/navi10/rev2/rules.mk b/keyboards/keyhive/navi10/rev2/rules.mk
index 52a1cbb711..52a1cbb711 100644
--- a/keyboards/navi10/rev2/rules.mk
+++ b/keyboards/keyhive/navi10/rev2/rules.mk
diff --git a/keyboards/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
index 205535273a..205535273a 100644
--- a/keyboards/navi10/rev3/config.h
+++ b/keyboards/keyhive/navi10/rev3/config.h
diff --git a/keyboards/navi10/rev3/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c
index 2b0355aa36..2b0355aa36 100644
--- a/keyboards/navi10/rev3/rev3.c
+++ b/keyboards/keyhive/navi10/rev3/rev3.c
diff --git a/keyboards/navi10/rev3/rev3.h b/keyboards/keyhive/navi10/rev3/rev3.h
index b162d14425..b162d14425 100644
--- a/keyboards/navi10/rev3/rev3.h
+++ b/keyboards/keyhive/navi10/rev3/rev3.h
diff --git a/keyboards/navi10/rev3/rules.mk b/keyboards/keyhive/navi10/rev3/rules.mk
index 52a1cbb711..52a1cbb711 100644
--- a/keyboards/navi10/rev3/rules.mk
+++ b/keyboards/keyhive/navi10/rev3/rules.mk
diff --git a/keyboards/keyhive/navi10/rules.mk b/keyboards/keyhive/navi10/rules.mk
new file mode 100644
index 0000000000..6ebb2d0ceb
--- /dev/null
+++ b/keyboards/keyhive/navi10/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = keyhive/navi10/rev3
diff --git a/keyboards/opus/config.h b/keyboards/keyhive/opus/config.h
index 52ed10bc5a..52ed10bc5a 100644
--- a/keyboards/opus/config.h
+++ b/keyboards/keyhive/opus/config.h
diff --git a/keyboards/opus/info.json b/keyboards/keyhive/opus/info.json
index 1b2da11367..1b2da11367 100644
--- a/keyboards/opus/info.json
+++ b/keyboards/keyhive/opus/info.json
diff --git a/keyboards/opus/keymaps/default/keymap.c b/keyboards/keyhive/opus/keymaps/default/keymap.c
index aaa1a899a2..aaa1a899a2 100644
--- a/keyboards/opus/keymaps/default/keymap.c
+++ b/keyboards/keyhive/opus/keymaps/default/keymap.c
diff --git a/keyboards/opus/keymaps/default/readme.md b/keyboards/keyhive/opus/keymaps/default/readme.md
index ba3f26edac..ba3f26edac 100644
--- a/keyboards/opus/keymaps/default/readme.md
+++ b/keyboards/keyhive/opus/keymaps/default/readme.md
diff --git a/keyboards/opus/keymaps/thefoxcodes/config.h b/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
index 824ec5bd18..824ec5bd18 100644
--- a/keyboards/opus/keymaps/thefoxcodes/config.h
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
diff --git a/keyboards/opus/keymaps/thefoxcodes/keymap.c b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
index e0adb2af32..e0adb2af32 100644
--- a/keyboards/opus/keymaps/thefoxcodes/keymap.c
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
diff --git a/keyboards/opus/keymaps/thefoxcodes/readme.md b/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
index c1d2a0b9ec..c1d2a0b9ec 100644
--- a/keyboards/opus/keymaps/thefoxcodes/readme.md
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
diff --git a/keyboards/opus/keymaps/thefoxcodes/rules.mk b/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
index 1ba2fa8fbe..1ba2fa8fbe 100644
--- a/keyboards/opus/keymaps/thefoxcodes/rules.mk
+++ b/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
diff --git a/keyboards/opus/opus.c b/keyboards/keyhive/opus/opus.c
index 5a188cf8a0..5a188cf8a0 100644
--- a/keyboards/opus/opus.c
+++ b/keyboards/keyhive/opus/opus.c
diff --git a/keyboards/opus/opus.h b/keyboards/keyhive/opus/opus.h
index ec82c5bc9a..ec82c5bc9a 100644
--- a/keyboards/opus/opus.h
+++ b/keyboards/keyhive/opus/opus.h
diff --git a/keyboards/opus/readme.md b/keyboards/keyhive/opus/readme.md
index aebe3162d4..8a1adf4d18 100644
--- a/keyboards/opus/readme.md
+++ b/keyboards/keyhive/opus/readme.md
@@ -10,6 +10,6 @@ The columns are angled to follow the natural angle of the hand.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make opus:default
+    make keyhive/opus: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/opus/rules.mk b/keyboards/keyhive/opus/rules.mk
index 515ca5621f..515ca5621f 100644
--- a/keyboards/opus/rules.mk
+++ b/keyboards/keyhive/opus/rules.mk
diff --git a/keyboards/smallice/config.h b/keyboards/keyhive/smallice/config.h
index 5ebafba42d..5ebafba42d 100644
--- a/keyboards/smallice/config.h
+++ b/keyboards/keyhive/smallice/config.h
diff --git a/keyboards/smallice/info.json b/keyboards/keyhive/smallice/info.json
index 24ce4cce22..24ce4cce22 100644
--- a/keyboards/smallice/info.json
+++ b/keyboards/keyhive/smallice/info.json
diff --git a/keyboards/smallice/keymaps/default/keymap.c b/keyboards/keyhive/smallice/keymaps/default/keymap.c
index d4a5fad42b..d4a5fad42b 100644
--- a/keyboards/smallice/keymaps/default/keymap.c
+++ b/keyboards/keyhive/smallice/keymaps/default/keymap.c
diff --git a/keyboards/smallice/keymaps/default/readme.md b/keyboards/keyhive/smallice/keymaps/default/readme.md
index e0c573662c..e0c573662c 100644
--- a/keyboards/smallice/keymaps/default/readme.md
+++ b/keyboards/keyhive/smallice/keymaps/default/readme.md
diff --git a/keyboards/smallice/keymaps/via/keymap.c b/keyboards/keyhive/smallice/keymaps/via/keymap.c
index d9f5d58d65..d9f5d58d65 100644
--- a/keyboards/smallice/keymaps/via/keymap.c
+++ b/keyboards/keyhive/smallice/keymaps/via/keymap.c
diff --git a/keyboards/smallice/keymaps/via/readme.md b/keyboards/keyhive/smallice/keymaps/via/readme.md
index af98163f94..af98163f94 100644
--- a/keyboards/smallice/keymaps/via/readme.md
+++ b/keyboards/keyhive/smallice/keymaps/via/readme.md
diff --git a/keyboards/smallice/keymaps/via/rules.mk b/keyboards/keyhive/smallice/keymaps/via/rules.mk
index 43061db1dd..43061db1dd 100644
--- a/keyboards/smallice/keymaps/via/rules.mk
+++ b/keyboards/keyhive/smallice/keymaps/via/rules.mk
diff --git a/keyboards/smallice/readme.md b/keyboards/keyhive/smallice/readme.md
index 70ac44cf74..2276b38a9e 100644
--- a/keyboards/smallice/readme.md
+++ b/keyboards/keyhive/smallice/readme.md
@@ -10,7 +10,7 @@ A 40% alice-like keyboard with an arrow cluster.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make smallice:default
+    make keyhive/smallice:default
 
 ### Flash
 
diff --git a/keyboards/smallice/rules.mk b/keyboards/keyhive/smallice/rules.mk
index 1f52c37154..1f52c37154 100644
--- a/keyboards/smallice/rules.mk
+++ b/keyboards/keyhive/smallice/rules.mk
diff --git a/keyboards/smallice/smallice.c b/keyboards/keyhive/smallice/smallice.c
index c7d65e27ab..c7d65e27ab 100644
--- a/keyboards/smallice/smallice.c
+++ b/keyboards/keyhive/smallice/smallice.c
diff --git a/keyboards/smallice/smallice.h b/keyboards/keyhive/smallice/smallice.h
index 12d4356795..12d4356795 100644
--- a/keyboards/smallice/smallice.h
+++ b/keyboards/keyhive/smallice/smallice.h
diff --git a/keyboards/southpole/config.h b/keyboards/keyhive/southpole/config.h
index 5603829c47..5603829c47 100644
--- a/keyboards/southpole/config.h
+++ b/keyboards/keyhive/southpole/config.h
diff --git a/keyboards/southpole/info.json b/keyboards/keyhive/southpole/info.json
index 9781fd35ab..9781fd35ab 100644
--- a/keyboards/southpole/info.json
+++ b/keyboards/keyhive/southpole/info.json
diff --git a/keyboards/southpole/keymaps/default/keymap.c b/keyboards/keyhive/southpole/keymaps/default/keymap.c
index 2777f00b5b..2777f00b5b 100644
--- a/keyboards/southpole/keymaps/default/keymap.c
+++ b/keyboards/keyhive/southpole/keymaps/default/keymap.c
diff --git a/keyboards/southpole/keymaps/foobeard/keymap.c b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
index ef2710d0a3..ef2710d0a3 100644
--- a/keyboards/southpole/keymaps/foobeard/keymap.c
+++ b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
diff --git a/keyboards/southpole/readme.md b/keyboards/keyhive/southpole/readme.md
index 4ea99ad349..3f0cbc3a92 100644
--- a/keyboards/southpole/readme.md
+++ b/keyboards/keyhive/southpole/readme.md
@@ -8,6 +8,6 @@ Hardware Supported: Teensy 2.0
 
 Make example for this keyboard (after setting up your build environment):
 
-    make southpole:default
+    make keyhive/southpole: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).
\ No newline at end of file
+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/southpole/rules.mk b/keyboards/keyhive/southpole/rules.mk
index 278ee36f23..278ee36f23 100644
--- a/keyboards/southpole/rules.mk
+++ b/keyboards/keyhive/southpole/rules.mk
diff --git a/keyboards/southpole/southpole.c b/keyboards/keyhive/southpole/southpole.c
index f345893fb5..f345893fb5 100644
--- a/keyboards/southpole/southpole.c
+++ b/keyboards/keyhive/southpole/southpole.c
diff --git a/keyboards/southpole/southpole.h b/keyboards/keyhive/southpole/southpole.h
index 99cf2ce7b5..99cf2ce7b5 100644
--- a/keyboards/southpole/southpole.h
+++ b/keyboards/keyhive/southpole/southpole.h
diff --git a/keyboards/uno/config.h b/keyboards/keyhive/uno/config.h
index 0128ee2d5d..0128ee2d5d 100644
--- a/keyboards/uno/config.h
+++ b/keyboards/keyhive/uno/config.h
diff --git a/keyboards/uno/info.json b/keyboards/keyhive/uno/info.json
index d426f9e426..d426f9e426 100644
--- a/keyboards/uno/info.json
+++ b/keyboards/keyhive/uno/info.json
diff --git a/keyboards/uno/keymaps/copypasta/keymap.c b/keyboards/keyhive/uno/keymaps/copypasta/keymap.c
index 74e5f62fc5..74e5f62fc5 100644
--- a/keyboards/uno/keymaps/copypasta/keymap.c
+++ b/keyboards/keyhive/uno/keymaps/copypasta/keymap.c
diff --git a/keyboards/uno/keymaps/copypasta/readme.md b/keyboards/keyhive/uno/keymaps/copypasta/readme.md
index 1ad009c16c..1ad009c16c 100644
--- a/keyboards/uno/keymaps/copypasta/readme.md
+++ b/keyboards/keyhive/uno/keymaps/copypasta/readme.md
diff --git a/keyboards/uno/keymaps/default/keymap.c b/keyboards/keyhive/uno/keymaps/default/keymap.c
index 43c885c800..43c885c800 100644
--- a/keyboards/uno/keymaps/default/keymap.c
+++ b/keyboards/keyhive/uno/keymaps/default/keymap.c
diff --git a/keyboards/uno/keymaps/default/readme.md b/keyboards/keyhive/uno/keymaps/default/readme.md
index d783a80acc..d783a80acc 100644
--- a/keyboards/uno/keymaps/default/readme.md
+++ b/keyboards/keyhive/uno/keymaps/default/readme.md
diff --git a/keyboards/uno/keymaps/demo/keymap.c b/keyboards/keyhive/uno/keymaps/demo/keymap.c
index cd3c3dadef..cd3c3dadef 100644
--- a/keyboards/uno/keymaps/demo/keymap.c
+++ b/keyboards/keyhive/uno/keymaps/demo/keymap.c
diff --git a/keyboards/uno/keymaps/demo/readme.md b/keyboards/keyhive/uno/keymaps/demo/readme.md
index ec91247861..ec91247861 100644
--- a/keyboards/uno/keymaps/demo/readme.md
+++ b/keyboards/keyhive/uno/keymaps/demo/readme.md
diff --git a/keyboards/uno/readme.md b/keyboards/keyhive/uno/readme.md
index b60ef23e97..23776115f3 100644
--- a/keyboards/uno/readme.md
+++ b/keyboards/keyhive/uno/readme.md
@@ -14,19 +14,19 @@ If it *does not* support a rotary encoder, use rev1. The following examples use
 Make example for this keyboard (after setting up your build environment; make
 sure to change `rev2` to your Uno's version):
 
-    make uno/rev2:default
+    make keyhive/uno/rev2:default
 
 Flashing example for this keyboard (change `rev2` to `rev1` if needed):
 
-    make uno/rev2:default:flash
+    make keyhive/uno/rev2:default:flash
 
 If you prefer to use the `qmk` tool:
 
-    qmk compile -kb uno/rev2 -km default
+    qmk compile -kb keyhive/uno/rev2 -km default
 
 Create your own keymap with:
 
-    qmk new-keymap -kb uno/rev2
+    qmk new-keymap -kb keyhive/uno/rev2
 
 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/uno/rev1/config.h b/keyboards/keyhive/uno/rev1/config.h
index 11c84ad2ab..11c84ad2ab 100644
--- a/keyboards/uno/rev1/config.h
+++ b/keyboards/keyhive/uno/rev1/config.h
diff --git a/keyboards/uno/rev1/rev1.h b/keyboards/keyhive/uno/rev1/rev1.h
index 691bdd1dc3..691bdd1dc3 100644
--- a/keyboards/uno/rev1/rev1.h
+++ b/keyboards/keyhive/uno/rev1/rev1.h
diff --git a/keyboards/uno/rev1/rules.mk b/keyboards/keyhive/uno/rev1/rules.mk
index 7180be7497..7180be7497 100644
--- a/keyboards/uno/rev1/rules.mk
+++ b/keyboards/keyhive/uno/rev1/rules.mk
diff --git a/keyboards/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
index 37ea08c017..37ea08c017 100644
--- a/keyboards/uno/rev2/config.h
+++ b/keyboards/keyhive/uno/rev2/config.h
diff --git a/keyboards/uno/rev2/rev2.h b/keyboards/keyhive/uno/rev2/rev2.h
index 691bdd1dc3..691bdd1dc3 100644
--- a/keyboards/uno/rev2/rev2.h
+++ b/keyboards/keyhive/uno/rev2/rev2.h
diff --git a/keyboards/uno/rev2/rules.mk b/keyboards/keyhive/uno/rev2/rules.mk
index 1ce2738442..1ce2738442 100644
--- a/keyboards/uno/rev2/rules.mk
+++ b/keyboards/keyhive/uno/rev2/rules.mk
diff --git a/keyboards/uno/rules.mk b/keyboards/keyhive/uno/rules.mk
index 367faedeaf..367faedeaf 100644
--- a/keyboards/uno/rules.mk
+++ b/keyboards/keyhive/uno/rules.mk
diff --git a/keyboards/uno/uno.c b/keyboards/keyhive/uno/uno.c
index 5ffb28865b..5ffb28865b 100644
--- a/keyboards/uno/uno.c
+++ b/keyboards/keyhive/uno/uno.c
diff --git a/keyboards/uno/uno.h b/keyboards/keyhive/uno/uno.h
index bb3248e293..bb3248e293 100644
--- a/keyboards/uno/uno.h
+++ b/keyboards/keyhive/uno/uno.h
diff --git a/keyboards/ut472/config.h b/keyboards/keyhive/ut472/config.h
index dc8f7f7555..dc8f7f7555 100644
--- a/keyboards/ut472/config.h
+++ b/keyboards/keyhive/ut472/config.h
diff --git a/keyboards/ut472/info.json b/keyboards/keyhive/ut472/info.json
index fe60c5b7f7..fe60c5b7f7 100644
--- a/keyboards/ut472/info.json
+++ b/keyboards/keyhive/ut472/info.json
diff --git a/keyboards/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
index 45569d5588..45569d5588 100755
--- a/keyboards/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
diff --git a/keyboards/ut472/keymaps/annihilator6000/config.h b/keyboards/keyhive/ut472/keymaps/annihilator6000/config.h
index 023c753c27..023c753c27 100644
--- a/keyboards/ut472/keymaps/annihilator6000/config.h
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/config.h
diff --git a/keyboards/ut472/keymaps/annihilator6000/keymap.c b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
index c4453279d2..c4453279d2 100644
--- a/keyboards/ut472/keymaps/annihilator6000/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
diff --git a/keyboards/ut472/keymaps/annihilator6000/readme.md b/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
index 59469b7b55..59469b7b55 100644
--- a/keyboards/ut472/keymaps/annihilator6000/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
diff --git a/keyboards/ut472/keymaps/default/keymap.c b/keyboards/keyhive/ut472/keymaps/default/keymap.c
index e303f2220c..e303f2220c 100644
--- a/keyboards/ut472/keymaps/default/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/default/keymap.c
diff --git a/keyboards/ut472/keymaps/default/readme.md b/keyboards/keyhive/ut472/keymaps/default/readme.md
index e3dcee467e..e3dcee467e 100644
--- a/keyboards/ut472/keymaps/default/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/default/readme.md
diff --git a/keyboards/ut472/keymaps/hvp/config.h b/keyboards/keyhive/ut472/keymaps/hvp/config.h
index ea23adfab5..ea23adfab5 100644
--- a/keyboards/ut472/keymaps/hvp/config.h
+++ b/keyboards/keyhive/ut472/keymaps/hvp/config.h
diff --git a/keyboards/ut472/keymaps/hvp/keymap.c b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
index 80d2d036bd..80d2d036bd 100644
--- a/keyboards/ut472/keymaps/hvp/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
diff --git a/keyboards/ut472/keymaps/hvp/readme.md b/keyboards/keyhive/ut472/keymaps/hvp/readme.md
index a249201ded..a249201ded 100644
--- a/keyboards/ut472/keymaps/hvp/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/hvp/readme.md
diff --git a/keyboards/ut472/keymaps/hvp/rules.mk b/keyboards/keyhive/ut472/keymaps/hvp/rules.mk
index 1ba2fa8fbe..1ba2fa8fbe 100644
--- a/keyboards/ut472/keymaps/hvp/rules.mk
+++ b/keyboards/keyhive/ut472/keymaps/hvp/rules.mk
diff --git a/keyboards/ut472/keymaps/stefanopace/config.h b/keyboards/keyhive/ut472/keymaps/stefanopace/config.h
index d16927d3c9..d16927d3c9 100644
--- a/keyboards/ut472/keymaps/stefanopace/config.h
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/config.h
diff --git a/keyboards/ut472/keymaps/stefanopace/keymap.c b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
index 7cc3b70082..7cc3b70082 100644
--- a/keyboards/ut472/keymaps/stefanopace/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
diff --git a/keyboards/ut472/keymaps/stefanopace/readme.md b/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
index 63cef0934c..63cef0934c 100644
--- a/keyboards/ut472/keymaps/stefanopace/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
diff --git a/keyboards/ut472/keymaps/stefanopace/rules.mk b/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
index d941780558..d941780558 100644
--- a/keyboards/ut472/keymaps/stefanopace/rules.mk
+++ b/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
diff --git a/keyboards/ut472/keymaps/tucznak/config.h b/keyboards/keyhive/ut472/keymaps/tucznak/config.h
index b3d402337a..b3d402337a 100644
--- a/keyboards/ut472/keymaps/tucznak/config.h
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/config.h
diff --git a/keyboards/ut472/keymaps/tucznak/keymap.c b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
index 7fbbd0e76e..7fbbd0e76e 100644
--- a/keyboards/ut472/keymaps/tucznak/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
diff --git a/keyboards/ut472/keymaps/tucznak/readme.md b/keyboards/keyhive/ut472/keymaps/tucznak/readme.md
index 95180bc392..95180bc392 100644
--- a/keyboards/ut472/keymaps/tucznak/readme.md
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/readme.md
diff --git a/keyboards/ut472/keymaps/tucznak/rules.mk b/keyboards/keyhive/ut472/keymaps/tucznak/rules.mk
index d394c719f8..d394c719f8 100644
--- a/keyboards/ut472/keymaps/tucznak/rules.mk
+++ b/keyboards/keyhive/ut472/keymaps/tucznak/rules.mk
diff --git a/keyboards/ut472/keymaps/via/keymap.c b/keyboards/keyhive/ut472/keymaps/via/keymap.c
index fe3eff802e..fe3eff802e 100644
--- a/keyboards/ut472/keymaps/via/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/via/keymap.c
diff --git a/keyboards/ut472/keymaps/via/rules.mk b/keyboards/keyhive/ut472/keymaps/via/rules.mk
index 36b7ba9cbc..36b7ba9cbc 100644
--- a/keyboards/ut472/keymaps/via/rules.mk
+++ b/keyboards/keyhive/ut472/keymaps/via/rules.mk
diff --git a/keyboards/ut472/readme.md b/keyboards/keyhive/ut472/readme.md
index 25f40d783a..b2a13b38cc 100644
--- a/keyboards/ut472/readme.md
+++ b/keyboards/keyhive/ut472/readme.md
@@ -11,7 +11,7 @@ or purchased at keyhive.xyz
 
 To create a hex file for the UT47.2, run:
 
-    make ut472:default
+    make keyhive/ut472:default
 
 ## Layout
 
diff --git a/keyboards/ut472/rules.mk b/keyboards/keyhive/ut472/rules.mk
index 9c7d75a344..9c7d75a344 100644
--- a/keyboards/ut472/rules.mk
+++ b/keyboards/keyhive/ut472/rules.mk
diff --git a/keyboards/ut472/ut472.c b/keyboards/keyhive/ut472/ut472.c
index 637922171a..637922171a 100644
--- a/keyboards/ut472/ut472.c
+++ b/keyboards/keyhive/ut472/ut472.c
diff --git a/keyboards/ut472/ut472.h b/keyboards/keyhive/ut472/ut472.h
index 391392896a..391392896a 100644
--- a/keyboards/ut472/ut472.h
+++ b/keyboards/keyhive/ut472/ut472.h
diff --git a/keyboards/navi10/rules.mk b/keyboards/navi10/rules.mk
deleted file mode 100644
index cc08312b77..0000000000
--- a/keyboards/navi10/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = navi10/rev3