diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 2853240032e..12c8d0b190c 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -330,7 +330,34 @@
         "target": "keycapsss/plaid_pad/rev1"
     },
     "kudox": {
-        "target": "kudox/rev1"
+        "target": "kumaokobo/kudox/rev1"
+    },
+    "kudox/columner": {
+        "target": "kumaokobo/kudox/columner"
+    },
+    "kudox/rev1": {
+        "target": "kumaokobo/kudox/rev1"
+    },
+    "kudox/rev2": {
+        "target": "kumaokobo/kudox/rev2"
+    },
+    "kudox/rev3": {
+        "target": "kumaokobo/kudox/rev3"
+    },
+    "kudox_full": {
+        "target": "kumaokobo/kudox_full/rev1"
+    },
+    "kudox_full/rev1": {
+        "target": "kumaokobo/kudox_full/rev1"
+    },
+    "kudox_game": {
+        "target": "kumaokobo/kudox_game/rev1"
+    },
+    "kudox_game/rev1": {
+        "target": "kumaokobo/kudox_game/rev1"
+    },
+    "kudox_game/rev2": {
+        "target": "kumaokobo/kudox_game/rev2"
     },
     "kyria": {
         "target": "splitkb/kyria"
@@ -452,6 +479,15 @@
     "minim": {
         "target": "matthewdias/minim"
     },
+    "mnk1800s": {
+        "target": "monokei/mnk1800s"
+    },
+    "mnk50": {
+        "target": "monokei/mnk50"
+    },
+    "mnk75": {
+        "target": "monokei/mnk75"
+    },
     "model01": {
         "target": "keyboardio/model01"
     },
@@ -494,6 +530,15 @@
     "peiorisboards/ixora": {
         "target": "coarse/ixora"
     },
+    "pico": {
+        "target": "kumaokobo/pico/65keys"
+    },
+    "pico/65keys": {
+        "target": "kumaokobo/pico/65keys"
+    },
+    "pico/70keys": {
+        "target": "kumaokobo/pico/70keys"
+    },
     "plaid": {
         "target": "dm9records/plaid"
     },
@@ -807,6 +852,12 @@
     "eggman": {
         "target": "qpockets/eggman"
     },
+    "enter67": {
+        "target": "kezewa/enter67"
+    },
+    "enter80": {
+        "target": "kezewa/enter80"
+    },
     "ergo42": {
         "target": "biacco42/ergo42"
     },
@@ -924,6 +975,12 @@
     "keychron/q4": {
         "target": "keychron/q4/ansi/v1"
     }
+    "kmac": {
+        "target": "kbdmania/kmac"
+    }
+    "kmac_pad": {
+        "target": "kbdmania/kmac_pad"
+    }
     "kprepublic/bm40hsrgb": {
         "target": "kprepublic/bm40hsrgb/rev1"
     },
@@ -1017,6 +1074,9 @@
     "melody96": {
         "target": "ymdk/melody96"
     },
+    "miniaxe": {
+        "target": "kagizaraya/miniaxe"
+    },
     "minidox/rev1": {
         "target": "maple_computing/minidox/rev1"
     },
diff --git a/keyboards/miniaxe/config.h b/keyboards/kagizaraya/miniaxe/config.h
similarity index 100%
rename from keyboards/miniaxe/config.h
rename to keyboards/kagizaraya/miniaxe/config.h
diff --git a/keyboards/miniaxe/info.json b/keyboards/kagizaraya/miniaxe/info.json
similarity index 100%
rename from keyboards/miniaxe/info.json
rename to keyboards/kagizaraya/miniaxe/info.json
diff --git a/keyboards/miniaxe/keymaps/default/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/miniaxe/keymaps/default/keymap.c
rename to keyboards/kagizaraya/miniaxe/keymaps/default/keymap.c
diff --git a/keyboards/miniaxe/keymaps/underglow/keymap.c b/keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
similarity index 100%
rename from keyboards/miniaxe/keymaps/underglow/keymap.c
rename to keyboards/kagizaraya/miniaxe/keymaps/underglow/keymap.c
diff --git a/keyboards/kudox_game/rev2/rules.mk b/keyboards/kagizaraya/miniaxe/keymaps/underglow/rules.mk
similarity index 100%
rename from keyboards/kudox_game/rev2/rules.mk
rename to keyboards/kagizaraya/miniaxe/keymaps/underglow/rules.mk
diff --git a/keyboards/miniaxe/readme.md b/keyboards/kagizaraya/miniaxe/readme.md
similarity index 94%
rename from keyboards/miniaxe/readme.md
rename to keyboards/kagizaraya/miniaxe/readme.md
index 57ed01a9177..bf2a4b0e986 100644
--- a/keyboards/miniaxe/readme.md
+++ b/keyboards/kagizaraya/miniaxe/readme.md
@@ -11,6 +11,6 @@ Hardware Availability: [@ka2hiro](https://twitter.com/ka2hiro)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make miniaxe:default:dfu
+    make kagizaraya/miniaxe: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/miniaxe/rules.mk b/keyboards/kagizaraya/miniaxe/rules.mk
similarity index 100%
rename from keyboards/miniaxe/rules.mk
rename to keyboards/kagizaraya/miniaxe/rules.mk
diff --git a/keyboards/kmac/config.h b/keyboards/kbdmania/kmac/config.h
similarity index 100%
rename from keyboards/kmac/config.h
rename to keyboards/kbdmania/kmac/config.h
diff --git a/keyboards/kmac/info.json b/keyboards/kbdmania/kmac/info.json
similarity index 100%
rename from keyboards/kmac/info.json
rename to keyboards/kbdmania/kmac/info.json
diff --git a/keyboards/kmac/keymaps/default/keymap.c b/keyboards/kbdmania/kmac/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/default/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/default/keymap.c
diff --git a/keyboards/kmac/keymaps/default/readme.md b/keyboards/kbdmania/kmac/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kmac/keymaps/default/readme.md
rename to keyboards/kbdmania/kmac/keymaps/default/readme.md
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi/keymap.c b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/keymap.c
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi/readme.md b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/readme.md
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi/readme.md
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi/readme.md
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/keymap.c
diff --git a/keyboards/kmac/keymaps/default_tkl_ansi_wkl/readme.md b/keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/readme.md
similarity index 100%
rename from keyboards/kmac/keymaps/default_tkl_ansi_wkl/readme.md
rename to keyboards/kbdmania/kmac/keymaps/default_tkl_ansi_wkl/readme.md
diff --git a/keyboards/kmac/keymaps/via/keymap.c b/keyboards/kbdmania/kmac/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kmac/keymaps/via/keymap.c
rename to keyboards/kbdmania/kmac/keymaps/via/keymap.c
diff --git a/keyboards/kmac/keymaps/via/rules.mk b/keyboards/kbdmania/kmac/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kmac/keymaps/via/rules.mk
rename to keyboards/kbdmania/kmac/keymaps/via/rules.mk
diff --git a/keyboards/kmac/kmac.c b/keyboards/kbdmania/kmac/kmac.c
similarity index 100%
rename from keyboards/kmac/kmac.c
rename to keyboards/kbdmania/kmac/kmac.c
diff --git a/keyboards/kmac/matrix.c b/keyboards/kbdmania/kmac/matrix.c
similarity index 100%
rename from keyboards/kmac/matrix.c
rename to keyboards/kbdmania/kmac/matrix.c
diff --git a/keyboards/kmac/readme.md b/keyboards/kbdmania/kmac/readme.md
similarity index 88%
rename from keyboards/kmac/readme.md
rename to keyboards/kbdmania/kmac/readme.md
index 47dbaa847f6..c9f77462928 100644
--- a/keyboards/kmac/readme.md
+++ b/keyboards/kbdmania/kmac/readme.md
@@ -4,11 +4,11 @@ A Korean custom keyboard designed by Byungho Kim and the KBDMania community.
 
 Keyboard Maintainer: [Mathias Andersson](https://github.com/wraul)  
 Hardware Supported: KMAC & KMAC 2  
-Hardware Availability: http://www.kbdmania.net/xe/news/5232321
+Hardware Availability: [KBDMania](http://www.kbdmania.net/xe/news/5232321)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kmac:default
+    make kbdmania/kmac: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/kmac/rules.mk b/keyboards/kbdmania/kmac/rules.mk
similarity index 100%
rename from keyboards/kmac/rules.mk
rename to keyboards/kbdmania/kmac/rules.mk
diff --git a/keyboards/kmac_pad/config.h b/keyboards/kbdmania/kmac_pad/config.h
similarity index 100%
rename from keyboards/kmac_pad/config.h
rename to keyboards/kbdmania/kmac_pad/config.h
diff --git a/keyboards/kmac_pad/info.json b/keyboards/kbdmania/kmac_pad/info.json
similarity index 100%
rename from keyboards/kmac_pad/info.json
rename to keyboards/kbdmania/kmac_pad/info.json
diff --git a/keyboards/kmac_pad/keymaps/default/keymap.c b/keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kmac_pad/keymaps/default/keymap.c
rename to keyboards/kbdmania/kmac_pad/keymaps/default/keymap.c
diff --git a/keyboards/kmac_pad/keymaps/default/readme.md b/keyboards/kbdmania/kmac_pad/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kmac_pad/keymaps/default/readme.md
rename to keyboards/kbdmania/kmac_pad/keymaps/default/readme.md
diff --git a/keyboards/kmac_pad/kmac_pad.c b/keyboards/kbdmania/kmac_pad/kmac_pad.c
similarity index 100%
rename from keyboards/kmac_pad/kmac_pad.c
rename to keyboards/kbdmania/kmac_pad/kmac_pad.c
diff --git a/keyboards/kmac_pad/matrix.c b/keyboards/kbdmania/kmac_pad/matrix.c
similarity index 100%
rename from keyboards/kmac_pad/matrix.c
rename to keyboards/kbdmania/kmac_pad/matrix.c
diff --git a/keyboards/kmac_pad/readme.md b/keyboards/kbdmania/kmac_pad/readme.md
similarity index 91%
rename from keyboards/kmac_pad/readme.md
rename to keyboards/kbdmania/kmac_pad/readme.md
index 7605501f3a5..59cc307073d 100644
--- a/keyboards/kmac_pad/readme.md
+++ b/keyboards/kbdmania/kmac_pad/readme.md
@@ -7,15 +7,15 @@ It can be used independently, but can also be used by connecting with KMAC keybo
 
 * Keyboard Maintainer: [talsu](https://github.com/talsu)
 * Hardware Supported: KMAC PAD
-* Hardware Availability: http://www.kbdmania.net/xe/news/5232321
+* Hardware Availability: [KBDMania](http://www.kbdmania.net/xe/news/5232321)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kmac_pad:default
+    make kbdmania/kmac_pad:default
     
 Flashing example for this keyboard:
 
-    make kmac_pad:default:flash
+    make kbdmania/kmac_pad: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/kmac_pad/rules.mk b/keyboards/kbdmania/kmac_pad/rules.mk
similarity index 100%
rename from keyboards/kmac_pad/rules.mk
rename to keyboards/kbdmania/kmac_pad/rules.mk
diff --git a/keyboards/enter67/info.json b/keyboards/kezewa/enter67/info.json
similarity index 100%
rename from keyboards/enter67/info.json
rename to keyboards/kezewa/enter67/info.json
diff --git a/keyboards/enter67/keymaps/default/keymap.c b/keyboards/kezewa/enter67/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/enter67/keymaps/default/keymap.c
rename to keyboards/kezewa/enter67/keymaps/default/keymap.c
diff --git a/keyboards/enter67/keymaps/via/keymap.c b/keyboards/kezewa/enter67/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/enter67/keymaps/via/keymap.c
rename to keyboards/kezewa/enter67/keymaps/via/keymap.c
diff --git a/keyboards/enter67/keymaps/via/rules.mk b/keyboards/kezewa/enter67/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/enter67/keymaps/via/rules.mk
rename to keyboards/kezewa/enter67/keymaps/via/rules.mk
diff --git a/keyboards/enter67/readme.md b/keyboards/kezewa/enter67/readme.md
similarity index 87%
rename from keyboards/enter67/readme.md
rename to keyboards/kezewa/enter67/readme.md
index 8a4890ff1d5..beb5074f9d1 100644
--- a/keyboards/enter67/readme.md
+++ b/keyboards/kezewa/enter67/readme.md
@@ -6,14 +6,15 @@
 
 * Keyboard Maintainer: https://github.com/LXF-YZP
 * Hardware Supported: enter67 PCB
+* Hardware Availability: [Kezewa](https://kezewa.com/)
 
 Make example for this keyboard (after setting up your build environment):
     
-    make enter67:default
+    make kezewa/enter67:default
     
 Flashing example for this keyboard:
 
-    make enter67:default:flash
+    make kezewa/enter67: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).
 
@@ -23,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/enter67/rules.mk b/keyboards/kezewa/enter67/rules.mk
similarity index 100%
rename from keyboards/enter67/rules.mk
rename to keyboards/kezewa/enter67/rules.mk
diff --git a/keyboards/enter80/info.json b/keyboards/kezewa/enter80/info.json
similarity index 100%
rename from keyboards/enter80/info.json
rename to keyboards/kezewa/enter80/info.json
diff --git a/keyboards/enter80/keymaps/default/keymap.c b/keyboards/kezewa/enter80/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/enter80/keymaps/default/keymap.c
rename to keyboards/kezewa/enter80/keymaps/default/keymap.c
diff --git a/keyboards/enter80/keymaps/via/keymap.c b/keyboards/kezewa/enter80/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/enter80/keymaps/via/keymap.c
rename to keyboards/kezewa/enter80/keymaps/via/keymap.c
diff --git a/keyboards/enter80/keymaps/via/rules.mk b/keyboards/kezewa/enter80/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/enter80/keymaps/via/rules.mk
rename to keyboards/kezewa/enter80/keymaps/via/rules.mk
diff --git a/keyboards/enter80/matrix_diagram.md b/keyboards/kezewa/enter80/matrix_diagram.md
similarity index 100%
rename from keyboards/enter80/matrix_diagram.md
rename to keyboards/kezewa/enter80/matrix_diagram.md
diff --git a/keyboards/enter80/readme.md b/keyboards/kezewa/enter80/readme.md
similarity index 94%
rename from keyboards/enter80/readme.md
rename to keyboards/kezewa/enter80/readme.md
index c02001a43d8..eaecf514cb8 100644
--- a/keyboards/enter80/readme.md
+++ b/keyboards/kezewa/enter80/readme.md
@@ -6,6 +6,7 @@
 
 * Keyboard Maintainer: https://github.com/LXF-YZP
 * Hardware Supported: enter80 PCB
+* Hardware Availability: [Kezewa](https://kezewa.com/)
 
 Make example for this keyboard (after setting up your build environment):
     
diff --git a/keyboards/enter80/rules.mk b/keyboards/kezewa/enter80/rules.mk
similarity index 100%
rename from keyboards/enter80/rules.mk
rename to keyboards/kezewa/enter80/rules.mk
diff --git a/keyboards/kudox/columner/config.h b/keyboards/kumaokobo/kudox/columner/config.h
similarity index 100%
rename from keyboards/kudox/columner/config.h
rename to keyboards/kumaokobo/kudox/columner/config.h
diff --git a/keyboards/kudox/columner/info.json b/keyboards/kumaokobo/kudox/columner/info.json
similarity index 100%
rename from keyboards/kudox/columner/info.json
rename to keyboards/kumaokobo/kudox/columner/info.json
diff --git a/keyboards/kudox/columner/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox/columner/keymaps/default/keymap.c
similarity index 99%
rename from keyboards/kudox/columner/keymaps/default/keymap.c
rename to keyboards/kumaokobo/kudox/columner/keymaps/default/keymap.c
index 7bbdd02c76d..4798f862dfa 100644
--- a/keyboards/kudox/columner/keymaps/default/keymap.c
+++ b/keyboards/kumaokobo/kudox/columner/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
diff --git a/keyboards/kudox/columner/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/columner/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox/columner/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox/columner/keymaps/default/readme.md
diff --git a/keyboards/kudox/columner/keymaps/via/keymap.c b/keyboards/kumaokobo/kudox/columner/keymaps/via/keymap.c
similarity index 99%
rename from keyboards/kudox/columner/keymaps/via/keymap.c
rename to keyboards/kumaokobo/kudox/columner/keymaps/via/keymap.c
index 1906df10841..8450881cc41 100644
--- a/keyboards/kudox/columner/keymaps/via/keymap.c
+++ b/keyboards/kumaokobo/kudox/columner/keymaps/via/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/kudox/columner/keymaps/via/readme.md b/keyboards/kumaokobo/kudox/columner/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kudox/columner/keymaps/via/readme.md
rename to keyboards/kumaokobo/kudox/columner/keymaps/via/readme.md
diff --git a/keyboards/kudox/columner/keymaps/via/rules.mk b/keyboards/kumaokobo/kudox/columner/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kudox/columner/keymaps/via/rules.mk
rename to keyboards/kumaokobo/kudox/columner/keymaps/via/rules.mk
diff --git a/keyboards/kudox/columner/readme.md b/keyboards/kumaokobo/kudox/columner/readme.md
similarity index 92%
rename from keyboards/kudox/columner/readme.md
rename to keyboards/kumaokobo/kudox/columner/readme.md
index 0c62174bcf6..90a65670b49 100644
--- a/keyboards/kudox/columner/readme.md
+++ b/keyboards/kumaokobo/kudox/columner/readme.md
@@ -14,14 +14,14 @@
 Make example for this keyboard (after setting up your build environment):
 
 ```sh
-make kudox/columner:default
+make kumaokobo/kudox/columner:default
 ```
 
 
 Example of flashing this keyboard:
 
 ```sh
-make kudox/columner:default:flash
+make kumaokobo/kudox/columner: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/kudox/columner/rules.mk b/keyboards/kumaokobo/kudox/columner/rules.mk
similarity index 100%
rename from keyboards/kudox/columner/rules.mk
rename to keyboards/kumaokobo/kudox/columner/rules.mk
diff --git a/keyboards/kudox/config.h b/keyboards/kumaokobo/kudox/config.h
similarity index 100%
rename from keyboards/kudox/config.h
rename to keyboards/kumaokobo/kudox/config.h
diff --git a/keyboards/kudox/readme.md b/keyboards/kumaokobo/kudox/readme.md
similarity index 92%
rename from keyboards/kudox/readme.md
rename to keyboards/kumaokobo/kudox/readme.md
index 107b99b1005..01b90d53bec 100644
--- a/keyboards/kudox/readme.md
+++ b/keyboards/kumaokobo/kudox/readme.md
@@ -14,14 +14,14 @@
 Make example for this keyboard (after setting up your build environment):
 
 ```sh
-make kudox/rev3:default
+make kumaokobo/kudox/rev3:default
 ```
 
 
 Example of flashing this keyboard:
 
 ```sh
-make kudox/rev3:default:flash
+make kumaokobo/kudox/rev3: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/kudox/rev1/config.h b/keyboards/kumaokobo/kudox/rev1/config.h
similarity index 100%
rename from keyboards/kudox/rev1/config.h
rename to keyboards/kumaokobo/kudox/rev1/config.h
diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kumaokobo/kudox/rev1/info.json
similarity index 100%
rename from keyboards/kudox/rev1/info.json
rename to keyboards/kumaokobo/kudox/rev1/info.json
diff --git a/keyboards/kudox/rev1/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox/rev1/keymaps/default/keymap.c
similarity index 98%
rename from keyboards/kudox/rev1/keymaps/default/keymap.c
rename to keyboards/kumaokobo/kudox/rev1/keymaps/default/keymap.c
index 1a3bfa4fff5..b3d183e72bd 100644
--- a/keyboards/kudox/rev1/keymaps/default/keymap.c
+++ b/keyboards/kumaokobo/kudox/rev1/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
diff --git a/keyboards/kudox/rev1/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox/rev1/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox/rev1/keymaps/default/readme.md
diff --git a/keyboards/kudox/rev1/keymaps/jis/keymap.c b/keyboards/kumaokobo/kudox/rev1/keymaps/jis/keymap.c
similarity index 98%
rename from keyboards/kudox/rev1/keymaps/jis/keymap.c
rename to keyboards/kumaokobo/kudox/rev1/keymaps/jis/keymap.c
index a58c5cbd659..26bc89abbd2 100644
--- a/keyboards/kudox/rev1/keymaps/jis/keymap.c
+++ b/keyboards/kumaokobo/kudox/rev1/keymaps/jis/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 #include"keymap_japanese.h"
 
diff --git a/keyboards/kudox/rev1/keymaps/jis/readme.md b/keyboards/kumaokobo/kudox/rev1/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/kudox/rev1/keymaps/jis/readme.md
rename to keyboards/kumaokobo/kudox/rev1/keymaps/jis/readme.md
diff --git a/keyboards/kudox/rev1/keymaps/x1/keymap.c b/keyboards/kumaokobo/kudox/rev1/keymaps/x1/keymap.c
similarity index 99%
rename from keyboards/kudox/rev1/keymaps/x1/keymap.c
rename to keyboards/kumaokobo/kudox/rev1/keymaps/x1/keymap.c
index 982f98b2956..aef3892f58d 100644
--- a/keyboards/kudox/rev1/keymaps/x1/keymap.c
+++ b/keyboards/kumaokobo/kudox/rev1/keymaps/x1/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
diff --git a/keyboards/kudox/rev1/keymaps/x1/readme.md b/keyboards/kumaokobo/kudox/rev1/keymaps/x1/readme.md
similarity index 100%
rename from keyboards/kudox/rev1/keymaps/x1/readme.md
rename to keyboards/kumaokobo/kudox/rev1/keymaps/x1/readme.md
diff --git a/keyboards/kudox/rev1/rules.mk b/keyboards/kumaokobo/kudox/rev1/rules.mk
similarity index 100%
rename from keyboards/kudox/rev1/rules.mk
rename to keyboards/kumaokobo/kudox/rev1/rules.mk
diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kumaokobo/kudox/rev2/config.h
similarity index 100%
rename from keyboards/kudox/rev2/config.h
rename to keyboards/kumaokobo/kudox/rev2/config.h
diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kumaokobo/kudox/rev2/info.json
similarity index 100%
rename from keyboards/kudox/rev2/info.json
rename to keyboards/kumaokobo/kudox/rev2/info.json
diff --git a/keyboards/kudox/rev2/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox/rev2/keymaps/default/keymap.c
similarity index 98%
rename from keyboards/kudox/rev2/keymaps/default/keymap.c
rename to keyboards/kumaokobo/kudox/rev2/keymaps/default/keymap.c
index d078683d9c3..29ddd15fa18 100644
--- a/keyboards/kudox/rev2/keymaps/default/keymap.c
+++ b/keyboards/kumaokobo/kudox/rev2/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
diff --git a/keyboards/kudox/rev2/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/rev2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox/rev2/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox/rev2/keymaps/default/readme.md
diff --git a/keyboards/kudox/rev2/keymaps/jis/keymap.c b/keyboards/kumaokobo/kudox/rev2/keymaps/jis/keymap.c
similarity index 98%
rename from keyboards/kudox/rev2/keymaps/jis/keymap.c
rename to keyboards/kumaokobo/kudox/rev2/keymaps/jis/keymap.c
index b588fea6ad2..c581ddb8f1c 100644
--- a/keyboards/kudox/rev2/keymaps/jis/keymap.c
+++ b/keyboards/kumaokobo/kudox/rev2/keymaps/jis/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 #include"keymap_japanese.h"
 
diff --git a/keyboards/kudox/rev2/keymaps/jis/readme.md b/keyboards/kumaokobo/kudox/rev2/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/kudox/rev2/keymaps/jis/readme.md
rename to keyboards/kumaokobo/kudox/rev2/keymaps/jis/readme.md
diff --git a/keyboards/kudox/rev2/rules.mk b/keyboards/kumaokobo/kudox/rev2/rules.mk
similarity index 100%
rename from keyboards/kudox/rev2/rules.mk
rename to keyboards/kumaokobo/kudox/rev2/rules.mk
diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kumaokobo/kudox/rev3/config.h
similarity index 100%
rename from keyboards/kudox/rev3/config.h
rename to keyboards/kumaokobo/kudox/rev3/config.h
diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kumaokobo/kudox/rev3/info.json
similarity index 100%
rename from keyboards/kudox/rev3/info.json
rename to keyboards/kumaokobo/kudox/rev3/info.json
diff --git a/keyboards/kudox/rev3/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox/rev3/keymaps/default/keymap.c
similarity index 99%
rename from keyboards/kudox/rev3/keymaps/default/keymap.c
rename to keyboards/kumaokobo/kudox/rev3/keymaps/default/keymap.c
index 45e40630c66..bf89d895f52 100644
--- a/keyboards/kudox/rev3/keymaps/default/keymap.c
+++ b/keyboards/kumaokobo/kudox/rev3/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
diff --git a/keyboards/kudox/rev3/keymaps/default/readme.md b/keyboards/kumaokobo/kudox/rev3/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox/rev3/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox/rev3/keymaps/default/readme.md
diff --git a/keyboards/kudox/rev3/keymaps/jis/keymap.c b/keyboards/kumaokobo/kudox/rev3/keymaps/jis/keymap.c
similarity index 99%
rename from keyboards/kudox/rev3/keymaps/jis/keymap.c
rename to keyboards/kumaokobo/kudox/rev3/keymaps/jis/keymap.c
index 72f4c04c300..f53d40063b2 100644
--- a/keyboards/kudox/rev3/keymaps/jis/keymap.c
+++ b/keyboards/kumaokobo/kudox/rev3/keymaps/jis/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 #include"keymap_japanese.h"
 
diff --git a/keyboards/kudox/rev3/keymaps/jis/readme.md b/keyboards/kumaokobo/kudox/rev3/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/kudox/rev3/keymaps/jis/readme.md
rename to keyboards/kumaokobo/kudox/rev3/keymaps/jis/readme.md
diff --git a/keyboards/kudox/rev3/keymaps/via/keymap.c b/keyboards/kumaokobo/kudox/rev3/keymaps/via/keymap.c
similarity index 99%
rename from keyboards/kudox/rev3/keymaps/via/keymap.c
rename to keyboards/kumaokobo/kudox/rev3/keymaps/via/keymap.c
index 9dfbe81701d..2609e877237 100644
--- a/keyboards/kudox/rev3/keymaps/via/keymap.c
+++ b/keyboards/kumaokobo/kudox/rev3/keymaps/via/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/kudox/rev3/keymaps/via/readme.md b/keyboards/kumaokobo/kudox/rev3/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kudox/rev3/keymaps/via/readme.md
rename to keyboards/kumaokobo/kudox/rev3/keymaps/via/readme.md
diff --git a/keyboards/kudox/rev3/keymaps/via/rules.mk b/keyboards/kumaokobo/kudox/rev3/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kudox/rev3/keymaps/via/rules.mk
rename to keyboards/kumaokobo/kudox/rev3/keymaps/via/rules.mk
diff --git a/keyboards/kudox/rev3/rules.mk b/keyboards/kumaokobo/kudox/rev3/rules.mk
similarity index 100%
rename from keyboards/kudox/rev3/rules.mk
rename to keyboards/kumaokobo/kudox/rev3/rules.mk
diff --git a/keyboards/kudox/rules.mk b/keyboards/kumaokobo/kudox/rules.mk
similarity index 100%
rename from keyboards/kudox/rules.mk
rename to keyboards/kumaokobo/kudox/rules.mk
diff --git a/keyboards/kudox_full/config.h b/keyboards/kumaokobo/kudox_full/config.h
similarity index 100%
rename from keyboards/kudox_full/config.h
rename to keyboards/kumaokobo/kudox_full/config.h
diff --git a/keyboards/kudox_full/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox_full/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/kudox_full/keymaps/default/keymap.c
rename to keyboards/kumaokobo/kudox_full/keymaps/default/keymap.c
diff --git a/keyboards/kudox_full/keymaps/jis/keymap.c b/keyboards/kumaokobo/kudox_full/keymaps/jis/keymap.c
similarity index 100%
rename from keyboards/kudox_full/keymaps/jis/keymap.c
rename to keyboards/kumaokobo/kudox_full/keymaps/jis/keymap.c
diff --git a/keyboards/kudox_full/keymaps/via/keymap.c b/keyboards/kumaokobo/kudox_full/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/kudox_full/keymaps/via/keymap.c
rename to keyboards/kumaokobo/kudox_full/keymaps/via/keymap.c
diff --git a/keyboards/kudox_full/keymaps/via/rules.mk b/keyboards/kumaokobo/kudox_full/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kudox_full/keymaps/via/rules.mk
rename to keyboards/kumaokobo/kudox_full/keymaps/via/rules.mk
diff --git a/keyboards/kudox_full/kudox_full.c b/keyboards/kumaokobo/kudox_full/kudox_full.c
similarity index 100%
rename from keyboards/kudox_full/kudox_full.c
rename to keyboards/kumaokobo/kudox_full/kudox_full.c
diff --git a/keyboards/kudox_full/post_config.h b/keyboards/kumaokobo/kudox_full/post_config.h
similarity index 100%
rename from keyboards/kudox_full/post_config.h
rename to keyboards/kumaokobo/kudox_full/post_config.h
diff --git a/keyboards/kudox_full/readme.md b/keyboards/kumaokobo/kudox_full/readme.md
similarity index 93%
rename from keyboards/kudox_full/readme.md
rename to keyboards/kumaokobo/kudox_full/readme.md
index 494d7508c84..c5af5d652d6 100644
--- a/keyboards/kudox_full/readme.md
+++ b/keyboards/kumaokobo/kudox_full/readme.md
@@ -22,11 +22,11 @@ Enter the bootloader in 3 ways:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make kudox_full/rev1:default
+    make kumaokobo/kudox_full/rev1:default
 
 
 Flashing example for this keyboard:
 
-    make kudox_full/rev1:default:flash
+    make kumaokobo/kudox_full/rev1: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/kudox_full/rev1/config.h b/keyboards/kumaokobo/kudox_full/rev1/config.h
similarity index 100%
rename from keyboards/kudox_full/rev1/config.h
rename to keyboards/kumaokobo/kudox_full/rev1/config.h
diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kumaokobo/kudox_full/rev1/info.json
similarity index 100%
rename from keyboards/kudox_full/rev1/info.json
rename to keyboards/kumaokobo/kudox_full/rev1/info.json
diff --git a/keyboards/kudox_full/rev1/rules.mk b/keyboards/kumaokobo/kudox_full/rev1/rules.mk
similarity index 100%
rename from keyboards/kudox_full/rev1/rules.mk
rename to keyboards/kumaokobo/kudox_full/rev1/rules.mk
diff --git a/keyboards/kudox_full/rules.mk b/keyboards/kumaokobo/kudox_full/rules.mk
similarity index 100%
rename from keyboards/kudox_full/rules.mk
rename to keyboards/kumaokobo/kudox_full/rules.mk
diff --git a/keyboards/kudox_game/config.h b/keyboards/kumaokobo/kudox_game/config.h
similarity index 100%
rename from keyboards/kudox_game/config.h
rename to keyboards/kumaokobo/kudox_game/config.h
diff --git a/keyboards/kudox_game/info.json b/keyboards/kumaokobo/kudox_game/info.json
similarity index 100%
rename from keyboards/kudox_game/info.json
rename to keyboards/kumaokobo/kudox_game/info.json
diff --git a/keyboards/kudox_game/keymaps/default/keymap.c b/keyboards/kumaokobo/kudox_game/keymaps/default/keymap.c
similarity index 98%
rename from keyboards/kudox_game/keymaps/default/keymap.c
rename to keyboards/kumaokobo/kudox_game/keymaps/default/keymap.c
index aecf8976c2e..99e664138f6 100644
--- a/keyboards/kudox_game/keymaps/default/keymap.c
+++ b/keyboards/kumaokobo/kudox_game/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
diff --git a/keyboards/kudox_game/keymaps/default/readme.md b/keyboards/kumaokobo/kudox_game/keymaps/default/readme.md
similarity index 100%
rename from keyboards/kudox_game/keymaps/default/readme.md
rename to keyboards/kumaokobo/kudox_game/keymaps/default/readme.md
diff --git a/keyboards/kudox_game/keymaps/via/keymap.c b/keyboards/kumaokobo/kudox_game/keymaps/via/keymap.c
similarity index 98%
rename from keyboards/kudox_game/keymaps/via/keymap.c
rename to keyboards/kumaokobo/kudox_game/keymaps/via/keymap.c
index 0a18483d907..b0722bf470e 100644
--- a/keyboards/kudox_game/keymaps/via/keymap.c
+++ b/keyboards/kumaokobo/kudox_game/keymaps/via/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
diff --git a/keyboards/kudox_game/keymaps/via/readme.md b/keyboards/kumaokobo/kudox_game/keymaps/via/readme.md
similarity index 100%
rename from keyboards/kudox_game/keymaps/via/readme.md
rename to keyboards/kumaokobo/kudox_game/keymaps/via/readme.md
diff --git a/keyboards/kudox_game/keymaps/via/rules.mk b/keyboards/kumaokobo/kudox_game/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/kudox_game/keymaps/via/rules.mk
rename to keyboards/kumaokobo/kudox_game/keymaps/via/rules.mk
diff --git a/keyboards/kudox_game/readme.md b/keyboards/kumaokobo/kudox_game/readme.md
similarity index 91%
rename from keyboards/kudox_game/readme.md
rename to keyboards/kumaokobo/kudox_game/readme.md
index 31565a59968..6e06be159c7 100644
--- a/keyboards/kudox_game/readme.md
+++ b/keyboards/kumaokobo/kudox_game/readme.md
@@ -14,13 +14,13 @@
 Make example for this keyboard (after setting up your build environment):
 
 ```sh
-make kudox_game/rev2:default
+make kumaokobo/kudox_game/rev2:default
 ```
 
 Example of flashing this keyboard:
 
 ```sh
-make kudox_game/rev2:default:avrdude
+make kumaokobo/kudox_game/rev2:default:avrdude
 ```
 
 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/kudox_game/rev1/config.h b/keyboards/kumaokobo/kudox_game/rev1/config.h
similarity index 100%
rename from keyboards/kudox_game/rev1/config.h
rename to keyboards/kumaokobo/kudox_game/rev1/config.h
diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kumaokobo/kudox_game/rev1/info.json
similarity index 100%
rename from keyboards/kudox_game/rev1/info.json
rename to keyboards/kumaokobo/kudox_game/rev1/info.json
diff --git a/keyboards/kudox_game/rev1/rules.mk b/keyboards/kumaokobo/kudox_game/rev1/rules.mk
similarity index 100%
rename from keyboards/kudox_game/rev1/rules.mk
rename to keyboards/kumaokobo/kudox_game/rev1/rules.mk
diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kumaokobo/kudox_game/rev2/config.h
similarity index 100%
rename from keyboards/kudox_game/rev2/config.h
rename to keyboards/kumaokobo/kudox_game/rev2/config.h
diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kumaokobo/kudox_game/rev2/info.json
similarity index 100%
rename from keyboards/kudox_game/rev2/info.json
rename to keyboards/kumaokobo/kudox_game/rev2/info.json
diff --git a/keyboards/miniaxe/keymaps/underglow/rules.mk b/keyboards/kumaokobo/kudox_game/rev2/rules.mk
similarity index 100%
rename from keyboards/miniaxe/keymaps/underglow/rules.mk
rename to keyboards/kumaokobo/kudox_game/rev2/rules.mk
diff --git a/keyboards/kudox_game/rules.mk b/keyboards/kumaokobo/kudox_game/rules.mk
similarity index 100%
rename from keyboards/kudox_game/rules.mk
rename to keyboards/kumaokobo/kudox_game/rules.mk
diff --git a/keyboards/pico/65keys/config.h b/keyboards/kumaokobo/pico/65keys/config.h
similarity index 100%
rename from keyboards/pico/65keys/config.h
rename to keyboards/kumaokobo/pico/65keys/config.h
diff --git a/keyboards/pico/65keys/info.json b/keyboards/kumaokobo/pico/65keys/info.json
similarity index 100%
rename from keyboards/pico/65keys/info.json
rename to keyboards/kumaokobo/pico/65keys/info.json
diff --git a/keyboards/pico/65keys/keymaps/default/keymap.c b/keyboards/kumaokobo/pico/65keys/keymaps/default/keymap.c
similarity index 98%
rename from keyboards/pico/65keys/keymaps/default/keymap.c
rename to keyboards/kumaokobo/pico/65keys/keymaps/default/keymap.c
index eb0ea05fc2c..15e0ff31684 100644
--- a/keyboards/pico/65keys/keymaps/default/keymap.c
+++ b/keyboards/kumaokobo/pico/65keys/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
diff --git a/keyboards/pico/65keys/keymaps/default/readme.md b/keyboards/kumaokobo/pico/65keys/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pico/65keys/keymaps/default/readme.md
rename to keyboards/kumaokobo/pico/65keys/keymaps/default/readme.md
diff --git a/keyboards/pico/65keys/keymaps/jis/keymap.c b/keyboards/kumaokobo/pico/65keys/keymaps/jis/keymap.c
similarity index 98%
rename from keyboards/pico/65keys/keymaps/jis/keymap.c
rename to keyboards/kumaokobo/pico/65keys/keymaps/jis/keymap.c
index 9f3f640f013..94767aef903 100644
--- a/keyboards/pico/65keys/keymaps/jis/keymap.c
+++ b/keyboards/kumaokobo/pico/65keys/keymaps/jis/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 #include"keymap_japanese.h"
 
diff --git a/keyboards/pico/65keys/keymaps/jis/readme.md b/keyboards/kumaokobo/pico/65keys/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/pico/65keys/keymaps/jis/readme.md
rename to keyboards/kumaokobo/pico/65keys/keymaps/jis/readme.md
diff --git a/keyboards/pico/65keys/rules.mk b/keyboards/kumaokobo/pico/65keys/rules.mk
similarity index 100%
rename from keyboards/pico/65keys/rules.mk
rename to keyboards/kumaokobo/pico/65keys/rules.mk
diff --git a/keyboards/pico/70keys/config.h b/keyboards/kumaokobo/pico/70keys/config.h
similarity index 100%
rename from keyboards/pico/70keys/config.h
rename to keyboards/kumaokobo/pico/70keys/config.h
diff --git a/keyboards/pico/70keys/info.json b/keyboards/kumaokobo/pico/70keys/info.json
similarity index 100%
rename from keyboards/pico/70keys/info.json
rename to keyboards/kumaokobo/pico/70keys/info.json
diff --git a/keyboards/pico/70keys/keymaps/default/keymap.c b/keyboards/kumaokobo/pico/70keys/keymaps/default/keymap.c
similarity index 98%
rename from keyboards/pico/70keys/keymaps/default/keymap.c
rename to keyboards/kumaokobo/pico/70keys/keymaps/default/keymap.c
index 3c3ab50c178..fa14063d4b3 100644
--- a/keyboards/pico/70keys/keymaps/default/keymap.c
+++ b/keyboards/kumaokobo/pico/70keys/keymaps/default/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
diff --git a/keyboards/pico/70keys/keymaps/default/readme.md b/keyboards/kumaokobo/pico/70keys/keymaps/default/readme.md
similarity index 100%
rename from keyboards/pico/70keys/keymaps/default/readme.md
rename to keyboards/kumaokobo/pico/70keys/keymaps/default/readme.md
diff --git a/keyboards/pico/70keys/keymaps/jis/keymap.c b/keyboards/kumaokobo/pico/70keys/keymaps/jis/keymap.c
similarity index 98%
rename from keyboards/pico/70keys/keymaps/jis/keymap.c
rename to keyboards/kumaokobo/pico/70keys/keymaps/jis/keymap.c
index 5727cb7841f..2d9414cced7 100644
--- a/keyboards/pico/70keys/keymaps/jis/keymap.c
+++ b/keyboards/kumaokobo/pico/70keys/keymaps/jis/keymap.c
@@ -1,3 +1,6 @@
+// Copyright Kumao Kobo <kumaokobo@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include QMK_KEYBOARD_H
 #include"keymap_japanese.h"
 
diff --git a/keyboards/pico/70keys/keymaps/jis/readme.md b/keyboards/kumaokobo/pico/70keys/keymaps/jis/readme.md
similarity index 100%
rename from keyboards/pico/70keys/keymaps/jis/readme.md
rename to keyboards/kumaokobo/pico/70keys/keymaps/jis/readme.md
diff --git a/keyboards/pico/70keys/rules.mk b/keyboards/kumaokobo/pico/70keys/rules.mk
similarity index 100%
rename from keyboards/pico/70keys/rules.mk
rename to keyboards/kumaokobo/pico/70keys/rules.mk
diff --git a/keyboards/pico/config.h b/keyboards/kumaokobo/pico/config.h
similarity index 100%
rename from keyboards/pico/config.h
rename to keyboards/kumaokobo/pico/config.h
diff --git a/keyboards/pico/readme.md b/keyboards/kumaokobo/pico/readme.md
similarity index 96%
rename from keyboards/pico/readme.md
rename to keyboards/kumaokobo/pico/readme.md
index 891bb174fe6..b54c42941e9 100644
--- a/keyboards/pico/readme.md
+++ b/keyboards/kumaokobo/pico/readme.md
@@ -8,7 +8,7 @@ Pico adopted the footprint for [Kailh Mid-Height](http://www.kailh.com/en/Produc
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pico/65keys:default
+    make kumaokobo/pico/65keys:default
 
 ## 65 keys
 <p align="center">
diff --git a/keyboards/pico/rules.mk b/keyboards/kumaokobo/pico/rules.mk
similarity index 100%
rename from keyboards/pico/rules.mk
rename to keyboards/kumaokobo/pico/rules.mk
diff --git a/keyboards/mnk1800s/config.h b/keyboards/monokei/mnk1800s/config.h
similarity index 100%
rename from keyboards/mnk1800s/config.h
rename to keyboards/monokei/mnk1800s/config.h
diff --git a/keyboards/mnk1800s/info.json b/keyboards/monokei/mnk1800s/info.json
similarity index 100%
rename from keyboards/mnk1800s/info.json
rename to keyboards/monokei/mnk1800s/info.json
diff --git a/keyboards/mnk1800s/keymaps/default/keymap.c b/keyboards/monokei/mnk1800s/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mnk1800s/keymaps/default/keymap.c
rename to keyboards/monokei/mnk1800s/keymaps/default/keymap.c
diff --git a/keyboards/mnk1800s/keymaps/default/readme.md b/keyboards/monokei/mnk1800s/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mnk1800s/keymaps/default/readme.md
rename to keyboards/monokei/mnk1800s/keymaps/default/readme.md
diff --git a/keyboards/mnk1800s/keymaps/default_2u_bs/keymap.c b/keyboards/monokei/mnk1800s/keymaps/default_2u_bs/keymap.c
similarity index 100%
rename from keyboards/mnk1800s/keymaps/default_2u_bs/keymap.c
rename to keyboards/monokei/mnk1800s/keymaps/default_2u_bs/keymap.c
diff --git a/keyboards/mnk1800s/keymaps/via/keymap.c b/keyboards/monokei/mnk1800s/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mnk1800s/keymaps/via/keymap.c
rename to keyboards/monokei/mnk1800s/keymaps/via/keymap.c
diff --git a/keyboards/mnk1800s/keymaps/via/readme.md b/keyboards/monokei/mnk1800s/keymaps/via/readme.md
similarity index 100%
rename from keyboards/mnk1800s/keymaps/via/readme.md
rename to keyboards/monokei/mnk1800s/keymaps/via/readme.md
diff --git a/keyboards/mnk1800s/keymaps/via/rules.mk b/keyboards/monokei/mnk1800s/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mnk1800s/keymaps/via/rules.mk
rename to keyboards/monokei/mnk1800s/keymaps/via/rules.mk
diff --git a/keyboards/mnk1800s/matrix_diagram.md b/keyboards/monokei/mnk1800s/matrix_diagram.md
similarity index 100%
rename from keyboards/mnk1800s/matrix_diagram.md
rename to keyboards/monokei/mnk1800s/matrix_diagram.md
diff --git a/keyboards/mnk1800s/readme.md b/keyboards/monokei/mnk1800s/readme.md
similarity index 87%
rename from keyboards/mnk1800s/readme.md
rename to keyboards/monokei/mnk1800s/readme.md
index eb4e1b0ef59..610baba72bc 100755
--- a/keyboards/mnk1800s/readme.md
+++ b/keyboards/monokei/mnk1800s/readme.md
@@ -12,7 +12,7 @@ This is a southpaw 65% keyboard. It supports VIA.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mnk1800s:default
+    make monokei/mnk1800s: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).
 
@@ -29,4 +29,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 - Unplug
 - Hold Escape
 - Plug In
-- Flash using QMK Toolbox or CLI (`make mnk1800s:<keymap>:flash`)
+- Flash using QMK Toolbox or CLI (`make monokei/mnk1800s:<keymap>:flash`)
diff --git a/keyboards/mnk1800s/rules.mk b/keyboards/monokei/mnk1800s/rules.mk
similarity index 100%
rename from keyboards/mnk1800s/rules.mk
rename to keyboards/monokei/mnk1800s/rules.mk
diff --git a/keyboards/mnk50/config.h b/keyboards/monokei/mnk50/config.h
similarity index 100%
rename from keyboards/mnk50/config.h
rename to keyboards/monokei/mnk50/config.h
diff --git a/keyboards/mnk50/info.json b/keyboards/monokei/mnk50/info.json
similarity index 100%
rename from keyboards/mnk50/info.json
rename to keyboards/monokei/mnk50/info.json
diff --git a/keyboards/mnk50/keymaps/default/keymap.c b/keyboards/monokei/mnk50/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mnk50/keymaps/default/keymap.c
rename to keyboards/monokei/mnk50/keymaps/default/keymap.c
diff --git a/keyboards/mnk50/keymaps/default/readme.md b/keyboards/monokei/mnk50/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mnk50/keymaps/default/readme.md
rename to keyboards/monokei/mnk50/keymaps/default/readme.md
diff --git a/keyboards/mnk50/keymaps/via/keymap.c b/keyboards/monokei/mnk50/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mnk50/keymaps/via/keymap.c
rename to keyboards/monokei/mnk50/keymaps/via/keymap.c
diff --git a/keyboards/mnk50/keymaps/via/readme.md b/keyboards/monokei/mnk50/keymaps/via/readme.md
similarity index 100%
rename from keyboards/mnk50/keymaps/via/readme.md
rename to keyboards/monokei/mnk50/keymaps/via/readme.md
diff --git a/keyboards/mnk50/keymaps/via/rules.mk b/keyboards/monokei/mnk50/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mnk50/keymaps/via/rules.mk
rename to keyboards/monokei/mnk50/keymaps/via/rules.mk
diff --git a/keyboards/mnk50/readme.md b/keyboards/monokei/mnk50/readme.md
similarity index 88%
rename from keyboards/mnk50/readme.md
rename to keyboards/monokei/mnk50/readme.md
index f8484e9d36d..ebbe44378b7 100755
--- a/keyboards/mnk50/readme.md
+++ b/keyboards/monokei/mnk50/readme.md
@@ -12,7 +12,7 @@ This is a 40% keyboard. It supports VIA.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mnk50:default
+    make monokei/mnk50: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).
 
@@ -29,4 +29,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 - Unplug
 - Hold Escape
 - Plug In
-- Flash using QMK Toolbox or CLI (`make mnk50:<keymap>:flash`)
+- Flash using QMK Toolbox or CLI (`make monokei/mnk50:<keymap>:flash`)
diff --git a/keyboards/mnk50/rules.mk b/keyboards/monokei/mnk50/rules.mk
similarity index 100%
rename from keyboards/mnk50/rules.mk
rename to keyboards/monokei/mnk50/rules.mk
diff --git a/keyboards/mnk75/config.h b/keyboards/monokei/mnk75/config.h
similarity index 100%
rename from keyboards/mnk75/config.h
rename to keyboards/monokei/mnk75/config.h
diff --git a/keyboards/mnk75/info.json b/keyboards/monokei/mnk75/info.json
similarity index 100%
rename from keyboards/mnk75/info.json
rename to keyboards/monokei/mnk75/info.json
diff --git a/keyboards/mnk75/keymaps/default/keymap.c b/keyboards/monokei/mnk75/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mnk75/keymaps/default/keymap.c
rename to keyboards/monokei/mnk75/keymaps/default/keymap.c
diff --git a/keyboards/mnk75/keymaps/default/readme.md b/keyboards/monokei/mnk75/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mnk75/keymaps/default/readme.md
rename to keyboards/monokei/mnk75/keymaps/default/readme.md
diff --git a/keyboards/mnk75/keymaps/via/keymap.c b/keyboards/monokei/mnk75/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mnk75/keymaps/via/keymap.c
rename to keyboards/monokei/mnk75/keymaps/via/keymap.c
diff --git a/keyboards/mnk75/keymaps/via/readme.md b/keyboards/monokei/mnk75/keymaps/via/readme.md
similarity index 100%
rename from keyboards/mnk75/keymaps/via/readme.md
rename to keyboards/monokei/mnk75/keymaps/via/readme.md
diff --git a/keyboards/mnk75/keymaps/via/rules.mk b/keyboards/monokei/mnk75/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mnk75/keymaps/via/rules.mk
rename to keyboards/monokei/mnk75/keymaps/via/rules.mk
diff --git a/keyboards/mnk75/matrix_diagram.md b/keyboards/monokei/mnk75/matrix_diagram.md
similarity index 100%
rename from keyboards/mnk75/matrix_diagram.md
rename to keyboards/monokei/mnk75/matrix_diagram.md
diff --git a/keyboards/mnk75/readme.md b/keyboards/monokei/mnk75/readme.md
similarity index 88%
rename from keyboards/mnk75/readme.md
rename to keyboards/monokei/mnk75/readme.md
index 631ca246e7a..4e34f5257f7 100755
--- a/keyboards/mnk75/readme.md
+++ b/keyboards/monokei/mnk75/readme.md
@@ -12,7 +12,7 @@ This is a 75% layout PCB. It supports VIA.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mnk75:default
+    make monokei/mnk75: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).
 
@@ -29,4 +29,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
 - Unplug
 - Hold Escape
 - Plug In
-- Flash using QMK Toolbox or CLI (`make mnk75:<keymap>:flash`)
+- Flash using QMK Toolbox or CLI (`make monokei/mnk75:<keymap>:flash`)
diff --git a/keyboards/mnk75/rules.mk b/keyboards/monokei/mnk75/rules.mk
similarity index 100%
rename from keyboards/mnk75/rules.mk
rename to keyboards/monokei/mnk75/rules.mk