diff --git a/keyboards/nk1/config.h b/keyboards/novelkeys/nk1/config.h
similarity index 100%
rename from keyboards/nk1/config.h
rename to keyboards/novelkeys/nk1/config.h
diff --git a/keyboards/nk1/info.json b/keyboards/novelkeys/nk1/info.json
similarity index 100%
rename from keyboards/nk1/info.json
rename to keyboards/novelkeys/nk1/info.json
diff --git a/keyboards/nk1/keymaps/default/keymap.c b/keyboards/novelkeys/nk1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nk1/keymaps/default/keymap.c
rename to keyboards/novelkeys/nk1/keymaps/default/keymap.c
diff --git a/keyboards/nk1/keymaps/default/readme.md b/keyboards/novelkeys/nk1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nk1/keymaps/default/readme.md
rename to keyboards/novelkeys/nk1/keymaps/default/readme.md
diff --git a/keyboards/nk1/keymaps/via/keymap.c b/keyboards/novelkeys/nk1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nk1/keymaps/via/keymap.c
rename to keyboards/novelkeys/nk1/keymaps/via/keymap.c
diff --git a/keyboards/nk1/keymaps/via/readme.md b/keyboards/novelkeys/nk1/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nk1/keymaps/via/readme.md
rename to keyboards/novelkeys/nk1/keymaps/via/readme.md
diff --git a/keyboards/nk1/keymaps/via/rules.mk b/keyboards/novelkeys/nk1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nk1/keymaps/via/rules.mk
rename to keyboards/novelkeys/nk1/keymaps/via/rules.mk
diff --git a/keyboards/nk1/nk1.c b/keyboards/novelkeys/nk1/nk1.c
similarity index 100%
rename from keyboards/nk1/nk1.c
rename to keyboards/novelkeys/nk1/nk1.c
diff --git a/keyboards/nk1/nk1.h b/keyboards/novelkeys/nk1/nk1.h
similarity index 100%
rename from keyboards/nk1/nk1.h
rename to keyboards/novelkeys/nk1/nk1.h
diff --git a/keyboards/nk1/readme.md b/keyboards/novelkeys/nk1/readme.md
similarity index 96%
rename from keyboards/nk1/readme.md
rename to keyboards/novelkeys/nk1/readme.md
index bc668481b5..720d03adbc 100644
--- a/keyboards/nk1/readme.md
+++ b/keyboards/novelkeys/nk1/readme.md
@@ -12,7 +12,7 @@ A big switch keypad!
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nk1:default
+    make novelkeys/nk1: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/nk1/rules.mk b/keyboards/novelkeys/nk1/rules.mk
similarity index 100%
rename from keyboards/nk1/rules.mk
rename to keyboards/novelkeys/nk1/rules.mk
diff --git a/keyboards/nk65/config.h b/keyboards/novelkeys/nk65/config.h
similarity index 100%
rename from keyboards/nk65/config.h
rename to keyboards/novelkeys/nk65/config.h
diff --git a/keyboards/nk65/halconf.h b/keyboards/novelkeys/nk65/halconf.h
similarity index 100%
rename from keyboards/nk65/halconf.h
rename to keyboards/novelkeys/nk65/halconf.h
diff --git a/keyboards/nk65/info.json b/keyboards/novelkeys/nk65/info.json
similarity index 100%
rename from keyboards/nk65/info.json
rename to keyboards/novelkeys/nk65/info.json
diff --git a/keyboards/nk65/keymaps/default/keymap.c b/keyboards/novelkeys/nk65/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nk65/keymaps/default/keymap.c
rename to keyboards/novelkeys/nk65/keymaps/default/keymap.c
diff --git a/keyboards/nk65/keymaps/default/readme.md b/keyboards/novelkeys/nk65/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nk65/keymaps/default/readme.md
rename to keyboards/novelkeys/nk65/keymaps/default/readme.md
diff --git a/keyboards/nk65/keymaps/madhatter/keymap.c b/keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
similarity index 100%
rename from keyboards/nk65/keymaps/madhatter/keymap.c
rename to keyboards/novelkeys/nk65/keymaps/madhatter/keymap.c
diff --git a/keyboards/nk65/keymaps/via/keymap.c b/keyboards/novelkeys/nk65/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nk65/keymaps/via/keymap.c
rename to keyboards/novelkeys/nk65/keymaps/via/keymap.c
diff --git a/keyboards/nk65/keymaps/via/readme.md b/keyboards/novelkeys/nk65/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nk65/keymaps/via/readme.md
rename to keyboards/novelkeys/nk65/keymaps/via/readme.md
diff --git a/keyboards/nk65/keymaps/via/rules.mk b/keyboards/novelkeys/nk65/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nk65/keymaps/via/rules.mk
rename to keyboards/novelkeys/nk65/keymaps/via/rules.mk
diff --git a/keyboards/nk65/mcuconf.h b/keyboards/novelkeys/nk65/mcuconf.h
similarity index 100%
rename from keyboards/nk65/mcuconf.h
rename to keyboards/novelkeys/nk65/mcuconf.h
diff --git a/keyboards/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
similarity index 100%
rename from keyboards/nk65/nk65.c
rename to keyboards/novelkeys/nk65/nk65.c
diff --git a/keyboards/nk65/nk65.h b/keyboards/novelkeys/nk65/nk65.h
similarity index 100%
rename from keyboards/nk65/nk65.h
rename to keyboards/novelkeys/nk65/nk65.h
diff --git a/keyboards/nk65/readme.md b/keyboards/novelkeys/nk65/readme.md
similarity index 97%
rename from keyboards/nk65/readme.md
rename to keyboards/novelkeys/nk65/readme.md
index 3bd04210d1..38f66500b9 100755
--- a/keyboards/nk65/readme.md
+++ b/keyboards/novelkeys/nk65/readme.md
@@ -19,7 +19,7 @@ NOTE: For PCBs with revision v1.4 or later please use nk65/v1_4 in the make comm
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nk65:via
+    make novelkeys/nk65:via
 
 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/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
similarity index 100%
rename from keyboards/nk65/rules.mk
rename to keyboards/novelkeys/nk65/rules.mk
diff --git a/keyboards/nk65/v1_4/config.h b/keyboards/novelkeys/nk65/v1_4/config.h
similarity index 100%
rename from keyboards/nk65/v1_4/config.h
rename to keyboards/novelkeys/nk65/v1_4/config.h
diff --git a/keyboards/nk65/v1_4/readme.md b/keyboards/novelkeys/nk65/v1_4/readme.md
similarity index 100%
rename from keyboards/nk65/v1_4/readme.md
rename to keyboards/novelkeys/nk65/v1_4/readme.md
diff --git a/keyboards/nk65/v1_4/rules.mk b/keyboards/novelkeys/nk65/v1_4/rules.mk
similarity index 100%
rename from keyboards/nk65/v1_4/rules.mk
rename to keyboards/novelkeys/nk65/v1_4/rules.mk
diff --git a/keyboards/nk87/config.h b/keyboards/novelkeys/nk87/config.h
similarity index 100%
rename from keyboards/nk87/config.h
rename to keyboards/novelkeys/nk87/config.h
diff --git a/keyboards/nk87/halconf.h b/keyboards/novelkeys/nk87/halconf.h
similarity index 100%
rename from keyboards/nk87/halconf.h
rename to keyboards/novelkeys/nk87/halconf.h
diff --git a/keyboards/nk87/info.json b/keyboards/novelkeys/nk87/info.json
similarity index 100%
rename from keyboards/nk87/info.json
rename to keyboards/novelkeys/nk87/info.json
diff --git a/keyboards/nk87/keymaps/default/keymap.c b/keyboards/novelkeys/nk87/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nk87/keymaps/default/keymap.c
rename to keyboards/novelkeys/nk87/keymaps/default/keymap.c
diff --git a/keyboards/nk87/keymaps/default/readme.md b/keyboards/novelkeys/nk87/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nk87/keymaps/default/readme.md
rename to keyboards/novelkeys/nk87/keymaps/default/readme.md
diff --git a/keyboards/nk87/keymaps/via/keymap.c b/keyboards/novelkeys/nk87/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nk87/keymaps/via/keymap.c
rename to keyboards/novelkeys/nk87/keymaps/via/keymap.c
diff --git a/keyboards/nk87/keymaps/via/readme.md b/keyboards/novelkeys/nk87/keymaps/via/readme.md
similarity index 100%
rename from keyboards/nk87/keymaps/via/readme.md
rename to keyboards/novelkeys/nk87/keymaps/via/readme.md
diff --git a/keyboards/nk87/keymaps/via/rules.mk b/keyboards/novelkeys/nk87/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nk87/keymaps/via/rules.mk
rename to keyboards/novelkeys/nk87/keymaps/via/rules.mk
diff --git a/keyboards/nk87/mcuconf.h b/keyboards/novelkeys/nk87/mcuconf.h
similarity index 100%
rename from keyboards/nk87/mcuconf.h
rename to keyboards/novelkeys/nk87/mcuconf.h
diff --git a/keyboards/nk87/nk87.c b/keyboards/novelkeys/nk87/nk87.c
similarity index 100%
rename from keyboards/nk87/nk87.c
rename to keyboards/novelkeys/nk87/nk87.c
diff --git a/keyboards/nk87/nk87.h b/keyboards/novelkeys/nk87/nk87.h
similarity index 100%
rename from keyboards/nk87/nk87.h
rename to keyboards/novelkeys/nk87/nk87.h
diff --git a/keyboards/nk87/readme.md b/keyboards/novelkeys/nk87/readme.md
similarity index 96%
rename from keyboards/nk87/readme.md
rename to keyboards/novelkeys/nk87/readme.md
index 9ea4d99718..0de3e08b40 100755
--- a/keyboards/nk87/readme.md
+++ b/keyboards/novelkeys/nk87/readme.md
@@ -14,7 +14,7 @@ This is a standard fixed layout TKL PCB. It supports VIA and full per-key RGB.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nk87:default
+    make novelkeys/nk87: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/nk87/rules.mk b/keyboards/novelkeys/nk87/rules.mk
similarity index 100%
rename from keyboards/nk87/rules.mk
rename to keyboards/novelkeys/nk87/rules.mk
diff --git a/keyboards/novelpad/config.h b/keyboards/novelkeys/novelpad/config.h
similarity index 100%
rename from keyboards/novelpad/config.h
rename to keyboards/novelkeys/novelpad/config.h
diff --git a/keyboards/novelpad/info.json b/keyboards/novelkeys/novelpad/info.json
similarity index 100%
rename from keyboards/novelpad/info.json
rename to keyboards/novelkeys/novelpad/info.json
diff --git a/keyboards/novelpad/keymaps/0xdec/keymap.c b/keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
similarity index 100%
rename from keyboards/novelpad/keymaps/0xdec/keymap.c
rename to keyboards/novelkeys/novelpad/keymaps/0xdec/keymap.c
diff --git a/keyboards/novelpad/keymaps/default/keymap.c b/keyboards/novelkeys/novelpad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/novelpad/keymaps/default/keymap.c
rename to keyboards/novelkeys/novelpad/keymaps/default/keymap.c
diff --git a/keyboards/novelpad/novelpad.c b/keyboards/novelkeys/novelpad/novelpad.c
similarity index 100%
rename from keyboards/novelpad/novelpad.c
rename to keyboards/novelkeys/novelpad/novelpad.c
diff --git a/keyboards/novelpad/novelpad.h b/keyboards/novelkeys/novelpad/novelpad.h
similarity index 100%
rename from keyboards/novelpad/novelpad.h
rename to keyboards/novelkeys/novelpad/novelpad.h
diff --git a/keyboards/novelpad/readme.md b/keyboards/novelkeys/novelpad/readme.md
similarity index 95%
rename from keyboards/novelpad/readme.md
rename to keyboards/novelkeys/novelpad/readme.md
index 0cde8337ca..49773b8dc0 100644
--- a/keyboards/novelpad/readme.md
+++ b/keyboards/novelkeys/novelpad/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [Novelkeys.xyz](https://novelkeys.xyz)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make novelpad:default
+    make novelkeys/novelpad: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/novelpad/rules.mk b/keyboards/novelkeys/novelpad/rules.mk
similarity index 100%
rename from keyboards/novelpad/rules.mk
rename to keyboards/novelkeys/novelpad/rules.mk