83 files changed, 94 insertions, 10 deletions
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index eb12b54a2e..6341c28bcc 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"
@@ -494,6 +521,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"
     },
diff --git a/keyboards/kudox/columner/config.h b/keyboards/kumaokobo/kudox/columner/config.h
index 04bc8cb2d2..04bc8cb2d2 100644
--- a/keyboards/kudox/columner/config.h
+++ b/keyboards/kumaokobo/kudox/columner/config.h
diff --git a/keyboards/kudox/columner/info.json b/keyboards/kumaokobo/kudox/columner/info.json
index 5f7d444411..5f7d444411 100644
--- a/keyboards/kudox/columner/info.json
+++ b/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
index 7bbdd02c76..4798f862df 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
index 13d9e8bee1..13d9e8bee1 100644
--- a/keyboards/kudox/columner/keymaps/default/readme.md
+++ b/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
index 1906df1084..8450881cc4 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
index 152df04959..152df04959 100644
--- a/keyboards/kudox/columner/keymaps/via/readme.md
+++ b/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
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/kudox/columner/keymaps/via/rules.mk
+++ b/keyboards/kumaokobo/kudox/columner/keymaps/via/rules.mk
diff --git a/keyboards/kudox/columner/readme.md b/keyboards/kumaokobo/kudox/columner/readme.md
index 0c62174bcf..90a65670b4 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
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/kudox/columner/rules.mk
+++ b/keyboards/kumaokobo/kudox/columner/rules.mk
diff --git a/keyboards/kudox/config.h b/keyboards/kumaokobo/kudox/config.h
index ba80a92797..ba80a92797 100644
--- a/keyboards/kudox/config.h
+++ b/keyboards/kumaokobo/kudox/config.h
diff --git a/keyboards/kudox/readme.md b/keyboards/kumaokobo/kudox/readme.md
index 107b99b100..01b90d53be 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
index 666cb49b2e..666cb49b2e 100644
--- a/keyboards/kudox/rev1/config.h
+++ b/keyboards/kumaokobo/kudox/rev1/config.h
diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kumaokobo/kudox/rev1/info.json
index 52579e1c43..52579e1c43 100644
--- a/keyboards/kudox/rev1/info.json
+++ b/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
index 1a3bfa4fff..b3d183e72b 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
index 98d8b2a054..98d8b2a054 100644
--- a/keyboards/kudox/rev1/keymaps/default/readme.md
+++ b/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
index a58c5cbd65..26bc89abbd 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
index 0f3fae39f7..0f3fae39f7 100644
--- a/keyboards/kudox/rev1/keymaps/jis/readme.md
+++ b/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
index 982f98b295..aef3892f58 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
index 1085735afc..1085735afc 100644
--- a/keyboards/kudox/rev1/keymaps/x1/readme.md
+++ b/keyboards/kumaokobo/kudox/rev1/keymaps/x1/readme.md
diff --git a/keyboards/kudox/rev1/rules.mk b/keyboards/kumaokobo/kudox/rev1/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/kudox/rev1/rules.mk
+++ b/keyboards/kumaokobo/kudox/rev1/rules.mk
diff --git a/keyboards/kudox/rev2/config.h b/keyboards/kumaokobo/kudox/rev2/config.h
index 666cb49b2e..666cb49b2e 100644
--- a/keyboards/kudox/rev2/config.h
+++ b/keyboards/kumaokobo/kudox/rev2/config.h
diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kumaokobo/kudox/rev2/info.json
index 98cb6bb431..98cb6bb431 100644
--- a/keyboards/kudox/rev2/info.json
+++ b/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
index d078683d9c..29ddd15fa1 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
index 9bc4ca5051..9bc4ca5051 100644
--- a/keyboards/kudox/rev2/keymaps/default/readme.md
+++ b/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
index b588fea6ad..c581ddb8f1 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
index ddf27339d1..ddf27339d1 100644
--- a/keyboards/kudox/rev2/keymaps/jis/readme.md
+++ b/keyboards/kumaokobo/kudox/rev2/keymaps/jis/readme.md
diff --git a/keyboards/kudox/rev2/rules.mk b/keyboards/kumaokobo/kudox/rev2/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/kudox/rev2/rules.mk
+++ b/keyboards/kumaokobo/kudox/rev2/rules.mk
diff --git a/keyboards/kudox/rev3/config.h b/keyboards/kumaokobo/kudox/rev3/config.h
index 04bc8cb2d2..04bc8cb2d2 100644
--- a/keyboards/kudox/rev3/config.h
+++ b/keyboards/kumaokobo/kudox/rev3/config.h
diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kumaokobo/kudox/rev3/info.json
index 35144cc25a..35144cc25a 100644
--- a/keyboards/kudox/rev3/info.json
+++ b/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
index 45e40630c6..bf89d895f5 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
index aead0ad1f1..aead0ad1f1 100644
--- a/keyboards/kudox/rev3/keymaps/default/readme.md
+++ b/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
index 72f4c04c30..f53d40063b 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
index 90e7902153..90e7902153 100644
--- a/keyboards/kudox/rev3/keymaps/jis/readme.md
+++ b/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
index 9dfbe81701..2609e87723 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
index cc95d79eac..cc95d79eac 100644
--- a/keyboards/kudox/rev3/keymaps/via/readme.md
+++ b/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
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/kudox/rev3/keymaps/via/rules.mk
+++ b/keyboards/kumaokobo/kudox/rev3/keymaps/via/rules.mk
diff --git a/keyboards/kudox/rev3/rules.mk b/keyboards/kumaokobo/kudox/rev3/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/kudox/rev3/rules.mk
+++ b/keyboards/kumaokobo/kudox/rev3/rules.mk
diff --git a/keyboards/kudox/rules.mk b/keyboards/kumaokobo/kudox/rules.mk
index 8654d9b520..8654d9b520 100644
--- a/keyboards/kudox/rules.mk
+++ b/keyboards/kumaokobo/kudox/rules.mk
diff --git a/keyboards/kudox_full/config.h b/keyboards/kumaokobo/kudox_full/config.h
index 9512ffea8a..9512ffea8a 100644
--- a/keyboards/kudox_full/config.h
+++ b/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
index c4fe5ff988..c4fe5ff988 100644
--- a/keyboards/kudox_full/keymaps/default/keymap.c
+++ b/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
index aa55fa50a4..aa55fa50a4 100644
--- a/keyboards/kudox_full/keymaps/jis/keymap.c
+++ b/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
index cab5519d5b..cab5519d5b 100644
--- a/keyboards/kudox_full/keymaps/via/keymap.c
+++ b/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
index 21b1b8d0ce..21b1b8d0ce 100644
--- a/keyboards/kudox_full/keymaps/via/rules.mk
+++ b/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
index d69f679822..d69f679822 100644
--- a/keyboards/kudox_full/kudox_full.c
+++ b/keyboards/kumaokobo/kudox_full/kudox_full.c
diff --git a/keyboards/kudox_full/post_config.h b/keyboards/kumaokobo/kudox_full/post_config.h
index eb26f369c3..eb26f369c3 100644
--- a/keyboards/kudox_full/post_config.h
+++ b/keyboards/kumaokobo/kudox_full/post_config.h
diff --git a/keyboards/kudox_full/readme.md b/keyboards/kumaokobo/kudox_full/readme.md
index 494d7508c8..c5af5d652d 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
index f1dcbbcf3d..f1dcbbcf3d 100644
--- a/keyboards/kudox_full/rev1/config.h
+++ b/keyboards/kumaokobo/kudox_full/rev1/config.h
diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kumaokobo/kudox_full/rev1/info.json
index 673fda9acf..673fda9acf 100644
--- a/keyboards/kudox_full/rev1/info.json
+++ b/keyboards/kumaokobo/kudox_full/rev1/info.json
diff --git a/keyboards/kudox_full/rev1/rules.mk b/keyboards/kumaokobo/kudox_full/rev1/rules.mk
index dd68e9d3b0..dd68e9d3b0 100644
--- a/keyboards/kudox_full/rev1/rules.mk
+++ b/keyboards/kumaokobo/kudox_full/rev1/rules.mk
diff --git a/keyboards/kudox_full/rules.mk b/keyboards/kumaokobo/kudox_full/rules.mk
index cbdafb7a5c..cbdafb7a5c 100644
--- a/keyboards/kudox_full/rules.mk
+++ b/keyboards/kumaokobo/kudox_full/rules.mk
diff --git a/keyboards/kudox_game/config.h b/keyboards/kumaokobo/kudox_game/config.h
index f998de9534..f998de9534 100644
--- a/keyboards/kudox_game/config.h
+++ b/keyboards/kumaokobo/kudox_game/config.h
diff --git a/keyboards/kudox_game/info.json b/keyboards/kumaokobo/kudox_game/info.json
index 6968b5e427..6968b5e427 100644
--- a/keyboards/kudox_game/info.json
+++ b/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
index aecf8976c2..99e664138f 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
index 0fbdb86a94..0fbdb86a94 100644
--- a/keyboards/kudox_game/keymaps/default/readme.md
+++ b/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
index 0a18483d90..b0722bf470 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
index 203474736c..203474736c 100644
--- a/keyboards/kudox_game/keymaps/via/readme.md
+++ b/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
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/kudox_game/keymaps/via/rules.mk
+++ b/keyboards/kumaokobo/kudox_game/keymaps/via/rules.mk
diff --git a/keyboards/kudox_game/readme.md b/keyboards/kumaokobo/kudox_game/readme.md
index 31565a5996..6e06be159c 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
index b0b9607f4b..b0b9607f4b 100644
--- a/keyboards/kudox_game/rev1/config.h
+++ b/keyboards/kumaokobo/kudox_game/rev1/config.h
diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kumaokobo/kudox_game/rev1/info.json
index e5c39fce31..e5c39fce31 100644
--- a/keyboards/kudox_game/rev1/info.json
+++ b/keyboards/kumaokobo/kudox_game/rev1/info.json
diff --git a/keyboards/kudox_game/rev1/rules.mk b/keyboards/kumaokobo/kudox_game/rev1/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/kudox_game/rev1/rules.mk
+++ b/keyboards/kumaokobo/kudox_game/rev1/rules.mk
diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kumaokobo/kudox_game/rev2/config.h
index 37fde91599..37fde91599 100644
--- a/keyboards/kudox_game/rev2/config.h
+++ b/keyboards/kumaokobo/kudox_game/rev2/config.h
diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kumaokobo/kudox_game/rev2/info.json
index e811c70d5b..e811c70d5b 100644
--- a/keyboards/kudox_game/rev2/info.json
+++ b/keyboards/kumaokobo/kudox_game/rev2/info.json
diff --git a/keyboards/kudox_game/rev2/rules.mk b/keyboards/kumaokobo/kudox_game/rev2/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/kudox_game/rev2/rules.mk
+++ b/keyboards/kumaokobo/kudox_game/rev2/rules.mk
diff --git a/keyboards/kudox_game/rules.mk b/keyboards/kumaokobo/kudox_game/rules.mk
index 762675efe1..762675efe1 100644
--- a/keyboards/kudox_game/rules.mk
+++ b/keyboards/kumaokobo/kudox_game/rules.mk
diff --git a/keyboards/pico/65keys/config.h b/keyboards/kumaokobo/pico/65keys/config.h
index 04bc8cb2d2..04bc8cb2d2 100644
--- a/keyboards/pico/65keys/config.h
+++ b/keyboards/kumaokobo/pico/65keys/config.h
diff --git a/keyboards/pico/65keys/info.json b/keyboards/kumaokobo/pico/65keys/info.json
index 260b2db1e9..260b2db1e9 100644
--- a/keyboards/pico/65keys/info.json
+++ b/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
index eb0ea05fc2..15e0ff3168 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
index 9f8fa53ebf..9f8fa53ebf 100644
--- a/keyboards/pico/65keys/keymaps/default/readme.md
+++ b/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
index 9f3f640f01..94767aef90 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
index 49d2aa7b7a..49d2aa7b7a 100644
--- a/keyboards/pico/65keys/keymaps/jis/readme.md
+++ b/keyboards/kumaokobo/pico/65keys/keymaps/jis/readme.md
diff --git a/keyboards/pico/65keys/rules.mk b/keyboards/kumaokobo/pico/65keys/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/pico/65keys/rules.mk
+++ b/keyboards/kumaokobo/pico/65keys/rules.mk
diff --git a/keyboards/pico/70keys/config.h b/keyboards/kumaokobo/pico/70keys/config.h
index 04bc8cb2d2..04bc8cb2d2 100644
--- a/keyboards/pico/70keys/config.h
+++ b/keyboards/kumaokobo/pico/70keys/config.h
diff --git a/keyboards/pico/70keys/info.json b/keyboards/kumaokobo/pico/70keys/info.json
index ed3c8163d1..ed3c8163d1 100644
--- a/keyboards/pico/70keys/info.json
+++ b/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
index 3c3ab50c17..fa14063d4b 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
index 0b9a978d7d..0b9a978d7d 100644
--- a/keyboards/pico/70keys/keymaps/default/readme.md
+++ b/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
index 5727cb7841..2d9414cced 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
index dda39dfb82..dda39dfb82 100644
--- a/keyboards/pico/70keys/keymaps/jis/readme.md
+++ b/keyboards/kumaokobo/pico/70keys/keymaps/jis/readme.md
diff --git a/keyboards/pico/70keys/rules.mk b/keyboards/kumaokobo/pico/70keys/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/pico/70keys/rules.mk
+++ b/keyboards/kumaokobo/pico/70keys/rules.mk
diff --git a/keyboards/pico/config.h b/keyboards/kumaokobo/pico/config.h
index ba80a92797..ba80a92797 100644
--- a/keyboards/pico/config.h
+++ b/keyboards/kumaokobo/pico/config.h
diff --git a/keyboards/pico/readme.md b/keyboards/kumaokobo/pico/readme.md
index 891bb174fe..b54c42941e 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
index fac3912a25..fac3912a25 100644
--- a/keyboards/pico/rules.mk
+++ b/keyboards/kumaokobo/pico/rules.mk