Move to organization folder (#15481)

* move directory

* fix

* move wings42 to dailycraft

* Adjust wings42 to work with organization folder.

87 files changed, 84 insertions, 33 deletions

diff --git a/keyboards/bat43/.noci b/keyboards/dailycraft/bat43/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/bat43/.noci
+++ b/keyboards/dailycraft/bat43/.noci
diff --git a/keyboards/bat43/bat43.c b/keyboards/dailycraft/bat43/bat43.c
index 5d52c672b6..5d52c672b6 100644
--- a/keyboards/bat43/bat43.c
+++ b/keyboards/dailycraft/bat43/bat43.c
diff --git a/keyboards/bat43/bat43.h b/keyboards/dailycraft/bat43/bat43.h
index 42d44107b4..046788a0a1 100644
--- a/keyboards/bat43/bat43.h
+++ b/keyboards/dailycraft/bat43/bat43.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#ifdef KEYBOARD_bat43_rev1
+#ifdef KEYBOARD_dailycraft_bat43_rev1
     #include "rev1.h"
 #endif
-#ifdef KEYBOARD_bat43_rev2
+#ifdef KEYBOARD_dailycraft_bat43_rev2
     #include "rev2.h"
 #endif
 
diff --git a/keyboards/bat43/config.h b/keyboards/dailycraft/bat43/config.h
index 19b485fd16..19b485fd16 100644
--- a/keyboards/bat43/config.h
+++ b/keyboards/dailycraft/bat43/config.h
diff --git a/keyboards/bat43/keymaps/default/keymap.c b/keyboards/dailycraft/bat43/keymaps/default/keymap.c
index 5e4faccf98..5e4faccf98 100644
--- a/keyboards/bat43/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/bat43/keymaps/default/keymap.c
diff --git a/keyboards/bat43/keymaps/default/readme.md b/keyboards/dailycraft/bat43/keymaps/default/readme.md
index f72376d89e..f72376d89e 100644
--- a/keyboards/bat43/keymaps/default/readme.md
+++ b/keyboards/dailycraft/bat43/keymaps/default/readme.md
diff --git a/keyboards/bat43/keymaps/via/keymap.c b/keyboards/dailycraft/bat43/keymaps/via/keymap.c
index 0bd07b6017..0bd07b6017 100644
--- a/keyboards/bat43/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/bat43/keymaps/via/keymap.c
diff --git a/keyboards/bat43/keymaps/via/readme.md b/keyboards/dailycraft/bat43/keymaps/via/readme.md
index f72376d89e..f72376d89e 100644
--- a/keyboards/bat43/keymaps/via/readme.md
+++ b/keyboards/dailycraft/bat43/keymaps/via/readme.md
diff --git a/keyboards/bat43/keymaps/via/rules.mk b/keyboards/dailycraft/bat43/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/bat43/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/bat43/keymaps/via/rules.mk
diff --git a/keyboards/bat43/readme.md b/keyboards/dailycraft/bat43/readme.md
index 7097aa7af5..6b58aa5ca3 100644
--- a/keyboards/bat43/readme.md
+++ b/keyboards/dailycraft/bat43/readme.md
@@ -6,10 +6,21 @@ A 43-key keyboard.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: bat43 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bat43:default
+    make dailycraft/bat43:default
+
+Flashing example for this keyboard:
+
+    make dailycraft/bat43: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/bat43/rev1/.noci b/keyboards/dailycraft/bat43/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/bat43/rev1/.noci
+++ b/keyboards/dailycraft/bat43/rev1/.noci
diff --git a/keyboards/bat43/rev1/info.json b/keyboards/dailycraft/bat43/rev1/info.json
index 0384bb5feb..0384bb5feb 100644
--- a/keyboards/bat43/rev1/info.json
+++ b/keyboards/dailycraft/bat43/rev1/info.json
diff --git a/keyboards/bat43/rev1/rev1.c b/keyboards/dailycraft/bat43/rev1/rev1.c
index cff7598740..cff7598740 100644
--- a/keyboards/bat43/rev1/rev1.c
+++ b/keyboards/dailycraft/bat43/rev1/rev1.c
diff --git a/keyboards/bat43/rev1/rev1.h b/keyboards/dailycraft/bat43/rev1/rev1.h
index cf21486a9e..cf21486a9e 100644
--- a/keyboards/bat43/rev1/rev1.h
+++ b/keyboards/dailycraft/bat43/rev1/rev1.h
diff --git a/keyboards/bat43/rev1/rules.mk b/keyboards/dailycraft/bat43/rev1/rules.mk
index 8b13789179..8b13789179 100644
--- a/keyboards/bat43/rev1/rules.mk
+++ b/keyboards/dailycraft/bat43/rev1/rules.mk
diff --git a/keyboards/bat43/rev2/.noci b/keyboards/dailycraft/bat43/rev2/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/bat43/rev2/.noci
+++ b/keyboards/dailycraft/bat43/rev2/.noci
diff --git a/keyboards/bat43/rev2/info.json b/keyboards/dailycraft/bat43/rev2/info.json
index 352d9a6beb..352d9a6beb 100644
--- a/keyboards/bat43/rev2/info.json
+++ b/keyboards/dailycraft/bat43/rev2/info.json
diff --git a/keyboards/bat43/rev2/rev2.c b/keyboards/dailycraft/bat43/rev2/rev2.c
index cffc0acd32..cffc0acd32 100644
--- a/keyboards/bat43/rev2/rev2.c
+++ b/keyboards/dailycraft/bat43/rev2/rev2.c
diff --git a/keyboards/bat43/rev2/rev2.h b/keyboards/dailycraft/bat43/rev2/rev2.h
index f84cdbaa4d..f84cdbaa4d 100644
--- a/keyboards/bat43/rev2/rev2.h
+++ b/keyboards/dailycraft/bat43/rev2/rev2.h
diff --git a/keyboards/bat43/rev2/rules.mk b/keyboards/dailycraft/bat43/rev2/rules.mk
index 8b13789179..8b13789179 100644
--- a/keyboards/bat43/rev2/rules.mk
+++ b/keyboards/dailycraft/bat43/rev2/rules.mk
diff --git a/keyboards/bat43/rules.mk b/keyboards/dailycraft/bat43/rules.mk
index 7bd7394e4f..c2e1c5755f 100644
--- a/keyboards/bat43/rules.mk
+++ b/keyboards/dailycraft/bat43/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-DEFAULT_FOLDER = bat43/rev2
+DEFAULT_FOLDER = dailycraft/bat43/rev2
diff --git a/keyboards/claw44/.noci b/keyboards/dailycraft/claw44/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/claw44/.noci
+++ b/keyboards/dailycraft/claw44/.noci
diff --git a/keyboards/claw44/claw44.c b/keyboards/dailycraft/claw44/claw44.c
index d87103065c..d87103065c 100644
--- a/keyboards/claw44/claw44.c
+++ b/keyboards/dailycraft/claw44/claw44.c
diff --git a/keyboards/claw44/claw44.h b/keyboards/dailycraft/claw44/claw44.h
index 4ca25fcb2b..76ecda6e90 100644
--- a/keyboards/claw44/claw44.h
+++ b/keyboards/dailycraft/claw44/claw44.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#ifdef KEYBOARD_claw44_rev1
+#ifdef KEYBOARD_dailycraft_claw44_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/claw44/config.h b/keyboards/dailycraft/claw44/config.h
index 0bd74ff833..0bd74ff833 100644
--- a/keyboards/claw44/config.h
+++ b/keyboards/dailycraft/claw44/config.h
diff --git a/keyboards/claw44/keymaps/default/config.h b/keyboards/dailycraft/claw44/keymaps/default/config.h
index 98469e4ccf..98469e4ccf 100644
--- a/keyboards/claw44/keymaps/default/config.h
+++ b/keyboards/dailycraft/claw44/keymaps/default/config.h
diff --git a/keyboards/claw44/keymaps/default/keymap.c b/keyboards/dailycraft/claw44/keymaps/default/keymap.c
index 204c0c94e6..204c0c94e6 100644
--- a/keyboards/claw44/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/claw44/keymaps/default/keymap.c
diff --git a/keyboards/claw44/keymaps/oled/config.h b/keyboards/dailycraft/claw44/keymaps/oled/config.h
index 5379ce677d..5379ce677d 100644
--- a/keyboards/claw44/keymaps/oled/config.h
+++ b/keyboards/dailycraft/claw44/keymaps/oled/config.h
diff --git a/keyboards/claw44/keymaps/oled/keymap.c b/keyboards/dailycraft/claw44/keymaps/oled/keymap.c
index 1778ac6167..1778ac6167 100644
--- a/keyboards/claw44/keymaps/oled/keymap.c
+++ b/keyboards/dailycraft/claw44/keymaps/oled/keymap.c
diff --git a/keyboards/claw44/keymaps/oled/rules.mk b/keyboards/dailycraft/claw44/keymaps/oled/rules.mk
index d34d066ded..d34d066ded 100644
--- a/keyboards/claw44/keymaps/oled/rules.mk
+++ b/keyboards/dailycraft/claw44/keymaps/oled/rules.mk
diff --git a/keyboards/claw44/keymaps/via/config.h b/keyboards/dailycraft/claw44/keymaps/via/config.h
index 98469e4ccf..98469e4ccf 100644
--- a/keyboards/claw44/keymaps/via/config.h
+++ b/keyboards/dailycraft/claw44/keymaps/via/config.h
diff --git a/keyboards/claw44/keymaps/via/keymap.c b/keyboards/dailycraft/claw44/keymaps/via/keymap.c
index 5373b76876..5373b76876 100644
--- a/keyboards/claw44/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/claw44/keymaps/via/keymap.c
diff --git a/keyboards/claw44/keymaps/via/rules.mk b/keyboards/dailycraft/claw44/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/claw44/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/claw44/keymaps/via/rules.mk
diff --git a/keyboards/claw44/lib/glcdfont.c b/keyboards/dailycraft/claw44/lib/glcdfont.c
index 9fa1c806aa..9fa1c806aa 100644
--- a/keyboards/claw44/lib/glcdfont.c
+++ b/keyboards/dailycraft/claw44/lib/glcdfont.c
diff --git a/keyboards/claw44/readme.md b/keyboards/dailycraft/claw44/readme.md
index 7e72e08971..e533bd7c82 100644
--- a/keyboards/claw44/readme.md
+++ b/keyboards/dailycraft/claw44/readme.md
@@ -4,12 +4,23 @@
 
 A split keyboard with 3x6 vertically staggered keys and 4 thumb keys.
 
-Keyboard Maintainer: [@yfuku_](https://twitter.com/yfuku_)  
-Hardware Supported: Claw44 PCB, ProMicro  
-Hardware Availability: https://yfuku.booth.pm/  
+* Keyboard Maintainer: [yfuku](https://github.com/yfuku)
+* Hardware Supported: Claw44 PCB, ProMicro
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make claw44:default
+    make dailycraft/claw44:default
+
+Flashing example for this keyboard:
+
+    make dailycraft/claw44: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/claw44/rev1/.noci b/keyboards/dailycraft/claw44/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/claw44/rev1/.noci
+++ b/keyboards/dailycraft/claw44/rev1/.noci
diff --git a/keyboards/claw44/rev1/config.h b/keyboards/dailycraft/claw44/rev1/config.h
index 8116b605cd..8116b605cd 100644
--- a/keyboards/claw44/rev1/config.h
+++ b/keyboards/dailycraft/claw44/rev1/config.h
diff --git a/keyboards/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json
index 3301e7d2ec..3301e7d2ec 100644
--- a/keyboards/claw44/rev1/info.json
+++ b/keyboards/dailycraft/claw44/rev1/info.json
diff --git a/keyboards/claw44/rev1/readme.md b/keyboards/dailycraft/claw44/rev1/readme.md
index 5ad967af80..5ad967af80 100644
--- a/keyboards/claw44/rev1/readme.md
+++ b/keyboards/dailycraft/claw44/rev1/readme.md
diff --git a/keyboards/claw44/rev1/rev1.c b/keyboards/dailycraft/claw44/rev1/rev1.c
index 520a869e57..520a869e57 100644
--- a/keyboards/claw44/rev1/rev1.c
+++ b/keyboards/dailycraft/claw44/rev1/rev1.c
diff --git a/keyboards/claw44/rev1/rev1.h b/keyboards/dailycraft/claw44/rev1/rev1.h
index 9a05977153..9a05977153 100644
--- a/keyboards/claw44/rev1/rev1.h
+++ b/keyboards/dailycraft/claw44/rev1/rev1.h
diff --git a/keyboards/claw44/rev1/rules.mk b/keyboards/dailycraft/claw44/rev1/rules.mk
index a66eb7d352..a66eb7d352 100644
--- a/keyboards/claw44/rev1/rules.mk
+++ b/keyboards/dailycraft/claw44/rev1/rules.mk
diff --git a/keyboards/claw44/rules.mk b/keyboards/dailycraft/claw44/rules.mk
index 6ba5e853fb..69c59f28e6 100644
--- a/keyboards/claw44/rules.mk
+++ b/keyboards/dailycraft/claw44/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight. 
 
-DEFAULT_FOLDER = claw44/rev1
+DEFAULT_FOLDER = dailycraft/claw44/rev1
diff --git a/keyboards/owl8/config.h b/keyboards/dailycraft/owl8/config.h
index d28fd9c927..d28fd9c927 100644
--- a/keyboards/owl8/config.h
+++ b/keyboards/dailycraft/owl8/config.h
diff --git a/keyboards/owl8/info.json b/keyboards/dailycraft/owl8/info.json
index e50484ba90..e50484ba90 100644
--- a/keyboards/owl8/info.json
+++ b/keyboards/dailycraft/owl8/info.json
diff --git a/keyboards/owl8/keymaps/default/keymap.c b/keyboards/dailycraft/owl8/keymaps/default/keymap.c
index e840263639..e840263639 100644
--- a/keyboards/owl8/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/default/keymap.c
diff --git a/keyboards/owl8/keymaps/default/readme.md b/keyboards/dailycraft/owl8/keymaps/default/readme.md
index e0129daa2d..e0129daa2d 100644
--- a/keyboards/owl8/keymaps/default/readme.md
+++ b/keyboards/dailycraft/owl8/keymaps/default/readme.md
diff --git a/keyboards/owl8/keymaps/via/keymap.c b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
index 6e3f6ea90b..6e3f6ea90b 100644
--- a/keyboards/owl8/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/owl8/keymaps/via/keymap.c
diff --git a/keyboards/owl8/keymaps/via/readme.md b/keyboards/dailycraft/owl8/keymaps/via/readme.md
index c4fa65987c..c4fa65987c 100644
--- a/keyboards/owl8/keymaps/via/readme.md
+++ b/keyboards/dailycraft/owl8/keymaps/via/readme.md
diff --git a/keyboards/owl8/keymaps/via/rules.mk b/keyboards/dailycraft/owl8/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/owl8/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/owl8/keymaps/via/rules.mk
diff --git a/keyboards/owl8/owl8.c b/keyboards/dailycraft/owl8/owl8.c
index a31289891a..a31289891a 100644
--- a/keyboards/owl8/owl8.c
+++ b/keyboards/dailycraft/owl8/owl8.c
diff --git a/keyboards/owl8/owl8.h b/keyboards/dailycraft/owl8/owl8.h
index 5e561f580c..5e561f580c 100644
--- a/keyboards/owl8/owl8.h
+++ b/keyboards/dailycraft/owl8/owl8.h
diff --git a/keyboards/owl8/readme.md b/keyboards/dailycraft/owl8/readme.md
index b40a5f35cb..c7fab17476 100644
--- a/keyboards/owl8/readme.md
+++ b/keyboards/dailycraft/owl8/readme.md
@@ -6,14 +6,21 @@ macropad
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: owl8 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make owl8:default
+    make dailycraft/owl8:default
 
 Flashing example for this keyboard:
 
-    make owl8:default:flash
+    make dailycraft/owl8: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/owl8/rules.mk b/keyboards/dailycraft/owl8/rules.mk
index 284ea23e78..284ea23e78 100644
--- a/keyboards/owl8/rules.mk
+++ b/keyboards/dailycraft/owl8/rules.mk
diff --git a/keyboards/wings42/config.h b/keyboards/dailycraft/wings42/config.h
index cfb6bf4ffc..cfb6bf4ffc 100644
--- a/keyboards/wings42/config.h
+++ b/keyboards/dailycraft/wings42/config.h
diff --git a/keyboards/wings42/rev1/readme.md b/keyboards/dailycraft/wings42/readme.md
index 4ddfe3e83c..c919653397 100644
--- a/keyboards/wings42/rev1/readme.md
+++ b/keyboards/dailycraft/wings42/readme.md
@@ -6,16 +6,21 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: wings42 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wings42/rev1:default
+    make dailycraft/wings42:default
 
 Flashing example for this keyboard:
 
-    make wings42/rev1:default:flash
+    make dailycraft/wings42: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).
 
-A build guide for this keyboard can be found here: [wings42 build guide](https://yfuku.com/wings42/buildguide/)
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wings42/rev1/config.h b/keyboards/dailycraft/wings42/rev1/config.h
index cfb4274921..cfb4274921 100644
--- a/keyboards/wings42/rev1/config.h
+++ b/keyboards/dailycraft/wings42/rev1/config.h
diff --git a/keyboards/wings42/rev1/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev1/keymaps/default/keymap.c
index 442ba5ed9f..442ba5ed9f 100644
--- a/keyboards/wings42/rev1/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/wings42/rev1/keymaps/default/keymap.c
diff --git a/keyboards/wings42/rev1/keymaps/default/readme.md b/keyboards/dailycraft/wings42/rev1/keymaps/default/readme.md
index d99098ad0c..d99098ad0c 100644
--- a/keyboards/wings42/rev1/keymaps/default/readme.md
+++ b/keyboards/dailycraft/wings42/rev1/keymaps/default/readme.md
diff --git a/keyboards/wings42/rev1/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev1/keymaps/via/keymap.c
index 442ba5ed9f..442ba5ed9f 100644
--- a/keyboards/wings42/rev1/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev1/keymaps/via/keymap.c
diff --git a/keyboards/wings42/rev1/keymaps/via/rules.mk b/keyboards/dailycraft/wings42/rev1/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/wings42/rev1/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/wings42/rev1/keymaps/via/rules.mk
diff --git a/keyboards/wings42/rev1_extkeys/readme.md b/keyboards/dailycraft/wings42/rev1/readme.md
index 7be464a141..959052c41d 100644
--- a/keyboards/wings42/rev1_extkeys/readme.md
+++ b/keyboards/dailycraft/wings42/rev1/readme.md
@@ -6,16 +6,21 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: wings42 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make make wings42/rev1_extkeys:default
+    make dailycraft/wings42/rev1:default
 
 Flashing example for this keyboard:
 
-    make make wings42/rev1_extkeys:default:flash
+    make dailycraft/wings42/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).
 
-A build guide for this keyboard can be found here: [wings42 build guide](https://yfuku.com/wings42/buildguide/)
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wings42/rev1/rev1.c b/keyboards/dailycraft/wings42/rev1/rev1.c
index dccf24c746..dccf24c746 100644
--- a/keyboards/wings42/rev1/rev1.c
+++ b/keyboards/dailycraft/wings42/rev1/rev1.c
diff --git a/keyboards/wings42/rev1/rev1.h b/keyboards/dailycraft/wings42/rev1/rev1.h
index cd6e35a711..cd6e35a711 100644
--- a/keyboards/wings42/rev1/rev1.h
+++ b/keyboards/dailycraft/wings42/rev1/rev1.h
diff --git a/keyboards/wings42/rev1/rules.mk b/keyboards/dailycraft/wings42/rev1/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/wings42/rev1/rules.mk
+++ b/keyboards/dailycraft/wings42/rev1/rules.mk
diff --git a/keyboards/wings42/rev1_extkeys/config.h b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
index f0f04eca59..f0f04eca59 100644
--- a/keyboards/wings42/rev1_extkeys/config.h
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/config.h
diff --git a/keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/keymap.c
index 64a2b00c31..64a2b00c31 100644
--- a/keyboards/wings42/rev1_extkeys/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/keymap.c
diff --git a/keyboards/wings42/rev1_extkeys/keymaps/default/readme.md b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/readme.md
index d99098ad0c..d99098ad0c 100644
--- a/keyboards/wings42/rev1_extkeys/keymaps/default/readme.md
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/default/readme.md
diff --git a/keyboards/wings42/rev1_extkeys/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/keymap.c
index 97c77e182b..97c77e182b 100644
--- a/keyboards/wings42/rev1_extkeys/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/keymap.c
diff --git a/keyboards/wings42/rev1_extkeys/keymaps/via/rules.mk b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/wings42/rev1_extkeys/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keymaps/via/rules.mk
diff --git a/keyboards/wings42/readme.md b/keyboards/dailycraft/wings42/rev1_extkeys/readme.md
index fc71d58ab6..4a34063ad4 100644
--- a/keyboards/wings42/readme.md
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/readme.md
@@ -6,14 +6,21 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: wings42 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wings42:default
+    make dailycraft/wings42/rev1_extkeys:default
 
 Flashing example for this keyboard:
 
-    make wings42:default:flash
+    make dailycraft/wings42/rev1_extkeys: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).
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wings42/rev1_extkeys/rev1_extkeys.c b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c
index 3d0d203704..3d0d203704 100644
--- a/keyboards/wings42/rev1_extkeys/rev1_extkeys.c
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.c
diff --git a/keyboards/wings42/rev1_extkeys/rev1_extkeys.h b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h
index 2ad58047f1..2ad58047f1 100644
--- a/keyboards/wings42/rev1_extkeys/rev1_extkeys.h
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h
diff --git a/keyboards/wings42/rev1_extkeys/rules.mk b/keyboards/dailycraft/wings42/rev1_extkeys/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/wings42/rev1_extkeys/rules.mk
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/rules.mk
diff --git a/keyboards/wings42/rev2/config.h b/keyboards/dailycraft/wings42/rev2/config.h
index 836833718c..836833718c 100644
--- a/keyboards/wings42/rev2/config.h
+++ b/keyboards/dailycraft/wings42/rev2/config.h
diff --git a/keyboards/wings42/rev2/keymaps/default/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
index df572a6f5a..df572a6f5a 100644
--- a/keyboards/wings42/rev2/keymaps/default/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
diff --git a/keyboards/wings42/rev2/keymaps/default/readme.md b/keyboards/dailycraft/wings42/rev2/keymaps/default/readme.md
index d99098ad0c..d99098ad0c 100644
--- a/keyboards/wings42/rev2/keymaps/default/readme.md
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/default/readme.md
diff --git a/keyboards/wings42/rev2/keymaps/via/config.h b/keyboards/dailycraft/wings42/rev2/keymaps/via/config.h
index 3e0c8d146a..3e0c8d146a 100644
--- a/keyboards/wings42/rev2/keymaps/via/config.h
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/config.h
diff --git a/keyboards/wings42/rev2/keymaps/via/keymap.c b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
index e6b4ef840a..e6b4ef840a 100644
--- a/keyboards/wings42/rev2/keymaps/via/keymap.c
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
diff --git a/keyboards/wings42/rev2/keymaps/via/rules.mk b/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
index eea5e1e2a2..eea5e1e2a2 100644
--- a/keyboards/wings42/rev2/keymaps/via/rules.mk
+++ b/keyboards/dailycraft/wings42/rev2/keymaps/via/rules.mk
diff --git a/keyboards/wings42/rev2/readme.md b/keyboards/dailycraft/wings42/rev2/readme.md
index 158372feb4..c919653397 100644
--- a/keyboards/wings42/rev2/readme.md
+++ b/keyboards/dailycraft/wings42/rev2/readme.md
@@ -6,16 +6,21 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
 
 * Keyboard Maintainer: [yfuku](https://github.com/yfuku)
 * Hardware Supported: wings42 PCB, Pro Micro
-* Hardware Availability: https://yfuku.booth.pm/
+* Hardware Availability: https://shop.dailycraft.jp/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wings42:default
+    make dailycraft/wings42:default
 
 Flashing example for this keyboard:
 
-    make wings42:default:flash
+    make dailycraft/wings42: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).
 
-A build guide for this keyboard can be found here: [wings42 build guide](https://yfuku.com/wings42/buildguide/)
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+* **Physical reset button**: Briefly press the button on the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/wings42/rev2/rev2.c b/keyboards/dailycraft/wings42/rev2/rev2.c
index 96aa6cd314..96aa6cd314 100644
--- a/keyboards/wings42/rev2/rev2.c
+++ b/keyboards/dailycraft/wings42/rev2/rev2.c
diff --git a/keyboards/wings42/rev2/rev2.h b/keyboards/dailycraft/wings42/rev2/rev2.h
index 4720592264..4720592264 100644
--- a/keyboards/wings42/rev2/rev2.h
+++ b/keyboards/dailycraft/wings42/rev2/rev2.h
diff --git a/keyboards/wings42/rev2/rules.mk b/keyboards/dailycraft/wings42/rev2/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/wings42/rev2/rules.mk
+++ b/keyboards/dailycraft/wings42/rev2/rules.mk
diff --git a/keyboards/wings42/rules.mk b/keyboards/dailycraft/wings42/rules.mk
index 74e894efec..94459dbcc5 100644
--- a/keyboards/wings42/rules.mk
+++ b/keyboards/dailycraft/wings42/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = wings42/rev2
+DEFAULT_FOLDER = dailycraft/wings42/rev2
diff --git a/keyboards/wings42/wings42.c b/keyboards/dailycraft/wings42/wings42.c
index 824b6cfbb6..824b6cfbb6 100644
--- a/keyboards/wings42/wings42.c
+++ b/keyboards/dailycraft/wings42/wings42.c
diff --git a/keyboards/wings42/wings42.h b/keyboards/dailycraft/wings42/wings42.h
index 9412b7117a..d839f04884 100644
--- a/keyboards/wings42/wings42.h
+++ b/keyboards/dailycraft/wings42/wings42.h
@@ -18,13 +18,13 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_wings42_rev1
+#ifdef KEYBOARD_dailycraft_wings42_rev1
 #    include "rev1.h"
 #endif
-#ifdef KEYBOARD_wings42_rev1_extkeys
+#ifdef KEYBOARD_dailycraft_wings42_rev1_extkeys
 #    include "rev1_extkeys.h"
 #endif
-#ifdef KEYBOARD_wings42_rev2
+#ifdef KEYBOARD_dailycraft_wings42_rev2
 #    include "rev2.h"
 #endif