From 9f63bce70bd8e065e54de17c48994c3c008d2e0a Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 19 Apr 2022 18:17:21 +0800
Subject: [PATCH] move keyhive exclusive boards into /keyhive (#16084)

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 keyboards/{ => keyhive}/absinthe/absinthe.c               | 0
 keyboards/{ => keyhive}/absinthe/absinthe.h               | 0
 keyboards/{ => keyhive}/absinthe/config.h                 | 0
 keyboards/{ => keyhive}/absinthe/info.json                | 0
 keyboards/{ => keyhive}/absinthe/keymaps/ansi/keymap.c    | 0
 keyboards/{ => keyhive}/absinthe/keymaps/ansi/readme.md   | 0
 keyboards/{ => keyhive}/absinthe/keymaps/default/keymap.c | 0
 .../{ => keyhive}/absinthe/keymaps/default/readme.md      | 0
 keyboards/{ => keyhive}/absinthe/keymaps/via/keymap.c     | 0
 keyboards/{ => keyhive}/absinthe/keymaps/via/rules.mk     | 0
 keyboards/{ => keyhive}/absinthe/readme.md                | 2 +-
 keyboards/{ => keyhive}/absinthe/rules.mk                 | 0
 keyboards/{ => keyhive}/ergosaurus/config.h               | 0
 keyboards/{ => keyhive}/ergosaurus/ergosaurus.c           | 0
 keyboards/{ => keyhive}/ergosaurus/ergosaurus.h           | 0
 keyboards/{ => keyhive}/ergosaurus/info.json              | 0
 .../{ => keyhive}/ergosaurus/keymaps/default/keymap.c     | 0
 .../{ => keyhive}/ergosaurus/keymaps/default/readme.md    | 0
 keyboards/{ => keyhive}/ergosaurus/keymaps/via/keymap.c   | 0
 keyboards/{ => keyhive}/ergosaurus/keymaps/via/rules.mk   | 0
 keyboards/{ => keyhive}/ergosaurus/readme.md              | 2 +-
 keyboards/{ => keyhive}/ergosaurus/rules.mk               | 0
 keyboards/{ => keyhive}/honeycomb/config.h                | 0
 keyboards/{ => keyhive}/honeycomb/honeycomb.c             | 0
 keyboards/{ => keyhive}/honeycomb/honeycomb.h             | 0
 keyboards/{ => keyhive}/honeycomb/info.json               | 0
 .../{ => keyhive}/honeycomb/keymaps/default/keymap.c      | 0
 keyboards/{ => keyhive}/honeycomb/matrix.c                | 0
 keyboards/{ => keyhive}/honeycomb/readme.md               | 6 +++---
 keyboards/{ => keyhive}/honeycomb/rules.mk                | 0
 keyboards/{ => keyhive}/lattice60/config.h                | 0
 keyboards/{ => keyhive}/lattice60/info.json               | 0
 .../{ => keyhive}/lattice60/keymaps/default/config.h      | 0
 .../{ => keyhive}/lattice60/keymaps/default/keymap.c      | 0
 .../{ => keyhive}/lattice60/keymaps/default/readme.md     | 0
 .../{ => keyhive}/lattice60/keymaps/default_hhkb/config.h | 0
 .../{ => keyhive}/lattice60/keymaps/default_hhkb/keymap.c | 0
 .../lattice60/keymaps/default_hhkb/readme.md              | 0
 .../{ => keyhive}/lattice60/keymaps/emdarcher/config.h    | 0
 .../{ => keyhive}/lattice60/keymaps/emdarcher/keymap.c    | 0
 .../{ => keyhive}/lattice60/keymaps/emdarcher/readme.md   | 0
 keyboards/{ => keyhive}/lattice60/lattice60.c             | 0
 keyboards/{ => keyhive}/lattice60/lattice60.h             | 0
 keyboards/{ => keyhive}/lattice60/readme.md               | 4 ++--
 keyboards/{ => keyhive}/lattice60/rules.mk                | 0
 keyboards/{ => keyhive}/navi10/.noci                      | 0
 keyboards/{ => keyhive}/navi10/info.json                  | 0
 keyboards/{ => keyhive}/navi10/keymaps/default/keymap.c   | 0
 keyboards/{ => keyhive}/navi10/keymaps/default/readme.md  | 0
 keyboards/{ => keyhive}/navi10/keymaps/default/rules.mk   | 0
 keyboards/{ => keyhive}/navi10/keymaps/devdev/config.h    | 0
 keyboards/{ => keyhive}/navi10/keymaps/devdev/keymap.c    | 0
 keyboards/{ => keyhive}/navi10/keymaps/devdev/rules.mk    | 0
 keyboards/{ => keyhive}/navi10/keymaps/emdarcher/keymap.c | 0
 .../{ => keyhive}/navi10/keymaps/emdarcher/readme.md      | 0
 keyboards/{ => keyhive}/navi10/keymaps/emdarcher/rules.mk | 0
 keyboards/{ => keyhive}/navi10/readme.md                  | 4 ++--
 keyboards/{ => keyhive}/navi10/rev0/.noci                 | 0
 keyboards/{ => keyhive}/navi10/rev0/config.h              | 0
 keyboards/{ => keyhive}/navi10/rev0/rev0.c                | 0
 keyboards/{ => keyhive}/navi10/rev0/rev0.h                | 0
 keyboards/{ => keyhive}/navi10/rev0/rules.mk              | 0
 keyboards/{ => keyhive}/navi10/rev2/.noci                 | 0
 keyboards/{ => keyhive}/navi10/rev2/config.h              | 0
 keyboards/{ => keyhive}/navi10/rev2/rev2.c                | 0
 keyboards/{ => keyhive}/navi10/rev2/rev2.h                | 0
 keyboards/{ => keyhive}/navi10/rev2/rules.mk              | 0
 keyboards/{ => keyhive}/navi10/rev3/config.h              | 0
 keyboards/{ => keyhive}/navi10/rev3/rev3.c                | 0
 keyboards/{ => keyhive}/navi10/rev3/rev3.h                | 0
 keyboards/{ => keyhive}/navi10/rev3/rules.mk              | 0
 keyboards/keyhive/navi10/rules.mk                         | 1 +
 keyboards/{ => keyhive}/opus/config.h                     | 0
 keyboards/{ => keyhive}/opus/info.json                    | 0
 keyboards/{ => keyhive}/opus/keymaps/default/keymap.c     | 0
 keyboards/{ => keyhive}/opus/keymaps/default/readme.md    | 0
 keyboards/{ => keyhive}/opus/keymaps/thefoxcodes/config.h | 0
 keyboards/{ => keyhive}/opus/keymaps/thefoxcodes/keymap.c | 0
 .../{ => keyhive}/opus/keymaps/thefoxcodes/readme.md      | 0
 keyboards/{ => keyhive}/opus/keymaps/thefoxcodes/rules.mk | 0
 keyboards/{ => keyhive}/opus/opus.c                       | 0
 keyboards/{ => keyhive}/opus/opus.h                       | 0
 keyboards/{ => keyhive}/opus/readme.md                    | 2 +-
 keyboards/{ => keyhive}/opus/rules.mk                     | 0
 keyboards/{ => keyhive}/smallice/config.h                 | 0
 keyboards/{ => keyhive}/smallice/info.json                | 0
 keyboards/{ => keyhive}/smallice/keymaps/default/keymap.c | 0
 .../{ => keyhive}/smallice/keymaps/default/readme.md      | 0
 keyboards/{ => keyhive}/smallice/keymaps/via/keymap.c     | 0
 keyboards/{ => keyhive}/smallice/keymaps/via/readme.md    | 0
 keyboards/{ => keyhive}/smallice/keymaps/via/rules.mk     | 0
 keyboards/{ => keyhive}/smallice/readme.md                | 2 +-
 keyboards/{ => keyhive}/smallice/rules.mk                 | 0
 keyboards/{ => keyhive}/smallice/smallice.c               | 0
 keyboards/{ => keyhive}/smallice/smallice.h               | 0
 keyboards/{ => keyhive}/southpole/config.h                | 0
 keyboards/{ => keyhive}/southpole/info.json               | 0
 .../{ => keyhive}/southpole/keymaps/default/keymap.c      | 0
 .../{ => keyhive}/southpole/keymaps/foobeard/keymap.c     | 0
 keyboards/{ => keyhive}/southpole/readme.md               | 4 ++--
 keyboards/{ => keyhive}/southpole/rules.mk                | 0
 keyboards/{ => keyhive}/southpole/southpole.c             | 0
 keyboards/{ => keyhive}/southpole/southpole.h             | 0
 keyboards/{ => keyhive}/uno/config.h                      | 0
 keyboards/{ => keyhive}/uno/info.json                     | 0
 keyboards/{ => keyhive}/uno/keymaps/copypasta/keymap.c    | 0
 keyboards/{ => keyhive}/uno/keymaps/copypasta/readme.md   | 0
 keyboards/{ => keyhive}/uno/keymaps/default/keymap.c      | 0
 keyboards/{ => keyhive}/uno/keymaps/default/readme.md     | 0
 keyboards/{ => keyhive}/uno/keymaps/demo/keymap.c         | 0
 keyboards/{ => keyhive}/uno/keymaps/demo/readme.md        | 0
 keyboards/{ => keyhive}/uno/readme.md                     | 8 ++++----
 keyboards/{ => keyhive}/uno/rev1/config.h                 | 0
 keyboards/{ => keyhive}/uno/rev1/rev1.h                   | 0
 keyboards/{ => keyhive}/uno/rev1/rules.mk                 | 0
 keyboards/{ => keyhive}/uno/rev2/config.h                 | 0
 keyboards/{ => keyhive}/uno/rev2/rev2.h                   | 0
 keyboards/{ => keyhive}/uno/rev2/rules.mk                 | 0
 keyboards/{ => keyhive}/uno/rules.mk                      | 0
 keyboards/{ => keyhive}/uno/uno.c                         | 0
 keyboards/{ => keyhive}/uno/uno.h                         | 0
 keyboards/{ => keyhive}/ut472/config.h                    | 0
 keyboards/{ => keyhive}/ut472/info.json                   | 0
 .../UT472_Annihilator6000_Configurator_file.json          | 0
 .../{ => keyhive}/ut472/keymaps/annihilator6000/config.h  | 0
 .../{ => keyhive}/ut472/keymaps/annihilator6000/keymap.c  | 0
 .../{ => keyhive}/ut472/keymaps/annihilator6000/readme.md | 0
 keyboards/{ => keyhive}/ut472/keymaps/default/keymap.c    | 0
 keyboards/{ => keyhive}/ut472/keymaps/default/readme.md   | 0
 keyboards/{ => keyhive}/ut472/keymaps/hvp/config.h        | 0
 keyboards/{ => keyhive}/ut472/keymaps/hvp/keymap.c        | 0
 keyboards/{ => keyhive}/ut472/keymaps/hvp/readme.md       | 0
 keyboards/{ => keyhive}/ut472/keymaps/hvp/rules.mk        | 0
 .../{ => keyhive}/ut472/keymaps/stefanopace/config.h      | 0
 .../{ => keyhive}/ut472/keymaps/stefanopace/keymap.c      | 0
 .../{ => keyhive}/ut472/keymaps/stefanopace/readme.md     | 0
 .../{ => keyhive}/ut472/keymaps/stefanopace/rules.mk      | 0
 keyboards/{ => keyhive}/ut472/keymaps/tucznak/config.h    | 0
 keyboards/{ => keyhive}/ut472/keymaps/tucznak/keymap.c    | 0
 keyboards/{ => keyhive}/ut472/keymaps/tucznak/readme.md   | 0
 keyboards/{ => keyhive}/ut472/keymaps/tucznak/rules.mk    | 0
 keyboards/{ => keyhive}/ut472/keymaps/via/keymap.c        | 0
 keyboards/{ => keyhive}/ut472/keymaps/via/rules.mk        | 0
 keyboards/{ => keyhive}/ut472/readme.md                   | 2 +-
 keyboards/{ => keyhive}/ut472/rules.mk                    | 0
 keyboards/{ => keyhive}/ut472/ut472.c                     | 0
 keyboards/{ => keyhive}/ut472/ut472.h                     | 0
 keyboards/navi10/rules.mk                                 | 1 -
 148 files changed, 19 insertions(+), 19 deletions(-)
 rename keyboards/{ => keyhive}/absinthe/absinthe.c (100%)
 rename keyboards/{ => keyhive}/absinthe/absinthe.h (100%)
 rename keyboards/{ => keyhive}/absinthe/config.h (100%)
 rename keyboards/{ => keyhive}/absinthe/info.json (100%)
 rename keyboards/{ => keyhive}/absinthe/keymaps/ansi/keymap.c (100%)
 rename keyboards/{ => keyhive}/absinthe/keymaps/ansi/readme.md (100%)
 rename keyboards/{ => keyhive}/absinthe/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/absinthe/keymaps/default/readme.md (100%)
 rename keyboards/{ => keyhive}/absinthe/keymaps/via/keymap.c (100%)
 rename keyboards/{ => keyhive}/absinthe/keymaps/via/rules.mk (100%)
 rename keyboards/{ => keyhive}/absinthe/readme.md (95%)
 rename keyboards/{ => keyhive}/absinthe/rules.mk (100%)
 rename keyboards/{ => keyhive}/ergosaurus/config.h (100%)
 rename keyboards/{ => keyhive}/ergosaurus/ergosaurus.c (100%)
 rename keyboards/{ => keyhive}/ergosaurus/ergosaurus.h (100%)
 rename keyboards/{ => keyhive}/ergosaurus/info.json (100%)
 rename keyboards/{ => keyhive}/ergosaurus/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/ergosaurus/keymaps/default/readme.md (100%)
 rename keyboards/{ => keyhive}/ergosaurus/keymaps/via/keymap.c (100%)
 rename keyboards/{ => keyhive}/ergosaurus/keymaps/via/rules.mk (100%)
 rename keyboards/{ => keyhive}/ergosaurus/readme.md (95%)
 rename keyboards/{ => keyhive}/ergosaurus/rules.mk (100%)
 rename keyboards/{ => keyhive}/honeycomb/config.h (100%)
 rename keyboards/{ => keyhive}/honeycomb/honeycomb.c (100%)
 rename keyboards/{ => keyhive}/honeycomb/honeycomb.h (100%)
 rename keyboards/{ => keyhive}/honeycomb/info.json (100%)
 rename keyboards/{ => keyhive}/honeycomb/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/honeycomb/matrix.c (100%)
 rename keyboards/{ => keyhive}/honeycomb/readme.md (89%)
 rename keyboards/{ => keyhive}/honeycomb/rules.mk (100%)
 rename keyboards/{ => keyhive}/lattice60/config.h (100%)
 rename keyboards/{ => keyhive}/lattice60/info.json (100%)
 rename keyboards/{ => keyhive}/lattice60/keymaps/default/config.h (100%)
 rename keyboards/{ => keyhive}/lattice60/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/lattice60/keymaps/default/readme.md (100%)
 rename keyboards/{ => keyhive}/lattice60/keymaps/default_hhkb/config.h (100%)
 rename keyboards/{ => keyhive}/lattice60/keymaps/default_hhkb/keymap.c (100%)
 rename keyboards/{ => keyhive}/lattice60/keymaps/default_hhkb/readme.md (100%)
 rename keyboards/{ => keyhive}/lattice60/keymaps/emdarcher/config.h (100%)
 rename keyboards/{ => keyhive}/lattice60/keymaps/emdarcher/keymap.c (100%)
 rename keyboards/{ => keyhive}/lattice60/keymaps/emdarcher/readme.md (100%)
 rename keyboards/{ => keyhive}/lattice60/lattice60.c (100%)
 rename keyboards/{ => keyhive}/lattice60/lattice60.h (100%)
 rename keyboards/{ => keyhive}/lattice60/readme.md (91%)
 rename keyboards/{ => keyhive}/lattice60/rules.mk (100%)
 rename keyboards/{ => keyhive}/navi10/.noci (100%)
 rename keyboards/{ => keyhive}/navi10/info.json (100%)
 rename keyboards/{ => keyhive}/navi10/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/navi10/keymaps/default/readme.md (100%)
 rename keyboards/{ => keyhive}/navi10/keymaps/default/rules.mk (100%)
 rename keyboards/{ => keyhive}/navi10/keymaps/devdev/config.h (100%)
 rename keyboards/{ => keyhive}/navi10/keymaps/devdev/keymap.c (100%)
 rename keyboards/{ => keyhive}/navi10/keymaps/devdev/rules.mk (100%)
 rename keyboards/{ => keyhive}/navi10/keymaps/emdarcher/keymap.c (100%)
 rename keyboards/{ => keyhive}/navi10/keymaps/emdarcher/readme.md (100%)
 rename keyboards/{ => keyhive}/navi10/keymaps/emdarcher/rules.mk (100%)
 rename keyboards/{ => keyhive}/navi10/readme.md (90%)
 rename keyboards/{ => keyhive}/navi10/rev0/.noci (100%)
 rename keyboards/{ => keyhive}/navi10/rev0/config.h (100%)
 rename keyboards/{ => keyhive}/navi10/rev0/rev0.c (100%)
 rename keyboards/{ => keyhive}/navi10/rev0/rev0.h (100%)
 rename keyboards/{ => keyhive}/navi10/rev0/rules.mk (100%)
 rename keyboards/{ => keyhive}/navi10/rev2/.noci (100%)
 rename keyboards/{ => keyhive}/navi10/rev2/config.h (100%)
 rename keyboards/{ => keyhive}/navi10/rev2/rev2.c (100%)
 rename keyboards/{ => keyhive}/navi10/rev2/rev2.h (100%)
 rename keyboards/{ => keyhive}/navi10/rev2/rules.mk (100%)
 rename keyboards/{ => keyhive}/navi10/rev3/config.h (100%)
 rename keyboards/{ => keyhive}/navi10/rev3/rev3.c (100%)
 rename keyboards/{ => keyhive}/navi10/rev3/rev3.h (100%)
 rename keyboards/{ => keyhive}/navi10/rev3/rules.mk (100%)
 create mode 100644 keyboards/keyhive/navi10/rules.mk
 rename keyboards/{ => keyhive}/opus/config.h (100%)
 rename keyboards/{ => keyhive}/opus/info.json (100%)
 rename keyboards/{ => keyhive}/opus/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/opus/keymaps/default/readme.md (100%)
 rename keyboards/{ => keyhive}/opus/keymaps/thefoxcodes/config.h (100%)
 rename keyboards/{ => keyhive}/opus/keymaps/thefoxcodes/keymap.c (100%)
 rename keyboards/{ => keyhive}/opus/keymaps/thefoxcodes/readme.md (100%)
 rename keyboards/{ => keyhive}/opus/keymaps/thefoxcodes/rules.mk (100%)
 rename keyboards/{ => keyhive}/opus/opus.c (100%)
 rename keyboards/{ => keyhive}/opus/opus.h (100%)
 rename keyboards/{ => keyhive}/opus/readme.md (95%)
 rename keyboards/{ => keyhive}/opus/rules.mk (100%)
 rename keyboards/{ => keyhive}/smallice/config.h (100%)
 rename keyboards/{ => keyhive}/smallice/info.json (100%)
 rename keyboards/{ => keyhive}/smallice/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/smallice/keymaps/default/readme.md (100%)
 rename keyboards/{ => keyhive}/smallice/keymaps/via/keymap.c (100%)
 rename keyboards/{ => keyhive}/smallice/keymaps/via/readme.md (100%)
 rename keyboards/{ => keyhive}/smallice/keymaps/via/rules.mk (100%)
 rename keyboards/{ => keyhive}/smallice/readme.md (95%)
 rename keyboards/{ => keyhive}/smallice/rules.mk (100%)
 rename keyboards/{ => keyhive}/smallice/smallice.c (100%)
 rename keyboards/{ => keyhive}/smallice/smallice.h (100%)
 rename keyboards/{ => keyhive}/southpole/config.h (100%)
 rename keyboards/{ => keyhive}/southpole/info.json (100%)
 rename keyboards/{ => keyhive}/southpole/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/southpole/keymaps/foobeard/keymap.c (100%)
 rename keyboards/{ => keyhive}/southpole/readme.md (91%)
 rename keyboards/{ => keyhive}/southpole/rules.mk (100%)
 rename keyboards/{ => keyhive}/southpole/southpole.c (100%)
 rename keyboards/{ => keyhive}/southpole/southpole.h (100%)
 rename keyboards/{ => keyhive}/uno/config.h (100%)
 rename keyboards/{ => keyhive}/uno/info.json (100%)
 rename keyboards/{ => keyhive}/uno/keymaps/copypasta/keymap.c (100%)
 rename keyboards/{ => keyhive}/uno/keymaps/copypasta/readme.md (100%)
 rename keyboards/{ => keyhive}/uno/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/uno/keymaps/default/readme.md (100%)
 rename keyboards/{ => keyhive}/uno/keymaps/demo/keymap.c (100%)
 rename keyboards/{ => keyhive}/uno/keymaps/demo/readme.md (100%)
 rename keyboards/{ => keyhive}/uno/readme.md (86%)
 rename keyboards/{ => keyhive}/uno/rev1/config.h (100%)
 rename keyboards/{ => keyhive}/uno/rev1/rev1.h (100%)
 rename keyboards/{ => keyhive}/uno/rev1/rules.mk (100%)
 rename keyboards/{ => keyhive}/uno/rev2/config.h (100%)
 rename keyboards/{ => keyhive}/uno/rev2/rev2.h (100%)
 rename keyboards/{ => keyhive}/uno/rev2/rules.mk (100%)
 rename keyboards/{ => keyhive}/uno/rules.mk (100%)
 rename keyboards/{ => keyhive}/uno/uno.c (100%)
 rename keyboards/{ => keyhive}/uno/uno.h (100%)
 rename keyboards/{ => keyhive}/ut472/config.h (100%)
 rename keyboards/{ => keyhive}/ut472/info.json (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/annihilator6000/config.h (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/annihilator6000/keymap.c (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/annihilator6000/readme.md (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/default/keymap.c (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/default/readme.md (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/hvp/config.h (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/hvp/keymap.c (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/hvp/readme.md (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/hvp/rules.mk (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/stefanopace/config.h (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/stefanopace/keymap.c (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/stefanopace/readme.md (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/stefanopace/rules.mk (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/tucznak/config.h (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/tucznak/keymap.c (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/tucznak/readme.md (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/tucznak/rules.mk (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/via/keymap.c (100%)
 rename keyboards/{ => keyhive}/ut472/keymaps/via/rules.mk (100%)
 rename keyboards/{ => keyhive}/ut472/readme.md (96%)
 rename keyboards/{ => keyhive}/ut472/rules.mk (100%)
 rename keyboards/{ => keyhive}/ut472/ut472.c (100%)
 rename keyboards/{ => keyhive}/ut472/ut472.h (100%)
 delete mode 100644 keyboards/navi10/rules.mk

diff --git a/keyboards/absinthe/absinthe.c b/keyboards/keyhive/absinthe/absinthe.c
similarity index 100%
rename from keyboards/absinthe/absinthe.c
rename to keyboards/keyhive/absinthe/absinthe.c
diff --git a/keyboards/absinthe/absinthe.h b/keyboards/keyhive/absinthe/absinthe.h
similarity index 100%
rename from keyboards/absinthe/absinthe.h
rename to keyboards/keyhive/absinthe/absinthe.h
diff --git a/keyboards/absinthe/config.h b/keyboards/keyhive/absinthe/config.h
similarity index 100%
rename from keyboards/absinthe/config.h
rename to keyboards/keyhive/absinthe/config.h
diff --git a/keyboards/absinthe/info.json b/keyboards/keyhive/absinthe/info.json
similarity index 100%
rename from keyboards/absinthe/info.json
rename to keyboards/keyhive/absinthe/info.json
diff --git a/keyboards/absinthe/keymaps/ansi/keymap.c b/keyboards/keyhive/absinthe/keymaps/ansi/keymap.c
similarity index 100%
rename from keyboards/absinthe/keymaps/ansi/keymap.c
rename to keyboards/keyhive/absinthe/keymaps/ansi/keymap.c
diff --git a/keyboards/absinthe/keymaps/ansi/readme.md b/keyboards/keyhive/absinthe/keymaps/ansi/readme.md
similarity index 100%
rename from keyboards/absinthe/keymaps/ansi/readme.md
rename to keyboards/keyhive/absinthe/keymaps/ansi/readme.md
diff --git a/keyboards/absinthe/keymaps/default/keymap.c b/keyboards/keyhive/absinthe/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/absinthe/keymaps/default/keymap.c
rename to keyboards/keyhive/absinthe/keymaps/default/keymap.c
diff --git a/keyboards/absinthe/keymaps/default/readme.md b/keyboards/keyhive/absinthe/keymaps/default/readme.md
similarity index 100%
rename from keyboards/absinthe/keymaps/default/readme.md
rename to keyboards/keyhive/absinthe/keymaps/default/readme.md
diff --git a/keyboards/absinthe/keymaps/via/keymap.c b/keyboards/keyhive/absinthe/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/absinthe/keymaps/via/keymap.c
rename to keyboards/keyhive/absinthe/keymaps/via/keymap.c
diff --git a/keyboards/absinthe/keymaps/via/rules.mk b/keyboards/keyhive/absinthe/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/absinthe/keymaps/via/rules.mk
rename to keyboards/keyhive/absinthe/keymaps/via/rules.mk
diff --git a/keyboards/absinthe/readme.md b/keyboards/keyhive/absinthe/readme.md
similarity index 95%
rename from keyboards/absinthe/readme.md
rename to 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
similarity index 100%
rename from keyboards/absinthe/rules.mk
rename to keyboards/keyhive/absinthe/rules.mk
diff --git a/keyboards/ergosaurus/config.h b/keyboards/keyhive/ergosaurus/config.h
similarity index 100%
rename from keyboards/ergosaurus/config.h
rename to keyboards/keyhive/ergosaurus/config.h
diff --git a/keyboards/ergosaurus/ergosaurus.c b/keyboards/keyhive/ergosaurus/ergosaurus.c
similarity index 100%
rename from keyboards/ergosaurus/ergosaurus.c
rename to keyboards/keyhive/ergosaurus/ergosaurus.c
diff --git a/keyboards/ergosaurus/ergosaurus.h b/keyboards/keyhive/ergosaurus/ergosaurus.h
similarity index 100%
rename from keyboards/ergosaurus/ergosaurus.h
rename to keyboards/keyhive/ergosaurus/ergosaurus.h
diff --git a/keyboards/ergosaurus/info.json b/keyboards/keyhive/ergosaurus/info.json
similarity index 100%
rename from keyboards/ergosaurus/info.json
rename to keyboards/keyhive/ergosaurus/info.json
diff --git a/keyboards/ergosaurus/keymaps/default/keymap.c b/keyboards/keyhive/ergosaurus/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergosaurus/keymaps/default/keymap.c
rename to keyboards/keyhive/ergosaurus/keymaps/default/keymap.c
diff --git a/keyboards/ergosaurus/keymaps/default/readme.md b/keyboards/keyhive/ergosaurus/keymaps/default/readme.md
similarity index 100%
rename from keyboards/ergosaurus/keymaps/default/readme.md
rename to keyboards/keyhive/ergosaurus/keymaps/default/readme.md
diff --git a/keyboards/ergosaurus/keymaps/via/keymap.c b/keyboards/keyhive/ergosaurus/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ergosaurus/keymaps/via/keymap.c
rename to keyboards/keyhive/ergosaurus/keymaps/via/keymap.c
diff --git a/keyboards/ergosaurus/keymaps/via/rules.mk b/keyboards/keyhive/ergosaurus/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ergosaurus/keymaps/via/rules.mk
rename to keyboards/keyhive/ergosaurus/keymaps/via/rules.mk
diff --git a/keyboards/ergosaurus/readme.md b/keyboards/keyhive/ergosaurus/readme.md
similarity index 95%
rename from keyboards/ergosaurus/readme.md
rename to 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
similarity index 100%
rename from keyboards/ergosaurus/rules.mk
rename to keyboards/keyhive/ergosaurus/rules.mk
diff --git a/keyboards/honeycomb/config.h b/keyboards/keyhive/honeycomb/config.h
similarity index 100%
rename from keyboards/honeycomb/config.h
rename to keyboards/keyhive/honeycomb/config.h
diff --git a/keyboards/honeycomb/honeycomb.c b/keyboards/keyhive/honeycomb/honeycomb.c
similarity index 100%
rename from keyboards/honeycomb/honeycomb.c
rename to keyboards/keyhive/honeycomb/honeycomb.c
diff --git a/keyboards/honeycomb/honeycomb.h b/keyboards/keyhive/honeycomb/honeycomb.h
similarity index 100%
rename from keyboards/honeycomb/honeycomb.h
rename to keyboards/keyhive/honeycomb/honeycomb.h
diff --git a/keyboards/honeycomb/info.json b/keyboards/keyhive/honeycomb/info.json
similarity index 100%
rename from keyboards/honeycomb/info.json
rename to keyboards/keyhive/honeycomb/info.json
diff --git a/keyboards/honeycomb/keymaps/default/keymap.c b/keyboards/keyhive/honeycomb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/honeycomb/keymaps/default/keymap.c
rename to keyboards/keyhive/honeycomb/keymaps/default/keymap.c
diff --git a/keyboards/honeycomb/matrix.c b/keyboards/keyhive/honeycomb/matrix.c
similarity index 100%
rename from keyboards/honeycomb/matrix.c
rename to keyboards/keyhive/honeycomb/matrix.c
diff --git a/keyboards/honeycomb/readme.md b/keyboards/keyhive/honeycomb/readme.md
similarity index 89%
rename from keyboards/honeycomb/readme.md
rename to 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
similarity index 100%
rename from keyboards/honeycomb/rules.mk
rename to keyboards/keyhive/honeycomb/rules.mk
diff --git a/keyboards/lattice60/config.h b/keyboards/keyhive/lattice60/config.h
similarity index 100%
rename from keyboards/lattice60/config.h
rename to keyboards/keyhive/lattice60/config.h
diff --git a/keyboards/lattice60/info.json b/keyboards/keyhive/lattice60/info.json
similarity index 100%
rename from keyboards/lattice60/info.json
rename to keyboards/keyhive/lattice60/info.json
diff --git a/keyboards/lattice60/keymaps/default/config.h b/keyboards/keyhive/lattice60/keymaps/default/config.h
similarity index 100%
rename from keyboards/lattice60/keymaps/default/config.h
rename to keyboards/keyhive/lattice60/keymaps/default/config.h
diff --git a/keyboards/lattice60/keymaps/default/keymap.c b/keyboards/keyhive/lattice60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lattice60/keymaps/default/keymap.c
rename to keyboards/keyhive/lattice60/keymaps/default/keymap.c
diff --git a/keyboards/lattice60/keymaps/default/readme.md b/keyboards/keyhive/lattice60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/lattice60/keymaps/default/readme.md
rename to 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
similarity index 100%
rename from keyboards/lattice60/keymaps/default_hhkb/config.h
rename to 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
similarity index 100%
rename from keyboards/lattice60/keymaps/default_hhkb/keymap.c
rename to 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
similarity index 100%
rename from keyboards/lattice60/keymaps/default_hhkb/readme.md
rename to 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
similarity index 100%
rename from keyboards/lattice60/keymaps/emdarcher/config.h
rename to keyboards/keyhive/lattice60/keymaps/emdarcher/config.h
diff --git a/keyboards/lattice60/keymaps/emdarcher/keymap.c b/keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
similarity index 100%
rename from keyboards/lattice60/keymaps/emdarcher/keymap.c
rename to keyboards/keyhive/lattice60/keymaps/emdarcher/keymap.c
diff --git a/keyboards/lattice60/keymaps/emdarcher/readme.md b/keyboards/keyhive/lattice60/keymaps/emdarcher/readme.md
similarity index 100%
rename from keyboards/lattice60/keymaps/emdarcher/readme.md
rename to keyboards/keyhive/lattice60/keymaps/emdarcher/readme.md
diff --git a/keyboards/lattice60/lattice60.c b/keyboards/keyhive/lattice60/lattice60.c
similarity index 100%
rename from keyboards/lattice60/lattice60.c
rename to keyboards/keyhive/lattice60/lattice60.c
diff --git a/keyboards/lattice60/lattice60.h b/keyboards/keyhive/lattice60/lattice60.h
similarity index 100%
rename from keyboards/lattice60/lattice60.h
rename to keyboards/keyhive/lattice60/lattice60.h
diff --git a/keyboards/lattice60/readme.md b/keyboards/keyhive/lattice60/readme.md
similarity index 91%
rename from keyboards/lattice60/readme.md
rename to 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
similarity index 100%
rename from keyboards/lattice60/rules.mk
rename to keyboards/keyhive/lattice60/rules.mk
diff --git a/keyboards/navi10/.noci b/keyboards/keyhive/navi10/.noci
similarity index 100%
rename from keyboards/navi10/.noci
rename to keyboards/keyhive/navi10/.noci
diff --git a/keyboards/navi10/info.json b/keyboards/keyhive/navi10/info.json
similarity index 100%
rename from keyboards/navi10/info.json
rename to keyboards/keyhive/navi10/info.json
diff --git a/keyboards/navi10/keymaps/default/keymap.c b/keyboards/keyhive/navi10/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/navi10/keymaps/default/keymap.c
rename to keyboards/keyhive/navi10/keymaps/default/keymap.c
diff --git a/keyboards/navi10/keymaps/default/readme.md b/keyboards/keyhive/navi10/keymaps/default/readme.md
similarity index 100%
rename from keyboards/navi10/keymaps/default/readme.md
rename to keyboards/keyhive/navi10/keymaps/default/readme.md
diff --git a/keyboards/navi10/keymaps/default/rules.mk b/keyboards/keyhive/navi10/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/navi10/keymaps/default/rules.mk
rename to keyboards/keyhive/navi10/keymaps/default/rules.mk
diff --git a/keyboards/navi10/keymaps/devdev/config.h b/keyboards/keyhive/navi10/keymaps/devdev/config.h
similarity index 100%
rename from keyboards/navi10/keymaps/devdev/config.h
rename to keyboards/keyhive/navi10/keymaps/devdev/config.h
diff --git a/keyboards/navi10/keymaps/devdev/keymap.c b/keyboards/keyhive/navi10/keymaps/devdev/keymap.c
similarity index 100%
rename from keyboards/navi10/keymaps/devdev/keymap.c
rename to keyboards/keyhive/navi10/keymaps/devdev/keymap.c
diff --git a/keyboards/navi10/keymaps/devdev/rules.mk b/keyboards/keyhive/navi10/keymaps/devdev/rules.mk
similarity index 100%
rename from keyboards/navi10/keymaps/devdev/rules.mk
rename to keyboards/keyhive/navi10/keymaps/devdev/rules.mk
diff --git a/keyboards/navi10/keymaps/emdarcher/keymap.c b/keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
similarity index 100%
rename from keyboards/navi10/keymaps/emdarcher/keymap.c
rename to keyboards/keyhive/navi10/keymaps/emdarcher/keymap.c
diff --git a/keyboards/navi10/keymaps/emdarcher/readme.md b/keyboards/keyhive/navi10/keymaps/emdarcher/readme.md
similarity index 100%
rename from keyboards/navi10/keymaps/emdarcher/readme.md
rename to keyboards/keyhive/navi10/keymaps/emdarcher/readme.md
diff --git a/keyboards/navi10/keymaps/emdarcher/rules.mk b/keyboards/keyhive/navi10/keymaps/emdarcher/rules.mk
similarity index 100%
rename from keyboards/navi10/keymaps/emdarcher/rules.mk
rename to keyboards/keyhive/navi10/keymaps/emdarcher/rules.mk
diff --git a/keyboards/navi10/readme.md b/keyboards/keyhive/navi10/readme.md
similarity index 90%
rename from keyboards/navi10/readme.md
rename to 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
similarity index 100%
rename from keyboards/navi10/rev0/.noci
rename to keyboards/keyhive/navi10/rev0/.noci
diff --git a/keyboards/navi10/rev0/config.h b/keyboards/keyhive/navi10/rev0/config.h
similarity index 100%
rename from keyboards/navi10/rev0/config.h
rename to keyboards/keyhive/navi10/rev0/config.h
diff --git a/keyboards/navi10/rev0/rev0.c b/keyboards/keyhive/navi10/rev0/rev0.c
similarity index 100%
rename from keyboards/navi10/rev0/rev0.c
rename to keyboards/keyhive/navi10/rev0/rev0.c
diff --git a/keyboards/navi10/rev0/rev0.h b/keyboards/keyhive/navi10/rev0/rev0.h
similarity index 100%
rename from keyboards/navi10/rev0/rev0.h
rename to keyboards/keyhive/navi10/rev0/rev0.h
diff --git a/keyboards/navi10/rev0/rules.mk b/keyboards/keyhive/navi10/rev0/rules.mk
similarity index 100%
rename from keyboards/navi10/rev0/rules.mk
rename to keyboards/keyhive/navi10/rev0/rules.mk
diff --git a/keyboards/navi10/rev2/.noci b/keyboards/keyhive/navi10/rev2/.noci
similarity index 100%
rename from keyboards/navi10/rev2/.noci
rename to keyboards/keyhive/navi10/rev2/.noci
diff --git a/keyboards/navi10/rev2/config.h b/keyboards/keyhive/navi10/rev2/config.h
similarity index 100%
rename from keyboards/navi10/rev2/config.h
rename to keyboards/keyhive/navi10/rev2/config.h
diff --git a/keyboards/navi10/rev2/rev2.c b/keyboards/keyhive/navi10/rev2/rev2.c
similarity index 100%
rename from keyboards/navi10/rev2/rev2.c
rename to keyboards/keyhive/navi10/rev2/rev2.c
diff --git a/keyboards/navi10/rev2/rev2.h b/keyboards/keyhive/navi10/rev2/rev2.h
similarity index 100%
rename from keyboards/navi10/rev2/rev2.h
rename to keyboards/keyhive/navi10/rev2/rev2.h
diff --git a/keyboards/navi10/rev2/rules.mk b/keyboards/keyhive/navi10/rev2/rules.mk
similarity index 100%
rename from keyboards/navi10/rev2/rules.mk
rename to keyboards/keyhive/navi10/rev2/rules.mk
diff --git a/keyboards/navi10/rev3/config.h b/keyboards/keyhive/navi10/rev3/config.h
similarity index 100%
rename from keyboards/navi10/rev3/config.h
rename to keyboards/keyhive/navi10/rev3/config.h
diff --git a/keyboards/navi10/rev3/rev3.c b/keyboards/keyhive/navi10/rev3/rev3.c
similarity index 100%
rename from keyboards/navi10/rev3/rev3.c
rename to keyboards/keyhive/navi10/rev3/rev3.c
diff --git a/keyboards/navi10/rev3/rev3.h b/keyboards/keyhive/navi10/rev3/rev3.h
similarity index 100%
rename from keyboards/navi10/rev3/rev3.h
rename to keyboards/keyhive/navi10/rev3/rev3.h
diff --git a/keyboards/navi10/rev3/rules.mk b/keyboards/keyhive/navi10/rev3/rules.mk
similarity index 100%
rename from keyboards/navi10/rev3/rules.mk
rename to 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
similarity index 100%
rename from keyboards/opus/config.h
rename to keyboards/keyhive/opus/config.h
diff --git a/keyboards/opus/info.json b/keyboards/keyhive/opus/info.json
similarity index 100%
rename from keyboards/opus/info.json
rename to keyboards/keyhive/opus/info.json
diff --git a/keyboards/opus/keymaps/default/keymap.c b/keyboards/keyhive/opus/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/opus/keymaps/default/keymap.c
rename to keyboards/keyhive/opus/keymaps/default/keymap.c
diff --git a/keyboards/opus/keymaps/default/readme.md b/keyboards/keyhive/opus/keymaps/default/readme.md
similarity index 100%
rename from keyboards/opus/keymaps/default/readme.md
rename to keyboards/keyhive/opus/keymaps/default/readme.md
diff --git a/keyboards/opus/keymaps/thefoxcodes/config.h b/keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
similarity index 100%
rename from keyboards/opus/keymaps/thefoxcodes/config.h
rename to keyboards/keyhive/opus/keymaps/thefoxcodes/config.h
diff --git a/keyboards/opus/keymaps/thefoxcodes/keymap.c b/keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
similarity index 100%
rename from keyboards/opus/keymaps/thefoxcodes/keymap.c
rename to keyboards/keyhive/opus/keymaps/thefoxcodes/keymap.c
diff --git a/keyboards/opus/keymaps/thefoxcodes/readme.md b/keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
similarity index 100%
rename from keyboards/opus/keymaps/thefoxcodes/readme.md
rename to keyboards/keyhive/opus/keymaps/thefoxcodes/readme.md
diff --git a/keyboards/opus/keymaps/thefoxcodes/rules.mk b/keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
similarity index 100%
rename from keyboards/opus/keymaps/thefoxcodes/rules.mk
rename to keyboards/keyhive/opus/keymaps/thefoxcodes/rules.mk
diff --git a/keyboards/opus/opus.c b/keyboards/keyhive/opus/opus.c
similarity index 100%
rename from keyboards/opus/opus.c
rename to keyboards/keyhive/opus/opus.c
diff --git a/keyboards/opus/opus.h b/keyboards/keyhive/opus/opus.h
similarity index 100%
rename from keyboards/opus/opus.h
rename to keyboards/keyhive/opus/opus.h
diff --git a/keyboards/opus/readme.md b/keyboards/keyhive/opus/readme.md
similarity index 95%
rename from keyboards/opus/readme.md
rename to 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
similarity index 100%
rename from keyboards/opus/rules.mk
rename to keyboards/keyhive/opus/rules.mk
diff --git a/keyboards/smallice/config.h b/keyboards/keyhive/smallice/config.h
similarity index 100%
rename from keyboards/smallice/config.h
rename to keyboards/keyhive/smallice/config.h
diff --git a/keyboards/smallice/info.json b/keyboards/keyhive/smallice/info.json
similarity index 100%
rename from keyboards/smallice/info.json
rename to keyboards/keyhive/smallice/info.json
diff --git a/keyboards/smallice/keymaps/default/keymap.c b/keyboards/keyhive/smallice/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/smallice/keymaps/default/keymap.c
rename to keyboards/keyhive/smallice/keymaps/default/keymap.c
diff --git a/keyboards/smallice/keymaps/default/readme.md b/keyboards/keyhive/smallice/keymaps/default/readme.md
similarity index 100%
rename from keyboards/smallice/keymaps/default/readme.md
rename to keyboards/keyhive/smallice/keymaps/default/readme.md
diff --git a/keyboards/smallice/keymaps/via/keymap.c b/keyboards/keyhive/smallice/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/smallice/keymaps/via/keymap.c
rename to keyboards/keyhive/smallice/keymaps/via/keymap.c
diff --git a/keyboards/smallice/keymaps/via/readme.md b/keyboards/keyhive/smallice/keymaps/via/readme.md
similarity index 100%
rename from keyboards/smallice/keymaps/via/readme.md
rename to keyboards/keyhive/smallice/keymaps/via/readme.md
diff --git a/keyboards/smallice/keymaps/via/rules.mk b/keyboards/keyhive/smallice/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/smallice/keymaps/via/rules.mk
rename to keyboards/keyhive/smallice/keymaps/via/rules.mk
diff --git a/keyboards/smallice/readme.md b/keyboards/keyhive/smallice/readme.md
similarity index 95%
rename from keyboards/smallice/readme.md
rename to 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
similarity index 100%
rename from keyboards/smallice/rules.mk
rename to keyboards/keyhive/smallice/rules.mk
diff --git a/keyboards/smallice/smallice.c b/keyboards/keyhive/smallice/smallice.c
similarity index 100%
rename from keyboards/smallice/smallice.c
rename to keyboards/keyhive/smallice/smallice.c
diff --git a/keyboards/smallice/smallice.h b/keyboards/keyhive/smallice/smallice.h
similarity index 100%
rename from keyboards/smallice/smallice.h
rename to keyboards/keyhive/smallice/smallice.h
diff --git a/keyboards/southpole/config.h b/keyboards/keyhive/southpole/config.h
similarity index 100%
rename from keyboards/southpole/config.h
rename to keyboards/keyhive/southpole/config.h
diff --git a/keyboards/southpole/info.json b/keyboards/keyhive/southpole/info.json
similarity index 100%
rename from keyboards/southpole/info.json
rename to keyboards/keyhive/southpole/info.json
diff --git a/keyboards/southpole/keymaps/default/keymap.c b/keyboards/keyhive/southpole/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/southpole/keymaps/default/keymap.c
rename to keyboards/keyhive/southpole/keymaps/default/keymap.c
diff --git a/keyboards/southpole/keymaps/foobeard/keymap.c b/keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
similarity index 100%
rename from keyboards/southpole/keymaps/foobeard/keymap.c
rename to keyboards/keyhive/southpole/keymaps/foobeard/keymap.c
diff --git a/keyboards/southpole/readme.md b/keyboards/keyhive/southpole/readme.md
similarity index 91%
rename from keyboards/southpole/readme.md
rename to 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
similarity index 100%
rename from keyboards/southpole/rules.mk
rename to keyboards/keyhive/southpole/rules.mk
diff --git a/keyboards/southpole/southpole.c b/keyboards/keyhive/southpole/southpole.c
similarity index 100%
rename from keyboards/southpole/southpole.c
rename to keyboards/keyhive/southpole/southpole.c
diff --git a/keyboards/southpole/southpole.h b/keyboards/keyhive/southpole/southpole.h
similarity index 100%
rename from keyboards/southpole/southpole.h
rename to keyboards/keyhive/southpole/southpole.h
diff --git a/keyboards/uno/config.h b/keyboards/keyhive/uno/config.h
similarity index 100%
rename from keyboards/uno/config.h
rename to keyboards/keyhive/uno/config.h
diff --git a/keyboards/uno/info.json b/keyboards/keyhive/uno/info.json
similarity index 100%
rename from keyboards/uno/info.json
rename to keyboards/keyhive/uno/info.json
diff --git a/keyboards/uno/keymaps/copypasta/keymap.c b/keyboards/keyhive/uno/keymaps/copypasta/keymap.c
similarity index 100%
rename from keyboards/uno/keymaps/copypasta/keymap.c
rename to keyboards/keyhive/uno/keymaps/copypasta/keymap.c
diff --git a/keyboards/uno/keymaps/copypasta/readme.md b/keyboards/keyhive/uno/keymaps/copypasta/readme.md
similarity index 100%
rename from keyboards/uno/keymaps/copypasta/readme.md
rename to keyboards/keyhive/uno/keymaps/copypasta/readme.md
diff --git a/keyboards/uno/keymaps/default/keymap.c b/keyboards/keyhive/uno/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/uno/keymaps/default/keymap.c
rename to keyboards/keyhive/uno/keymaps/default/keymap.c
diff --git a/keyboards/uno/keymaps/default/readme.md b/keyboards/keyhive/uno/keymaps/default/readme.md
similarity index 100%
rename from keyboards/uno/keymaps/default/readme.md
rename to keyboards/keyhive/uno/keymaps/default/readme.md
diff --git a/keyboards/uno/keymaps/demo/keymap.c b/keyboards/keyhive/uno/keymaps/demo/keymap.c
similarity index 100%
rename from keyboards/uno/keymaps/demo/keymap.c
rename to keyboards/keyhive/uno/keymaps/demo/keymap.c
diff --git a/keyboards/uno/keymaps/demo/readme.md b/keyboards/keyhive/uno/keymaps/demo/readme.md
similarity index 100%
rename from keyboards/uno/keymaps/demo/readme.md
rename to keyboards/keyhive/uno/keymaps/demo/readme.md
diff --git a/keyboards/uno/readme.md b/keyboards/keyhive/uno/readme.md
similarity index 86%
rename from keyboards/uno/readme.md
rename to 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
similarity index 100%
rename from keyboards/uno/rev1/config.h
rename to keyboards/keyhive/uno/rev1/config.h
diff --git a/keyboards/uno/rev1/rev1.h b/keyboards/keyhive/uno/rev1/rev1.h
similarity index 100%
rename from keyboards/uno/rev1/rev1.h
rename to keyboards/keyhive/uno/rev1/rev1.h
diff --git a/keyboards/uno/rev1/rules.mk b/keyboards/keyhive/uno/rev1/rules.mk
similarity index 100%
rename from keyboards/uno/rev1/rules.mk
rename to keyboards/keyhive/uno/rev1/rules.mk
diff --git a/keyboards/uno/rev2/config.h b/keyboards/keyhive/uno/rev2/config.h
similarity index 100%
rename from keyboards/uno/rev2/config.h
rename to keyboards/keyhive/uno/rev2/config.h
diff --git a/keyboards/uno/rev2/rev2.h b/keyboards/keyhive/uno/rev2/rev2.h
similarity index 100%
rename from keyboards/uno/rev2/rev2.h
rename to keyboards/keyhive/uno/rev2/rev2.h
diff --git a/keyboards/uno/rev2/rules.mk b/keyboards/keyhive/uno/rev2/rules.mk
similarity index 100%
rename from keyboards/uno/rev2/rules.mk
rename to keyboards/keyhive/uno/rev2/rules.mk
diff --git a/keyboards/uno/rules.mk b/keyboards/keyhive/uno/rules.mk
similarity index 100%
rename from keyboards/uno/rules.mk
rename to keyboards/keyhive/uno/rules.mk
diff --git a/keyboards/uno/uno.c b/keyboards/keyhive/uno/uno.c
similarity index 100%
rename from keyboards/uno/uno.c
rename to keyboards/keyhive/uno/uno.c
diff --git a/keyboards/uno/uno.h b/keyboards/keyhive/uno/uno.h
similarity index 100%
rename from keyboards/uno/uno.h
rename to keyboards/keyhive/uno/uno.h
diff --git a/keyboards/ut472/config.h b/keyboards/keyhive/ut472/config.h
similarity index 100%
rename from keyboards/ut472/config.h
rename to keyboards/keyhive/ut472/config.h
diff --git a/keyboards/ut472/info.json b/keyboards/keyhive/ut472/info.json
similarity index 100%
rename from keyboards/ut472/info.json
rename to 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
similarity index 100%
rename from keyboards/ut472/keymaps/annihilator6000/UT472_Annihilator6000_Configurator_file.json
rename to 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
similarity index 100%
rename from keyboards/ut472/keymaps/annihilator6000/config.h
rename to keyboards/keyhive/ut472/keymaps/annihilator6000/config.h
diff --git a/keyboards/ut472/keymaps/annihilator6000/keymap.c b/keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
similarity index 100%
rename from keyboards/ut472/keymaps/annihilator6000/keymap.c
rename to keyboards/keyhive/ut472/keymaps/annihilator6000/keymap.c
diff --git a/keyboards/ut472/keymaps/annihilator6000/readme.md b/keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
similarity index 100%
rename from keyboards/ut472/keymaps/annihilator6000/readme.md
rename to keyboards/keyhive/ut472/keymaps/annihilator6000/readme.md
diff --git a/keyboards/ut472/keymaps/default/keymap.c b/keyboards/keyhive/ut472/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ut472/keymaps/default/keymap.c
rename to keyboards/keyhive/ut472/keymaps/default/keymap.c
diff --git a/keyboards/ut472/keymaps/default/readme.md b/keyboards/keyhive/ut472/keymaps/default/readme.md
similarity index 100%
rename from keyboards/ut472/keymaps/default/readme.md
rename to keyboards/keyhive/ut472/keymaps/default/readme.md
diff --git a/keyboards/ut472/keymaps/hvp/config.h b/keyboards/keyhive/ut472/keymaps/hvp/config.h
similarity index 100%
rename from keyboards/ut472/keymaps/hvp/config.h
rename to keyboards/keyhive/ut472/keymaps/hvp/config.h
diff --git a/keyboards/ut472/keymaps/hvp/keymap.c b/keyboards/keyhive/ut472/keymaps/hvp/keymap.c
similarity index 100%
rename from keyboards/ut472/keymaps/hvp/keymap.c
rename to keyboards/keyhive/ut472/keymaps/hvp/keymap.c
diff --git a/keyboards/ut472/keymaps/hvp/readme.md b/keyboards/keyhive/ut472/keymaps/hvp/readme.md
similarity index 100%
rename from keyboards/ut472/keymaps/hvp/readme.md
rename to keyboards/keyhive/ut472/keymaps/hvp/readme.md
diff --git a/keyboards/ut472/keymaps/hvp/rules.mk b/keyboards/keyhive/ut472/keymaps/hvp/rules.mk
similarity index 100%
rename from keyboards/ut472/keymaps/hvp/rules.mk
rename to keyboards/keyhive/ut472/keymaps/hvp/rules.mk
diff --git a/keyboards/ut472/keymaps/stefanopace/config.h b/keyboards/keyhive/ut472/keymaps/stefanopace/config.h
similarity index 100%
rename from keyboards/ut472/keymaps/stefanopace/config.h
rename to keyboards/keyhive/ut472/keymaps/stefanopace/config.h
diff --git a/keyboards/ut472/keymaps/stefanopace/keymap.c b/keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
similarity index 100%
rename from keyboards/ut472/keymaps/stefanopace/keymap.c
rename to keyboards/keyhive/ut472/keymaps/stefanopace/keymap.c
diff --git a/keyboards/ut472/keymaps/stefanopace/readme.md b/keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
similarity index 100%
rename from keyboards/ut472/keymaps/stefanopace/readme.md
rename to keyboards/keyhive/ut472/keymaps/stefanopace/readme.md
diff --git a/keyboards/ut472/keymaps/stefanopace/rules.mk b/keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
similarity index 100%
rename from keyboards/ut472/keymaps/stefanopace/rules.mk
rename to keyboards/keyhive/ut472/keymaps/stefanopace/rules.mk
diff --git a/keyboards/ut472/keymaps/tucznak/config.h b/keyboards/keyhive/ut472/keymaps/tucznak/config.h
similarity index 100%
rename from keyboards/ut472/keymaps/tucznak/config.h
rename to keyboards/keyhive/ut472/keymaps/tucznak/config.h
diff --git a/keyboards/ut472/keymaps/tucznak/keymap.c b/keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
similarity index 100%
rename from keyboards/ut472/keymaps/tucznak/keymap.c
rename to keyboards/keyhive/ut472/keymaps/tucznak/keymap.c
diff --git a/keyboards/ut472/keymaps/tucznak/readme.md b/keyboards/keyhive/ut472/keymaps/tucznak/readme.md
similarity index 100%
rename from keyboards/ut472/keymaps/tucznak/readme.md
rename to keyboards/keyhive/ut472/keymaps/tucznak/readme.md
diff --git a/keyboards/ut472/keymaps/tucznak/rules.mk b/keyboards/keyhive/ut472/keymaps/tucznak/rules.mk
similarity index 100%
rename from keyboards/ut472/keymaps/tucznak/rules.mk
rename to keyboards/keyhive/ut472/keymaps/tucznak/rules.mk
diff --git a/keyboards/ut472/keymaps/via/keymap.c b/keyboards/keyhive/ut472/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ut472/keymaps/via/keymap.c
rename to keyboards/keyhive/ut472/keymaps/via/keymap.c
diff --git a/keyboards/ut472/keymaps/via/rules.mk b/keyboards/keyhive/ut472/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ut472/keymaps/via/rules.mk
rename to keyboards/keyhive/ut472/keymaps/via/rules.mk
diff --git a/keyboards/ut472/readme.md b/keyboards/keyhive/ut472/readme.md
similarity index 96%
rename from keyboards/ut472/readme.md
rename to 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
similarity index 100%
rename from keyboards/ut472/rules.mk
rename to keyboards/keyhive/ut472/rules.mk
diff --git a/keyboards/ut472/ut472.c b/keyboards/keyhive/ut472/ut472.c
similarity index 100%
rename from keyboards/ut472/ut472.c
rename to keyboards/keyhive/ut472/ut472.c
diff --git a/keyboards/ut472/ut472.h b/keyboards/keyhive/ut472/ut472.h
similarity index 100%
rename from keyboards/ut472/ut472.h
rename to 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