diff --git a/keyboards/ergo42/.noci b/keyboards/biacco42/ergo42/.noci
similarity index 100%
rename from keyboards/ergo42/.noci
rename to keyboards/biacco42/ergo42/.noci
diff --git a/keyboards/ergo42/config.h b/keyboards/biacco42/ergo42/config.h
similarity index 100%
rename from keyboards/ergo42/config.h
rename to keyboards/biacco42/ergo42/config.h
diff --git a/keyboards/ergo42/ergo42.c b/keyboards/biacco42/ergo42/ergo42.c
similarity index 100%
rename from keyboards/ergo42/ergo42.c
rename to keyboards/biacco42/ergo42/ergo42.c
diff --git a/keyboards/ergo42/ergo42.h b/keyboards/biacco42/ergo42/ergo42.h
similarity index 63%
rename from keyboards/ergo42/ergo42.h
rename to keyboards/biacco42/ergo42/ergo42.h
index 656b211308a5..265e605e6c1b 100644
--- a/keyboards/ergo42/ergo42.h
+++ b/keyboards/biacco42/ergo42/ergo42.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_ergo42_rev1
+#ifdef KEYBOARD_biacco42_ergo42_rev1
     #include "rev1.h"
 #endif
diff --git a/keyboards/ergo42/info.json b/keyboards/biacco42/ergo42/info.json
similarity index 100%
rename from keyboards/ergo42/info.json
rename to keyboards/biacco42/ergo42/info.json
diff --git a/keyboards/ergo42/keymaps/biacco-biacco/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-biacco/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco-biacco/config.h
diff --git a/keyboards/ergo42/keymaps/biacco-biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-biacco/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco-biacco/keymap.c
diff --git a/keyboards/ergo42/keymaps/biacco-macOS/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-macOS/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco-macOS/config.h
diff --git a/keyboards/ergo42/keymaps/biacco-macOS/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-macOS/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco-macOS/keymap.c
diff --git a/keyboards/ergo42/keymaps/biacco-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-underglow/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco-underglow/config.h
diff --git a/keyboards/ergo42/keymaps/biacco-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-underglow/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco-underglow/keymap.c
diff --git a/keyboards/ergo42/keymaps/biacco-underglow/rules.mk b/keyboards/biacco42/ergo42/keymaps/biacco-underglow/rules.mk
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-underglow/rules.mk
rename to keyboards/biacco42/ergo42/keymaps/biacco-underglow/rules.mk
diff --git a/keyboards/ergo42/keymaps/biacco-winjp/config.h b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-winjp/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco-winjp/config.h
diff --git a/keyboards/ergo42/keymaps/biacco-winjp/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco-winjp/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco-winjp/keymap.c
diff --git a/keyboards/ergo42/keymaps/biacco/config.h b/keyboards/biacco42/ergo42/keymaps/biacco/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco/config.h
rename to keyboards/biacco42/ergo42/keymaps/biacco/config.h
diff --git a/keyboards/ergo42/keymaps/biacco/keymap.c b/keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/biacco/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/biacco/keymap.c
diff --git a/keyboards/ergo42/keymaps/default-illustrator/config.h b/keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/default-illustrator/config.h
rename to keyboards/biacco42/ergo42/keymaps/default-illustrator/config.h
diff --git a/keyboards/ergo42/keymaps/default-illustrator/keymap.c b/keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/default-illustrator/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/default-illustrator/keymap.c
diff --git a/keyboards/ergo42/keymaps/default-underglow/config.h b/keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/default-underglow/config.h
rename to keyboards/biacco42/ergo42/keymaps/default-underglow/config.h
diff --git a/keyboards/ergo42/keymaps/default-underglow/keymap.c b/keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/default-underglow/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/default-underglow/keymap.c
diff --git a/keyboards/ergo42/keymaps/default-underglow/rules.mk b/keyboards/biacco42/ergo42/keymaps/default-underglow/rules.mk
similarity index 100%
rename from keyboards/ergo42/keymaps/default-underglow/rules.mk
rename to keyboards/biacco42/ergo42/keymaps/default-underglow/rules.mk
diff --git a/keyboards/ergo42/keymaps/default/config.h b/keyboards/biacco42/ergo42/keymaps/default/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/default/config.h
rename to keyboards/biacco42/ergo42/keymaps/default/config.h
diff --git a/keyboards/ergo42/keymaps/default/keymap.c b/keyboards/biacco42/ergo42/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/default/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/default/keymap.c
diff --git a/keyboards/ergo42/keymaps/hdbx/config.h b/keyboards/biacco42/ergo42/keymaps/hdbx/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/hdbx/config.h
rename to keyboards/biacco42/ergo42/keymaps/hdbx/config.h
diff --git a/keyboards/ergo42/keymaps/hdbx/keymap.c b/keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/hdbx/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/hdbx/keymap.c
diff --git a/keyboards/ergo42/keymaps/hdbx/readme.md b/keyboards/biacco42/ergo42/keymaps/hdbx/readme.md
similarity index 100%
rename from keyboards/ergo42/keymaps/hdbx/readme.md
rename to keyboards/biacco42/ergo42/keymaps/hdbx/readme.md
diff --git a/keyboards/ergo42/keymaps/ichi-t/config.h b/keyboards/biacco42/ergo42/keymaps/ichi-t/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/ichi-t/config.h
rename to keyboards/biacco42/ergo42/keymaps/ichi-t/config.h
diff --git a/keyboards/ergo42/keymaps/ichi-t/keymap.c b/keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/ichi-t/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/ichi-t/keymap.c
diff --git a/keyboards/ergo42/keymaps/koba/config.h b/keyboards/biacco42/ergo42/keymaps/koba/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/koba/config.h
rename to keyboards/biacco42/ergo42/keymaps/koba/config.h
diff --git a/keyboards/ergo42/keymaps/koba/keymap.c b/keyboards/biacco42/ergo42/keymaps/koba/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/koba/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/koba/keymap.c
diff --git a/keyboards/ergo42/keymaps/koba/readme.md b/keyboards/biacco42/ergo42/keymaps/koba/readme.md
similarity index 100%
rename from keyboards/ergo42/keymaps/koba/readme.md
rename to keyboards/biacco42/ergo42/keymaps/koba/readme.md
diff --git a/keyboards/ergo42/keymaps/koba/readme_ja.md b/keyboards/biacco42/ergo42/keymaps/koba/readme_ja.md
similarity index 100%
rename from keyboards/ergo42/keymaps/koba/readme_ja.md
rename to keyboards/biacco42/ergo42/keymaps/koba/readme_ja.md
diff --git a/keyboards/ergo42/keymaps/shinze/config.h b/keyboards/biacco42/ergo42/keymaps/shinze/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/shinze/config.h
rename to keyboards/biacco42/ergo42/keymaps/shinze/config.h
diff --git a/keyboards/ergo42/keymaps/shinze/keymap.c b/keyboards/biacco42/ergo42/keymaps/shinze/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/shinze/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/shinze/keymap.c
diff --git a/keyboards/ergo42/keymaps/yshrsmz/config.h b/keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h
similarity index 100%
rename from keyboards/ergo42/keymaps/yshrsmz/config.h
rename to keyboards/biacco42/ergo42/keymaps/yshrsmz/config.h
diff --git a/keyboards/ergo42/keymaps/yshrsmz/keymap.c b/keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
similarity index 100%
rename from keyboards/ergo42/keymaps/yshrsmz/keymap.c
rename to keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
diff --git a/keyboards/ergo42/keymaps/yshrsmz/rules.mk b/keyboards/biacco42/ergo42/keymaps/yshrsmz/rules.mk
similarity index 100%
rename from keyboards/ergo42/keymaps/yshrsmz/rules.mk
rename to keyboards/biacco42/ergo42/keymaps/yshrsmz/rules.mk
diff --git a/keyboards/ergo42/readme.md b/keyboards/biacco42/ergo42/readme.md
similarity index 95%
rename from keyboards/ergo42/readme.md
rename to keyboards/biacco42/ergo42/readme.md
index c43b47382b27..778c64a99f04 100644
--- a/keyboards/ergo42/readme.md
+++ b/keyboards/biacco42/ergo42/readme.md
@@ -11,6 +11,6 @@ A split 7x4 ortholinear keyboard. [Hardware project repo](https://github.com/Bia
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergo42/rev1:default:flash
+    make biacco42/ergo42/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/ergo42/rev1/config.h b/keyboards/biacco42/ergo42/rev1/config.h
similarity index 100%
rename from keyboards/ergo42/rev1/config.h
rename to keyboards/biacco42/ergo42/rev1/config.h
diff --git a/keyboards/ergo42/rev1/rev1.c b/keyboards/biacco42/ergo42/rev1/rev1.c
similarity index 100%
rename from keyboards/ergo42/rev1/rev1.c
rename to keyboards/biacco42/ergo42/rev1/rev1.c
diff --git a/keyboards/ergo42/rev1/rev1.h b/keyboards/biacco42/ergo42/rev1/rev1.h
similarity index 100%
rename from keyboards/ergo42/rev1/rev1.h
rename to keyboards/biacco42/ergo42/rev1/rev1.h
diff --git a/keyboards/ergo42/rev1/rules.mk b/keyboards/biacco42/ergo42/rev1/rules.mk
similarity index 100%
rename from keyboards/ergo42/rev1/rules.mk
rename to keyboards/biacco42/ergo42/rev1/rules.mk
diff --git a/keyboards/ergo42/rules.mk b/keyboards/biacco42/ergo42/rules.mk
similarity index 94%
rename from keyboards/ergo42/rules.mk
rename to keyboards/biacco42/ergo42/rules.mk
index 2225bdcb5999..9420c9b4eb9f 100644
--- a/keyboards/ergo42/rules.mk
+++ b/keyboards/biacco42/ergo42/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = ergo42/rev1
+DEFAULT_FOLDER = biacco42/ergo42/rev1
diff --git a/keyboards/meishi/config.h b/keyboards/biacco42/meishi/config.h
similarity index 100%
rename from keyboards/meishi/config.h
rename to keyboards/biacco42/meishi/config.h
diff --git a/keyboards/meishi/info.json b/keyboards/biacco42/meishi/info.json
similarity index 100%
rename from keyboards/meishi/info.json
rename to keyboards/biacco42/meishi/info.json
diff --git a/keyboards/meishi/keymaps/default/keymap.c b/keyboards/biacco42/meishi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/meishi/keymaps/default/keymap.c
rename to keyboards/biacco42/meishi/keymaps/default/keymap.c
diff --git a/keyboards/meishi/keymaps/default/readme.md b/keyboards/biacco42/meishi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/meishi/keymaps/default/readme.md
rename to keyboards/biacco42/meishi/keymaps/default/readme.md
diff --git a/keyboards/meishi/meishi.c b/keyboards/biacco42/meishi/meishi.c
similarity index 100%
rename from keyboards/meishi/meishi.c
rename to keyboards/biacco42/meishi/meishi.c
diff --git a/keyboards/meishi/meishi.h b/keyboards/biacco42/meishi/meishi.h
similarity index 100%
rename from keyboards/meishi/meishi.h
rename to keyboards/biacco42/meishi/meishi.h
diff --git a/keyboards/meishi/readme.md b/keyboards/biacco42/meishi/readme.md
similarity index 94%
rename from keyboards/meishi/readme.md
rename to keyboards/biacco42/meishi/readme.md
index 99421ed8d33d..4648c14b4daf 100644
--- a/keyboards/meishi/readme.md
+++ b/keyboards/biacco42/meishi/readme.md
@@ -13,7 +13,7 @@ Hardware Availability: [Tanoshi life - Booth](https://biacco42.booth.pm/)
 Make example for this keyboard (after setting up your build environment):
 
 ```
-$ make meishi:default:avrdude
+$ make biacco42/meishi:default:avrdude
 ```
 
 See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
diff --git a/keyboards/meishi/rules.mk b/keyboards/biacco42/meishi/rules.mk
similarity index 100%
rename from keyboards/meishi/rules.mk
rename to keyboards/biacco42/meishi/rules.mk
diff --git a/keyboards/meishi2/config.h b/keyboards/biacco42/meishi2/config.h
similarity index 100%
rename from keyboards/meishi2/config.h
rename to keyboards/biacco42/meishi2/config.h
diff --git a/keyboards/meishi2/info.json b/keyboards/biacco42/meishi2/info.json
similarity index 100%
rename from keyboards/meishi2/info.json
rename to keyboards/biacco42/meishi2/info.json
diff --git a/keyboards/meishi2/keymaps/default/keymap.c b/keyboards/biacco42/meishi2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/meishi2/keymaps/default/keymap.c
rename to keyboards/biacco42/meishi2/keymaps/default/keymap.c
diff --git a/keyboards/meishi2/keymaps/default/readme.md b/keyboards/biacco42/meishi2/keymaps/default/readme.md
similarity index 100%
rename from keyboards/meishi2/keymaps/default/readme.md
rename to keyboards/biacco42/meishi2/keymaps/default/readme.md
diff --git a/keyboards/meishi2/keymaps/led_status/keymap.c b/keyboards/biacco42/meishi2/keymaps/led_status/keymap.c
similarity index 100%
rename from keyboards/meishi2/keymaps/led_status/keymap.c
rename to keyboards/biacco42/meishi2/keymaps/led_status/keymap.c
diff --git a/keyboards/meishi2/keymaps/led_status/readme.md b/keyboards/biacco42/meishi2/keymaps/led_status/readme.md
similarity index 100%
rename from keyboards/meishi2/keymaps/led_status/readme.md
rename to keyboards/biacco42/meishi2/keymaps/led_status/readme.md
diff --git a/keyboards/meishi2/keymaps/moc/config.h b/keyboards/biacco42/meishi2/keymaps/moc/config.h
similarity index 100%
rename from keyboards/meishi2/keymaps/moc/config.h
rename to keyboards/biacco42/meishi2/keymaps/moc/config.h
diff --git a/keyboards/meishi2/keymaps/moc/keymap.c b/keyboards/biacco42/meishi2/keymaps/moc/keymap.c
similarity index 100%
rename from keyboards/meishi2/keymaps/moc/keymap.c
rename to keyboards/biacco42/meishi2/keymaps/moc/keymap.c
diff --git a/keyboards/meishi2/keymaps/moc/readme.md b/keyboards/biacco42/meishi2/keymaps/moc/readme.md
similarity index 100%
rename from keyboards/meishi2/keymaps/moc/readme.md
rename to keyboards/biacco42/meishi2/keymaps/moc/readme.md
diff --git a/keyboards/meishi2/keymaps/via/keymap.c b/keyboards/biacco42/meishi2/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/meishi2/keymaps/via/keymap.c
rename to keyboards/biacco42/meishi2/keymaps/via/keymap.c
diff --git a/keyboards/meishi2/keymaps/via/rules.mk b/keyboards/biacco42/meishi2/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/meishi2/keymaps/via/rules.mk
rename to keyboards/biacco42/meishi2/keymaps/via/rules.mk
diff --git a/keyboards/meishi2/meishi2.c b/keyboards/biacco42/meishi2/meishi2.c
similarity index 100%
rename from keyboards/meishi2/meishi2.c
rename to keyboards/biacco42/meishi2/meishi2.c
diff --git a/keyboards/meishi2/meishi2.h b/keyboards/biacco42/meishi2/meishi2.h
similarity index 100%
rename from keyboards/meishi2/meishi2.h
rename to keyboards/biacco42/meishi2/meishi2.h
diff --git a/keyboards/meishi2/readme.md b/keyboards/biacco42/meishi2/readme.md
similarity index 95%
rename from keyboards/meishi2/readme.md
rename to keyboards/biacco42/meishi2/readme.md
index d80ec44184ae..97c5465f8660 100644
--- a/keyboards/meishi2/readme.md
+++ b/keyboards/biacco42/meishi2/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: [links to where you can find this hardware](https://githu
 
 Make example for this keyboard (after setting up your build environment):
 
-    make meishi2:default
+    make biacco42/meishi2: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/meishi2/rules.mk b/keyboards/biacco42/meishi2/rules.mk
similarity index 100%
rename from keyboards/meishi2/rules.mk
rename to keyboards/biacco42/meishi2/rules.mk