91 files changed, 10 insertions, 10 deletions
diff --git a/keyboards/bigseries/1key/.noci b/keyboards/woodkeys/bigseries/1key/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/bigseries/1key/.noci
+++ b/keyboards/woodkeys/bigseries/1key/.noci
diff --git a/keyboards/bigseries/1key/1key.c b/keyboards/woodkeys/bigseries/1key/1key.c
index 6036bd9991..6036bd9991 100755
--- a/keyboards/bigseries/1key/1key.c
+++ b/keyboards/woodkeys/bigseries/1key/1key.c
diff --git a/keyboards/bigseries/1key/1key.h b/keyboards/woodkeys/bigseries/1key/1key.h
index 6e5ddcc760..6e5ddcc760 100755
--- a/keyboards/bigseries/1key/1key.h
+++ b/keyboards/woodkeys/bigseries/1key/1key.h
diff --git a/keyboards/bigseries/1key/config.h b/keyboards/woodkeys/bigseries/1key/config.h
index f31a7fc057..f31a7fc057 100755
--- a/keyboards/bigseries/1key/config.h
+++ b/keyboards/woodkeys/bigseries/1key/config.h
diff --git a/keyboards/bigseries/1key/info.json b/keyboards/woodkeys/bigseries/1key/info.json
index 4355191d2c..4355191d2c 100644
--- a/keyboards/bigseries/1key/info.json
+++ b/keyboards/woodkeys/bigseries/1key/info.json
diff --git a/keyboards/bigseries/1key/keymaps/8ball/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
index 33a5428fe4..33a5428fe4 100755
--- a/keyboards/bigseries/1key/keymaps/8ball/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/8ball/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/ctrl-alt-del/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
index d87471b007..d87471b007 100755
--- a/keyboards/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/ctrl-alt-del/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/default/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/default/keymap.c
index 830093af54..830093af54 100755
--- a/keyboards/bigseries/1key/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/default/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/dudeofawesome/README.md b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/README.md
index 86b79b4621..86b79b4621 100644
--- a/keyboards/bigseries/1key/keymaps/dudeofawesome/README.md
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/README.md
diff --git a/keyboards/bigseries/1key/keymaps/dudeofawesome/config.h b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/config.h
index 30b86224c6..30b86224c6 100644
--- a/keyboards/bigseries/1key/keymaps/dudeofawesome/config.h
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/config.h
diff --git a/keyboards/bigseries/1key/keymaps/dudeofawesome/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/keymap.c
index 4c3739bbeb..4c3739bbeb 100755
--- a/keyboards/bigseries/1key/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/dudeofawesome/rules.mk b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/rules.mk
index e5ddcae8d9..e5ddcae8d9 100644
--- a/keyboards/bigseries/1key/keymaps/dudeofawesome/rules.mk
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/dudeofawesome/rules.mk
diff --git a/keyboards/bigseries/1key/keymaps/leddance/config.h b/keyboards/woodkeys/bigseries/1key/keymaps/leddance/config.h
index 57398fb996..57398fb996 100644
--- a/keyboards/bigseries/1key/keymaps/leddance/config.h
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/leddance/config.h
diff --git a/keyboards/bigseries/1key/keymaps/leddance/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/leddance/keymap.c
index c77e579028..c77e579028 100755
--- a/keyboards/bigseries/1key/keymaps/leddance/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/leddance/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/leddance/rules.mk b/keyboards/woodkeys/bigseries/1key/keymaps/leddance/rules.mk
index 1ba2fa8fbe..1ba2fa8fbe 100644
--- a/keyboards/bigseries/1key/keymaps/leddance/rules.mk
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/leddance/rules.mk
diff --git a/keyboards/bigseries/1key/keymaps/lock/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/lock/keymap.c
index 650554e020..650554e020 100755
--- a/keyboards/bigseries/1key/keymaps/lock/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/lock/keymap.c
diff --git a/keyboards/bigseries/1key/keymaps/tester/keymap.c b/keyboards/woodkeys/bigseries/1key/keymaps/tester/keymap.c
index 8248ae7895..8248ae7895 100755
--- a/keyboards/bigseries/1key/keymaps/tester/keymap.c
+++ b/keyboards/woodkeys/bigseries/1key/keymaps/tester/keymap.c
diff --git a/keyboards/bigseries/1key/readme.md b/keyboards/woodkeys/bigseries/1key/readme.md
index ad3ee28b14..3d019c65d3 100644
--- a/keyboards/bigseries/1key/readme.md
+++ b/keyboards/woodkeys/bigseries/1key/readme.md
@@ -10,6 +10,6 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bigseries/1key:default
+    make woodkeys/bigseries/1key:default
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/bigseries/1key/rules.mk b/keyboards/woodkeys/bigseries/1key/rules.mk
index 49ff0998f6..49ff0998f6 100755
--- a/keyboards/bigseries/1key/rules.mk
+++ b/keyboards/woodkeys/bigseries/1key/rules.mk
diff --git a/keyboards/bigseries/2key/.noci b/keyboards/woodkeys/bigseries/2key/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/bigseries/2key/.noci
+++ b/keyboards/woodkeys/bigseries/2key/.noci
diff --git a/keyboards/bigseries/2key/2key.c b/keyboards/woodkeys/bigseries/2key/2key.c
index cffb71907e..cffb71907e 100755
--- a/keyboards/bigseries/2key/2key.c
+++ b/keyboards/woodkeys/bigseries/2key/2key.c
diff --git a/keyboards/bigseries/2key/2key.h b/keyboards/woodkeys/bigseries/2key/2key.h
index eff82fef93..eff82fef93 100755
--- a/keyboards/bigseries/2key/2key.h
+++ b/keyboards/woodkeys/bigseries/2key/2key.h
diff --git a/keyboards/bigseries/2key/config.h b/keyboards/woodkeys/bigseries/2key/config.h
index 53866a15d1..53866a15d1 100755
--- a/keyboards/bigseries/2key/config.h
+++ b/keyboards/woodkeys/bigseries/2key/config.h
diff --git a/keyboards/bigseries/2key/info.json b/keyboards/woodkeys/bigseries/2key/info.json
index df3237defc..df3237defc 100644
--- a/keyboards/bigseries/2key/info.json
+++ b/keyboards/woodkeys/bigseries/2key/info.json
diff --git a/keyboards/bigseries/2key/keymaps/default/keymap.c b/keyboards/woodkeys/bigseries/2key/keymaps/default/keymap.c
index 128a3e9c82..128a3e9c82 100755
--- a/keyboards/bigseries/2key/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/bigseries/2key/keymaps/default/keymap.c
diff --git a/keyboards/bigseries/2key/keymaps/lock/keymap.c b/keyboards/woodkeys/bigseries/2key/keymaps/lock/keymap.c
index 3646fb40d1..3646fb40d1 100755
--- a/keyboards/bigseries/2key/keymaps/lock/keymap.c
+++ b/keyboards/woodkeys/bigseries/2key/keymaps/lock/keymap.c
diff --git a/keyboards/bigseries/2key/keymaps/tester/keymap.c b/keyboards/woodkeys/bigseries/2key/keymaps/tester/keymap.c
index 8938b1b40b..8938b1b40b 100755
--- a/keyboards/bigseries/2key/keymaps/tester/keymap.c
+++ b/keyboards/woodkeys/bigseries/2key/keymaps/tester/keymap.c
diff --git a/keyboards/bigseries/2key/readme.md b/keyboards/woodkeys/bigseries/2key/readme.md
index e882433017..f6bcc5efbb 100644
--- a/keyboards/bigseries/2key/readme.md
+++ b/keyboards/woodkeys/bigseries/2key/readme.md
@@ -10,6 +10,6 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bigseries/2key:default
+    make woodkeys/bigseries/2key:default
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/bigseries/2key/rules.mk b/keyboards/woodkeys/bigseries/2key/rules.mk
index 49ff0998f6..49ff0998f6 100755
--- a/keyboards/bigseries/2key/rules.mk
+++ b/keyboards/woodkeys/bigseries/2key/rules.mk
diff --git a/keyboards/bigseries/3key/.noci b/keyboards/woodkeys/bigseries/3key/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/bigseries/3key/.noci
+++ b/keyboards/woodkeys/bigseries/3key/.noci
diff --git a/keyboards/bigseries/3key/3key.c b/keyboards/woodkeys/bigseries/3key/3key.c
index 3735c10543..3735c10543 100755
--- a/keyboards/bigseries/3key/3key.c
+++ b/keyboards/woodkeys/bigseries/3key/3key.c
diff --git a/keyboards/bigseries/3key/3key.h b/keyboards/woodkeys/bigseries/3key/3key.h
index caee1e4551..caee1e4551 100755
--- a/keyboards/bigseries/3key/3key.h
+++ b/keyboards/woodkeys/bigseries/3key/3key.h
diff --git a/keyboards/bigseries/3key/config.h b/keyboards/woodkeys/bigseries/3key/config.h
index 4a474cc3d1..4a474cc3d1 100755
--- a/keyboards/bigseries/3key/config.h
+++ b/keyboards/woodkeys/bigseries/3key/config.h
diff --git a/keyboards/bigseries/3key/info.json b/keyboards/woodkeys/bigseries/3key/info.json
index 17f7621480..17f7621480 100644
--- a/keyboards/bigseries/3key/info.json
+++ b/keyboards/woodkeys/bigseries/3key/info.json
diff --git a/keyboards/bigseries/3key/keymaps/ctrl-alt-del/keymap.c b/keyboards/woodkeys/bigseries/3key/keymaps/ctrl-alt-del/keymap.c
index d1410ecf1e..d1410ecf1e 100755
--- a/keyboards/bigseries/3key/keymaps/ctrl-alt-del/keymap.c
+++ b/keyboards/woodkeys/bigseries/3key/keymaps/ctrl-alt-del/keymap.c
diff --git a/keyboards/bigseries/3key/keymaps/default/keymap.c b/keyboards/woodkeys/bigseries/3key/keymaps/default/keymap.c
index 855c7c3ecd..855c7c3ecd 100755
--- a/keyboards/bigseries/3key/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/bigseries/3key/keymaps/default/keymap.c
diff --git a/keyboards/bigseries/3key/keymaps/tester/keymap.c b/keyboards/woodkeys/bigseries/3key/keymaps/tester/keymap.c
index 7ee0d7a419..7ee0d7a419 100755
--- a/keyboards/bigseries/3key/keymaps/tester/keymap.c
+++ b/keyboards/woodkeys/bigseries/3key/keymaps/tester/keymap.c
diff --git a/keyboards/bigseries/3key/readme.md b/keyboards/woodkeys/bigseries/3key/readme.md
index d32ec486a0..c8d0275b87 100644
--- a/keyboards/bigseries/3key/readme.md
+++ b/keyboards/woodkeys/bigseries/3key/readme.md
@@ -10,6 +10,6 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bigseries/3key:default
+    make woodkeys/bigseries/3key:default
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/bigseries/3key/rules.mk b/keyboards/woodkeys/bigseries/3key/rules.mk
index 49ff0998f6..49ff0998f6 100755
--- a/keyboards/bigseries/3key/rules.mk
+++ b/keyboards/woodkeys/bigseries/3key/rules.mk
diff --git a/keyboards/bigseries/4key/4key.c b/keyboards/woodkeys/bigseries/4key/4key.c
index fdb9a92514..fdb9a92514 100755
--- a/keyboards/bigseries/4key/4key.c
+++ b/keyboards/woodkeys/bigseries/4key/4key.c
diff --git a/keyboards/bigseries/4key/4key.h b/keyboards/woodkeys/bigseries/4key/4key.h
index 7e9ff7a793..7e9ff7a793 100755
--- a/keyboards/bigseries/4key/4key.h
+++ b/keyboards/woodkeys/bigseries/4key/4key.h
diff --git a/keyboards/bigseries/4key/config.h b/keyboards/woodkeys/bigseries/4key/config.h
index c1635022de..c1635022de 100755
--- a/keyboards/bigseries/4key/config.h
+++ b/keyboards/woodkeys/bigseries/4key/config.h
diff --git a/keyboards/bigseries/4key/info.json b/keyboards/woodkeys/bigseries/4key/info.json
index 4429159a6b..4429159a6b 100644
--- a/keyboards/bigseries/4key/info.json
+++ b/keyboards/woodkeys/bigseries/4key/info.json
diff --git a/keyboards/bigseries/4key/keymaps/default/keymap.c b/keyboards/woodkeys/bigseries/4key/keymaps/default/keymap.c
index 5674bc6194..5674bc6194 100755
--- a/keyboards/bigseries/4key/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/bigseries/4key/keymaps/default/keymap.c
diff --git a/keyboards/bigseries/4key/keymaps/tester/keymap.c b/keyboards/woodkeys/bigseries/4key/keymaps/tester/keymap.c
index eb2e42b7af..eb2e42b7af 100755
--- a/keyboards/bigseries/4key/keymaps/tester/keymap.c
+++ b/keyboards/woodkeys/bigseries/4key/keymaps/tester/keymap.c
diff --git a/keyboards/bigseries/4key/readme.md b/keyboards/woodkeys/bigseries/4key/readme.md
index ec40e83f2c..2ac56a25c7 100644
--- a/keyboards/bigseries/4key/readme.md
+++ b/keyboards/woodkeys/bigseries/4key/readme.md
@@ -10,6 +10,6 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for this keyboard (after setting up your build environment):
 
-    make bigseries/4key:default
+    make woodkeys/bigseries/4key:default
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/bigseries/4key/rules.mk b/keyboards/woodkeys/bigseries/4key/rules.mk
index 49ff0998f6..49ff0998f6 100755
--- a/keyboards/bigseries/4key/rules.mk
+++ b/keyboards/woodkeys/bigseries/4key/rules.mk
diff --git a/keyboards/bigseries/readme.md b/keyboards/woodkeys/bigseries/readme.md
index 0b40667353..5f7a123508 100644
--- a/keyboards/bigseries/readme.md
+++ b/keyboards/woodkeys/bigseries/readme.md
@@ -10,7 +10,7 @@ Hardware Availability:  [Woodkeys.click](https://woodkeys.click), [NovelKeys](ht
 
 Make example for these keyboards (after setting up your build environment):
 
-    make bigseries/1key:default
-    make bigseries/3key:ctrl-alt-del
+    make woodkeys/bigseries/1key:default
+    make woodkeys/bigseries/3key:ctrl-alt-del
 
 See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/build-compile-instructions) for more information.
diff --git a/keyboards/meira/TWIlib.c b/keyboards/woodkeys/meira/TWIlib.c
index 8f5658fcdb..8f5658fcdb 100755
--- a/keyboards/meira/TWIlib.c
+++ b/keyboards/woodkeys/meira/TWIlib.c
diff --git a/keyboards/meira/TWIlib.h b/keyboards/woodkeys/meira/TWIlib.h
index 8ba261c6e5..8ba261c6e5 100755
--- a/keyboards/meira/TWIlib.h
+++ b/keyboards/woodkeys/meira/TWIlib.h
diff --git a/keyboards/meira/config.h b/keyboards/woodkeys/meira/config.h
index 999ab1bf8a..999ab1bf8a 100644
--- a/keyboards/meira/config.h
+++ b/keyboards/woodkeys/meira/config.h
diff --git a/keyboards/meira/featherble/config.h b/keyboards/woodkeys/meira/featherble/config.h
index 94bef3b330..94bef3b330 100644
--- a/keyboards/meira/featherble/config.h
+++ b/keyboards/woodkeys/meira/featherble/config.h
diff --git a/keyboards/meira/featherble/featherble.c b/keyboards/woodkeys/meira/featherble/featherble.c
index 63ade21904..63ade21904 100644
--- a/keyboards/meira/featherble/featherble.c
+++ b/keyboards/woodkeys/meira/featherble/featherble.c
diff --git a/keyboards/meira/featherble/featherble.h b/keyboards/woodkeys/meira/featherble/featherble.h
index eab7c639b9..eab7c639b9 100644
--- a/keyboards/meira/featherble/featherble.h
+++ b/keyboards/woodkeys/meira/featherble/featherble.h
diff --git a/keyboards/meira/featherble/rules.mk b/keyboards/woodkeys/meira/featherble/rules.mk
index 01f1af1ae8..01f1af1ae8 100644
--- a/keyboards/meira/featherble/rules.mk
+++ b/keyboards/woodkeys/meira/featherble/rules.mk
diff --git a/keyboards/meira/info.json b/keyboards/woodkeys/meira/info.json
index de9ce42f8e..de9ce42f8e 100644
--- a/keyboards/meira/info.json
+++ b/keyboards/woodkeys/meira/info.json
diff --git a/keyboards/meira/issi.c b/keyboards/woodkeys/meira/issi.c
index 600a465ba3..600a465ba3 100755
--- a/keyboards/meira/issi.c
+++ b/keyboards/woodkeys/meira/issi.c
diff --git a/keyboards/meira/issi.h b/keyboards/woodkeys/meira/issi.h
index 74379ddbc8..74379ddbc8 100755
--- a/keyboards/meira/issi.h
+++ b/keyboards/woodkeys/meira/issi.h
diff --git a/keyboards/meira/keymaps/cole/config.h b/keyboards/woodkeys/meira/keymaps/cole/config.h
index 90c490e836..90c490e836 100644
--- a/keyboards/meira/keymaps/cole/config.h
+++ b/keyboards/woodkeys/meira/keymaps/cole/config.h
diff --git a/keyboards/meira/keymaps/cole/keymap.c b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
index 94806c5da2..94806c5da2 100644
--- a/keyboards/meira/keymaps/cole/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/cole/keymap.c
diff --git a/keyboards/meira/keymaps/cole/readme.md b/keyboards/woodkeys/meira/keymaps/cole/readme.md
index be84048813..be84048813 100644
--- a/keyboards/meira/keymaps/cole/readme.md
+++ b/keyboards/woodkeys/meira/keymaps/cole/readme.md
diff --git a/keyboards/meira/keymaps/cole/rules.mk b/keyboards/woodkeys/meira/keymaps/cole/rules.mk
index 8f8d53e57a..8f8d53e57a 100644
--- a/keyboards/meira/keymaps/cole/rules.mk
+++ b/keyboards/woodkeys/meira/keymaps/cole/rules.mk
diff --git a/keyboards/meira/keymaps/default/config.h b/keyboards/woodkeys/meira/keymaps/default/config.h
index e3776d2eff..e3776d2eff 100644
--- a/keyboards/meira/keymaps/default/config.h
+++ b/keyboards/woodkeys/meira/keymaps/default/config.h
diff --git a/keyboards/meira/keymaps/default/keymap.c b/keyboards/woodkeys/meira/keymaps/default/keymap.c
index dacf848cf1..dacf848cf1 100644
--- a/keyboards/meira/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/default/keymap.c
diff --git a/keyboards/meira/keymaps/default/readme.md b/keyboards/woodkeys/meira/keymaps/default/readme.md
index be84048813..be84048813 100644
--- a/keyboards/meira/keymaps/default/readme.md
+++ b/keyboards/woodkeys/meira/keymaps/default/readme.md
diff --git a/keyboards/meira/keymaps/grahampheath/config.h b/keyboards/woodkeys/meira/keymaps/grahampheath/config.h
index 604f378461..604f378461 100644
--- a/keyboards/meira/keymaps/grahampheath/config.h
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/config.h
diff --git a/keyboards/meira/keymaps/grahampheath/keymap.c b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
index 35fa31b8b8..35fa31b8b8 100644
--- a/keyboards/meira/keymaps/grahampheath/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c
diff --git a/keyboards/meira/keymaps/grahampheath/readme.md b/keyboards/woodkeys/meira/keymaps/grahampheath/readme.md
index 10459e3566..10459e3566 100644
--- a/keyboards/meira/keymaps/grahampheath/readme.md
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/readme.md
diff --git a/keyboards/meira/keymaps/grahampheath/rules.mk b/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
index b3b1980eb1..b3b1980eb1 100644
--- a/keyboards/meira/keymaps/grahampheath/rules.mk
+++ b/keyboards/woodkeys/meira/keymaps/grahampheath/rules.mk
diff --git a/keyboards/meira/keymaps/takmiya/config.h b/keyboards/woodkeys/meira/keymaps/takmiya/config.h
index 97210115b9..97210115b9 100644
--- a/keyboards/meira/keymaps/takmiya/config.h
+++ b/keyboards/woodkeys/meira/keymaps/takmiya/config.h
diff --git a/keyboards/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
index 25f50abc49..25f50abc49 100644
--- a/keyboards/meira/keymaps/takmiya/keymap.c
+++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c
diff --git a/keyboards/meira/keymaps/takmiya/readme.md b/keyboards/woodkeys/meira/keymaps/takmiya/readme.md
index 40f48bb091..40f48bb091 100644
--- a/keyboards/meira/keymaps/takmiya/readme.md
+++ b/keyboards/woodkeys/meira/keymaps/takmiya/readme.md
diff --git a/keyboards/meira/lighting.c b/keyboards/woodkeys/meira/lighting.c
index 1a3c954bcf..1a3c954bcf 100755
--- a/keyboards/meira/lighting.c
+++ b/keyboards/woodkeys/meira/lighting.c
diff --git a/keyboards/meira/lighting.h b/keyboards/woodkeys/meira/lighting.h
index 42fee8ac92..42fee8ac92 100755
--- a/keyboards/meira/lighting.h
+++ b/keyboards/woodkeys/meira/lighting.h
diff --git a/keyboards/meira/matrix.c b/keyboards/woodkeys/meira/matrix.c
index 8e8e9485b4..8e8e9485b4 100644
--- a/keyboards/meira/matrix.c
+++ b/keyboards/woodkeys/meira/matrix.c
diff --git a/keyboards/meira/meira.c b/keyboards/woodkeys/meira/meira.c
index e900fd0dd6..e900fd0dd6 100644
--- a/keyboards/meira/meira.c
+++ b/keyboards/woodkeys/meira/meira.c
diff --git a/keyboards/meira/meira.h b/keyboards/woodkeys/meira/meira.h
index 55fccf5de5..55fccf5de5 100644
--- a/keyboards/meira/meira.h
+++ b/keyboards/woodkeys/meira/meira.h
diff --git a/keyboards/meira/promicro/config.h b/keyboards/woodkeys/meira/promicro/config.h
index bbdaa9dbd8..bbdaa9dbd8 100644
--- a/keyboards/meira/promicro/config.h
+++ b/keyboards/woodkeys/meira/promicro/config.h
diff --git a/keyboards/meira/promicro/promicro.c b/keyboards/woodkeys/meira/promicro/promicro.c
index 63ade21904..63ade21904 100644
--- a/keyboards/meira/promicro/promicro.c
+++ b/keyboards/woodkeys/meira/promicro/promicro.c
diff --git a/keyboards/meira/promicro/promicro.h b/keyboards/woodkeys/meira/promicro/promicro.h
index eab7c639b9..eab7c639b9 100644
--- a/keyboards/meira/promicro/promicro.h
+++ b/keyboards/woodkeys/meira/promicro/promicro.h
diff --git a/keyboards/meira/promicro/rules.mk b/keyboards/woodkeys/meira/promicro/rules.mk
index 09057bea54..09057bea54 100644
--- a/keyboards/meira/promicro/rules.mk
+++ b/keyboards/woodkeys/meira/promicro/rules.mk
diff --git a/keyboards/meira/readme.md b/keyboards/woodkeys/meira/readme.md
index 716eb7445d..f0fb02b69e 100644
--- a/keyboards/meira/readme.md
+++ b/keyboards/woodkeys/meira/readme.md
@@ -12,8 +12,8 @@ Two controllers are supported: the Pro Micro, and the Adafruit Feather BLE 32u4.
 
 Make examples for this keyboard (after setting up your build environment):
 
-    make meira/featherble:default  # for Feather BLE 32u4 controllers
-    make meira/promicro:default    # for Pro Micro controllers
+    make woodkeys/meira/featherble:default  # for Feather BLE 32u4 controllers
+    make woodkeys/meira/promicro:default    # for Pro Micro controllers
 
 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/meira/rules.mk b/keyboards/woodkeys/meira/rules.mk
index cdd0acb824..6b5025500c 100644
--- a/keyboards/meira/rules.mk
+++ b/keyboards/woodkeys/meira/rules.mk
@@ -30,5 +30,5 @@ CUSTOM_MATRIX = yes
 #endif
 SRC += matrix.c TWIlib.c issi.c lighting.c
 
-DEFAULT_FOLDER = meira/promicro
+DEFAULT_FOLDER = woodkeys/meira/promicro
 LAYOUTS = ortho_4x12
diff --git a/keyboards/scarletbandana/config.h b/keyboards/woodkeys/scarletbandana/config.h
index b9c8dd9b0f..b9c8dd9b0f 100644
--- a/keyboards/scarletbandana/config.h
+++ b/keyboards/woodkeys/scarletbandana/config.h
diff --git a/keyboards/scarletbandana/info.json b/keyboards/woodkeys/scarletbandana/info.json
index c700093194..c700093194 100644
--- a/keyboards/scarletbandana/info.json
+++ b/keyboards/woodkeys/scarletbandana/info.json
diff --git a/keyboards/scarletbandana/keymaps/default/keymap.c b/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
index 7b2687a607..7b2687a607 100644
--- a/keyboards/scarletbandana/keymaps/default/keymap.c
+++ b/keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c
diff --git a/keyboards/scarletbandana/keymaps/default/readme.md b/keyboards/woodkeys/scarletbandana/keymaps/default/readme.md
index c2c281fe35..c2c281fe35 100644
--- a/keyboards/scarletbandana/keymaps/default/readme.md
+++ b/keyboards/woodkeys/scarletbandana/keymaps/default/readme.md
diff --git a/keyboards/scarletbandana/readme.md b/keyboards/woodkeys/scarletbandana/readme.md
index 83281bae36..4505fd0573 100644
--- a/keyboards/scarletbandana/readme.md
+++ b/keyboards/woodkeys/scarletbandana/readme.md
@@ -6,6 +6,6 @@ Hardware Availability: [WoodKeys.click](https://woodkeys.click/product/scarlet-b
 
 Make example for this keyboard (after setting up your build environment):
 
-    make scarletbandana:default
+    make woodkeys/scarletbandana: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/scarletbandana/rules.mk b/keyboards/woodkeys/scarletbandana/rules.mk
index a6313e3b41..a6313e3b41 100644
--- a/keyboards/scarletbandana/rules.mk
+++ b/keyboards/woodkeys/scarletbandana/rules.mk
diff --git a/keyboards/scarletbandana/scarletbandana.c b/keyboards/woodkeys/scarletbandana/scarletbandana.c
index 6ef183c2cc..6ef183c2cc 100644
--- a/keyboards/scarletbandana/scarletbandana.c
+++ b/keyboards/woodkeys/scarletbandana/scarletbandana.c
diff --git a/keyboards/scarletbandana/scarletbandana.h b/keyboards/woodkeys/scarletbandana/scarletbandana.h
index 8178e8c8dc..8178e8c8dc 100644
--- a/keyboards/scarletbandana/scarletbandana.h
+++ b/keyboards/woodkeys/scarletbandana/scarletbandana.h