[Keyboard] move That-Canadian 's boards into /maple_computing (#16050)

169 files changed, 22 insertions, 22 deletions

diff --git a/keyboards/6ball/6ball.c b/keyboards/maple_computing/6ball/6ball.c
index 1eddde9ba5..1eddde9ba5 100644
--- a/keyboards/6ball/6ball.c
+++ b/keyboards/maple_computing/6ball/6ball.c
diff --git a/keyboards/6ball/6ball.h b/keyboards/maple_computing/6ball/6ball.h
index ef73a72053..ef73a72053 100644
--- a/keyboards/6ball/6ball.h
+++ b/keyboards/maple_computing/6ball/6ball.h
diff --git a/keyboards/6ball/config.h b/keyboards/maple_computing/6ball/config.h
index cc496d675a..cc496d675a 100644
--- a/keyboards/6ball/config.h
+++ b/keyboards/maple_computing/6ball/config.h
diff --git a/keyboards/6ball/info.json b/keyboards/maple_computing/6ball/info.json
index fc742ad517..fc742ad517 100644
--- a/keyboards/6ball/info.json
+++ b/keyboards/maple_computing/6ball/info.json
diff --git a/keyboards/6ball/keymaps/default/keymap.c b/keyboards/maple_computing/6ball/keymaps/default/keymap.c
index 5081161e38..5081161e38 100644
--- a/keyboards/6ball/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/6ball/keymaps/default/keymap.c
diff --git a/keyboards/6ball/readme.md b/keyboards/maple_computing/6ball/readme.md
index c9548453a9..0b91c8aa28 100644
--- a/keyboards/6ball/readme.md
+++ b/keyboards/maple_computing/6ball/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: ThatCanadian
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 6ball:default
+    make maple_computing/6ball:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/6ball/rules.mk b/keyboards/maple_computing/6ball/rules.mk
index bb1a873d64..bb1a873d64 100644
--- a/keyboards/6ball/rules.mk
+++ b/keyboards/maple_computing/6ball/rules.mk
diff --git a/keyboards/c39/c39.c b/keyboards/maple_computing/c39/c39.c
index 78ecae5a32..78ecae5a32 100755
--- a/keyboards/c39/c39.c
+++ b/keyboards/maple_computing/c39/c39.c
diff --git a/keyboards/c39/c39.h b/keyboards/maple_computing/c39/c39.h
index 797dd1ef77..797dd1ef77 100755
--- a/keyboards/c39/c39.h
+++ b/keyboards/maple_computing/c39/c39.h
diff --git a/keyboards/c39/config.h b/keyboards/maple_computing/c39/config.h
index 409023f1fa..409023f1fa 100755
--- a/keyboards/c39/config.h
+++ b/keyboards/maple_computing/c39/config.h
diff --git a/keyboards/c39/info.json b/keyboards/maple_computing/c39/info.json
index 3600570dde..3600570dde 100755
--- a/keyboards/c39/info.json
+++ b/keyboards/maple_computing/c39/info.json
diff --git a/keyboards/c39/keymaps/default/keymap.c b/keyboards/maple_computing/c39/keymaps/default/keymap.c
index 9de75190d0..9de75190d0 100755
--- a/keyboards/c39/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/c39/keymaps/default/keymap.c
diff --git a/keyboards/c39/keymaps/default/readme.md b/keyboards/maple_computing/c39/keymaps/default/readme.md
index f5b1b6ac11..f5b1b6ac11 100755
--- a/keyboards/c39/keymaps/default/readme.md
+++ b/keyboards/maple_computing/c39/keymaps/default/readme.md
diff --git a/keyboards/c39/keymaps/drashna/config.h b/keyboards/maple_computing/c39/keymaps/drashna/config.h
index e48bc46ca8..e48bc46ca8 100644
--- a/keyboards/c39/keymaps/drashna/config.h
+++ b/keyboards/maple_computing/c39/keymaps/drashna/config.h
diff --git a/keyboards/c39/keymaps/drashna/keymap.c b/keyboards/maple_computing/c39/keymaps/drashna/keymap.c
index 6fd1f12984..6fd1f12984 100755
--- a/keyboards/c39/keymaps/drashna/keymap.c
+++ b/keyboards/maple_computing/c39/keymaps/drashna/keymap.c
diff --git a/keyboards/c39/keymaps/drashna/readme.md b/keyboards/maple_computing/c39/keymaps/drashna/readme.md
index a8efbaa5fe..a8efbaa5fe 100755
--- a/keyboards/c39/keymaps/drashna/readme.md
+++ b/keyboards/maple_computing/c39/keymaps/drashna/readme.md
diff --git a/keyboards/c39/keymaps/drashna/rules.mk b/keyboards/maple_computing/c39/keymaps/drashna/rules.mk
index a6575bbd93..a6575bbd93 100644
--- a/keyboards/c39/keymaps/drashna/rules.mk
+++ b/keyboards/maple_computing/c39/keymaps/drashna/rules.mk
diff --git a/keyboards/c39/keymaps/kuchosauronad0/config.h b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
index d67935a9fd..d67935a9fd 100644
--- a/keyboards/c39/keymaps/kuchosauronad0/config.h
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/config.h
diff --git a/keyboards/c39/keymaps/kuchosauronad0/keymap.c b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
index 231e3cf44d..231e3cf44d 100644
--- a/keyboards/c39/keymaps/kuchosauronad0/keymap.c
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/keymap.c
diff --git a/keyboards/c39/keymaps/kuchosauronad0/readme.md b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/readme.md
index ff01fb5ffa..ff01fb5ffa 100644
--- a/keyboards/c39/keymaps/kuchosauronad0/readme.md
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/readme.md
diff --git a/keyboards/c39/keymaps/kuchosauronad0/rules.mk b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/rules.mk
index a6304cdf4a..a6304cdf4a 100644
--- a/keyboards/c39/keymaps/kuchosauronad0/rules.mk
+++ b/keyboards/maple_computing/c39/keymaps/kuchosauronad0/rules.mk
diff --git a/keyboards/c39/readme.md b/keyboards/maple_computing/c39/readme.md
index 0454f1c12b..c74294e300 100755
--- a/keyboards/c39/readme.md
+++ b/keyboards/maple_computing/c39/readme.md
@@ -11,6 +11,6 @@ Hardware Availability: [SpaceCat.design](https://spacecat.design)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make c39:default
+    make maple_computing/c39: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/c39/rules.mk b/keyboards/maple_computing/c39/rules.mk
index 4b65b7b9de..4b65b7b9de 100755
--- a/keyboards/c39/rules.mk
+++ b/keyboards/maple_computing/c39/rules.mk
diff --git a/keyboards/christmas_tree/.noci b/keyboards/maple_computing/christmas_tree/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/christmas_tree/.noci
+++ b/keyboards/maple_computing/christmas_tree/.noci
diff --git a/keyboards/christmas_tree/V2017/V2017.c b/keyboards/maple_computing/christmas_tree/V2017/V2017.c
index e367270592..e367270592 100644
--- a/keyboards/christmas_tree/V2017/V2017.c
+++ b/keyboards/maple_computing/christmas_tree/V2017/V2017.c
diff --git a/keyboards/christmas_tree/V2017/V2017.h b/keyboards/maple_computing/christmas_tree/V2017/V2017.h
index f779c0ed47..f779c0ed47 100644
--- a/keyboards/christmas_tree/V2017/V2017.h
+++ b/keyboards/maple_computing/christmas_tree/V2017/V2017.h
diff --git a/keyboards/christmas_tree/V2017/config.h b/keyboards/maple_computing/christmas_tree/V2017/config.h
index abc94749a8..abc94749a8 100644
--- a/keyboards/christmas_tree/V2017/config.h
+++ b/keyboards/maple_computing/christmas_tree/V2017/config.h
diff --git a/keyboards/christmas_tree/V2017/rules.mk b/keyboards/maple_computing/christmas_tree/V2017/rules.mk
index 184a1f2247..184a1f2247 100644
--- a/keyboards/christmas_tree/V2017/rules.mk
+++ b/keyboards/maple_computing/christmas_tree/V2017/rules.mk
diff --git a/keyboards/christmas_tree/christmas_tree.c b/keyboards/maple_computing/christmas_tree/christmas_tree.c
index c03670a3a5..c03670a3a5 100644
--- a/keyboards/christmas_tree/christmas_tree.c
+++ b/keyboards/maple_computing/christmas_tree/christmas_tree.c
diff --git a/keyboards/christmas_tree/christmas_tree.h b/keyboards/maple_computing/christmas_tree/christmas_tree.h
index 68eefca6a8..68eefca6a8 100644
--- a/keyboards/christmas_tree/christmas_tree.h
+++ b/keyboards/maple_computing/christmas_tree/christmas_tree.h
diff --git a/keyboards/christmas_tree/config.h b/keyboards/maple_computing/christmas_tree/config.h
index 531c5996d2..531c5996d2 100644
--- a/keyboards/christmas_tree/config.h
+++ b/keyboards/maple_computing/christmas_tree/config.h
diff --git a/keyboards/christmas_tree/info.json b/keyboards/maple_computing/christmas_tree/info.json
index 5d24218c70..5d24218c70 100644
--- a/keyboards/christmas_tree/info.json
+++ b/keyboards/maple_computing/christmas_tree/info.json
diff --git a/keyboards/christmas_tree/keymaps/default/keymap.c b/keyboards/maple_computing/christmas_tree/keymaps/default/keymap.c
index 6931b91a61..6931b91a61 100644
--- a/keyboards/christmas_tree/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/christmas_tree/keymaps/default/keymap.c
diff --git a/keyboards/christmas_tree/keymaps/default/readme.md b/keyboards/maple_computing/christmas_tree/keymaps/default/readme.md
index a9cb4586ef..a9cb4586ef 100644
--- a/keyboards/christmas_tree/keymaps/default/readme.md
+++ b/keyboards/maple_computing/christmas_tree/keymaps/default/readme.md
diff --git a/keyboards/christmas_tree/readme.md b/keyboards/maple_computing/christmas_tree/readme.md
index b3337dd5ba..3ba255a18c 100644
--- a/keyboards/christmas_tree/readme.md
+++ b/keyboards/maple_computing/christmas_tree/readme.md
@@ -9,6 +9,6 @@ Keyboard Maintainer: [That-Canadian](https://github.com/That-Canadian)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make christmas_tree/V2017:default
+    make maple_computing/christmas_tree/V2017:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
\ No newline at end of file
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/christmas_tree/rules.mk b/keyboards/maple_computing/christmas_tree/rules.mk
index dada70c309..45ac883163 100644
--- a/keyboards/christmas_tree/rules.mk
+++ b/keyboards/maple_computing/christmas_tree/rules.mk
@@ -17,4 +17,4 @@ BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 
-DEFAULT_FOLDER = christmas_tree/V2017
+DEFAULT_FOLDER = maple_computing/christmas_tree/V2017
diff --git a/keyboards/ivy/.noci b/keyboards/maple_computing/ivy/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/ivy/.noci
+++ b/keyboards/maple_computing/ivy/.noci
diff --git a/keyboards/ivy/config.h b/keyboards/maple_computing/ivy/config.h
index 2ccf3b8f6f..2ccf3b8f6f 100644
--- a/keyboards/ivy/config.h
+++ b/keyboards/maple_computing/ivy/config.h
diff --git a/keyboards/ivy/ivy.c b/keyboards/maple_computing/ivy/ivy.c
index 007ef67253..007ef67253 100644
--- a/keyboards/ivy/ivy.c
+++ b/keyboards/maple_computing/ivy/ivy.c
diff --git a/keyboards/ivy/ivy.h b/keyboards/maple_computing/ivy/ivy.h
index 2cba5f4956..645c5e0ef7 100644
--- a/keyboards/ivy/ivy.h
+++ b/keyboards/maple_computing/ivy/ivy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef KEYBOARD_ivy_rev1
+#ifdef KEYBOARD_maple_computing_ivy_rev1
     #include "rev1.h"
 #endif
 
diff --git a/keyboards/ivy/keymaps/default/keymap.c b/keyboards/maple_computing/ivy/keymaps/default/keymap.c
index f02580f19c..f02580f19c 100644
--- a/keyboards/ivy/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/ivy/keymaps/default/keymap.c
diff --git a/keyboards/ivy/readme.md b/keyboards/maple_computing/ivy/readme.md
index f70630b52b..a3bc043b77 100644
--- a/keyboards/ivy/readme.md
+++ b/keyboards/maple_computing/ivy/readme.md
@@ -5,11 +5,11 @@ IVY
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ivy/rev1:default
+    make maple_computing/ivy/rev1:default
     
 Install examples:
 
-    make ivy/rev1:default:dfu
+    make maple_computing/ivy/rev1:default:dfu
 
 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/ivy/rev1/config.h b/keyboards/maple_computing/ivy/rev1/config.h
index 9b88b89e5e..9b88b89e5e 100644
--- a/keyboards/ivy/rev1/config.h
+++ b/keyboards/maple_computing/ivy/rev1/config.h
diff --git a/keyboards/ivy/rev1/info.json b/keyboards/maple_computing/ivy/rev1/info.json
index c5045bd80f..c5045bd80f 100644
--- a/keyboards/ivy/rev1/info.json
+++ b/keyboards/maple_computing/ivy/rev1/info.json
diff --git a/keyboards/ivy/rev1/rev1.c b/keyboards/maple_computing/ivy/rev1/rev1.c
index 007ef67253..007ef67253 100644
--- a/keyboards/ivy/rev1/rev1.c
+++ b/keyboards/maple_computing/ivy/rev1/rev1.c
diff --git a/keyboards/ivy/rev1/rev1.h b/keyboards/maple_computing/ivy/rev1/rev1.h
index ac338368ed..ac338368ed 100644
--- a/keyboards/ivy/rev1/rev1.h
+++ b/keyboards/maple_computing/ivy/rev1/rev1.h
diff --git a/keyboards/ivy/rev1/rules.mk b/keyboards/maple_computing/ivy/rev1/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/ivy/rev1/rules.mk
+++ b/keyboards/maple_computing/ivy/rev1/rules.mk
diff --git a/keyboards/ivy/rules.mk b/keyboards/maple_computing/ivy/rules.mk
index 66812904cd..66812904cd 100644
--- a/keyboards/ivy/rules.mk
+++ b/keyboards/maple_computing/ivy/rules.mk
diff --git a/keyboards/jnao/config.h b/keyboards/maple_computing/jnao/config.h
index 7598e049ae..7598e049ae 100644
--- a/keyboards/jnao/config.h
+++ b/keyboards/maple_computing/jnao/config.h
diff --git a/keyboards/jnao/info.json b/keyboards/maple_computing/jnao/info.json
index 4d8f332391..4d8f332391 100644
--- a/keyboards/jnao/info.json
+++ b/keyboards/maple_computing/jnao/info.json
diff --git a/keyboards/jnao/jnao.c b/keyboards/maple_computing/jnao/jnao.c
index 8a49c747a1..8a49c747a1 100644
--- a/keyboards/jnao/jnao.c
+++ b/keyboards/maple_computing/jnao/jnao.c
diff --git a/keyboards/jnao/jnao.h b/keyboards/maple_computing/jnao/jnao.h
index 357a025f91..357a025f91 100644
--- a/keyboards/jnao/jnao.h
+++ b/keyboards/maple_computing/jnao/jnao.h
diff --git a/keyboards/jnao/keymaps/default/keymap.c b/keyboards/maple_computing/jnao/keymaps/default/keymap.c
index 356f056bdb..356f056bdb 100644
--- a/keyboards/jnao/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/jnao/keymaps/default/keymap.c
diff --git a/keyboards/jnao/keymaps/default_4x12/keymap.c b/keyboards/maple_computing/jnao/keymaps/default_4x12/keymap.c
index 8861a36b23..8861a36b23 100644
--- a/keyboards/jnao/keymaps/default_4x12/keymap.c
+++ b/keyboards/maple_computing/jnao/keymaps/default_4x12/keymap.c
diff --git a/keyboards/jnao/keymaps/via/keymap.c b/keyboards/maple_computing/jnao/keymaps/via/keymap.c
index 00305db81d..00305db81d 100644
--- a/keyboards/jnao/keymaps/via/keymap.c
+++ b/keyboards/maple_computing/jnao/keymaps/via/keymap.c
diff --git a/keyboards/jnao/keymaps/via/rules.mk b/keyboards/maple_computing/jnao/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/jnao/keymaps/via/rules.mk
+++ b/keyboards/maple_computing/jnao/keymaps/via/rules.mk
diff --git a/keyboards/jnao/readme.md b/keyboards/maple_computing/jnao/readme.md
index 08cf10acaa..dd7b280a08 100644
--- a/keyboards/jnao/readme.md
+++ b/keyboards/maple_computing/jnao/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [SpaceCat](https://spacecat.design) and [Keebio](https://
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jnao:default
+    make maple_computing/jnao: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/jnao/rules.mk b/keyboards/maple_computing/jnao/rules.mk
index e50247dfb6..e50247dfb6 100644
--- a/keyboards/jnao/rules.mk
+++ b/keyboards/maple_computing/jnao/rules.mk
diff --git a/keyboards/launchpad/.noci b/keyboards/maple_computing/launchpad/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/launchpad/.noci
+++ b/keyboards/maple_computing/launchpad/.noci
diff --git a/keyboards/launchpad/config.h b/keyboards/maple_computing/launchpad/config.h
index 327d67016b..327d67016b 100644
--- a/keyboards/launchpad/config.h
+++ b/keyboards/maple_computing/launchpad/config.h
diff --git a/keyboards/launchpad/keymaps/brandonschlack/config.h b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
index 6aaf996e57..6aaf996e57 100644
--- a/keyboards/launchpad/keymaps/brandonschlack/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/config.h
diff --git a/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c
index 1ef77ccc6e..1ef77ccc6e 100644
--- a/keyboards/launchpad/keymaps/brandonschlack/keymap.c
+++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/keymap.c
diff --git a/keyboards/launchpad/keymaps/brandonschlack/readme.md b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/readme.md
index a91a1b80ac..a91a1b80ac 100644
--- a/keyboards/launchpad/keymaps/brandonschlack/readme.md
+++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/readme.md
diff --git a/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/rules.mk
index 31c8f7b39d..31c8f7b39d 100644
--- a/keyboards/launchpad/keymaps/brandonschlack/rules.mk
+++ b/keyboards/maple_computing/launchpad/keymaps/brandonschlack/rules.mk
diff --git a/keyboards/launchpad/keymaps/default/keymap.c b/keyboards/maple_computing/launchpad/keymaps/default/keymap.c
index 62dee131f8..62dee131f8 100644
--- a/keyboards/launchpad/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/launchpad/keymaps/default/keymap.c
diff --git a/keyboards/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
index cae1450c15..cae1450c15 100644
--- a/keyboards/launchpad/keymaps/default_rgb/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
diff --git a/keyboards/launchpad/keymaps/default_rgb/keymap.c b/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c
index 529fa91f65..529fa91f65 100644
--- a/keyboards/launchpad/keymaps/default_rgb/keymap.c
+++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c
diff --git a/keyboards/launchpad/keymaps/default_rgb/readme.md b/keyboards/maple_computing/launchpad/keymaps/default_rgb/readme.md
index 3f15ff9bc3..3f15ff9bc3 100644
--- a/keyboards/launchpad/keymaps/default_rgb/readme.md
+++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/readme.md
diff --git a/keyboards/launchpad/keymaps/default_rgb/rules.mk b/keyboards/maple_computing/launchpad/keymaps/default_rgb/rules.mk
index 1e3cebb145..1e3cebb145 100644
--- a/keyboards/launchpad/keymaps/default_rgb/rules.mk
+++ b/keyboards/maple_computing/launchpad/keymaps/default_rgb/rules.mk
diff --git a/keyboards/launchpad/keymaps/drashna/config.h b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
index b14becc25b..b14becc25b 100644
--- a/keyboards/launchpad/keymaps/drashna/config.h
+++ b/keyboards/maple_computing/launchpad/keymaps/drashna/config.h
diff --git a/keyboards/launchpad/keymaps/drashna/keymap.c b/keyboards/maple_computing/launchpad/keymaps/drashna/keymap.c
index f8e4d1a414..f8e4d1a414 100644
--- a/keyboards/launchpad/keymaps/drashna/keymap.c
+++ b/keyboards/maple_computing/launchpad/keymaps/drashna/keymap.c
diff --git a/keyboards/launchpad/keymaps/drashna/rules.mk b/keyboards/maple_computing/launchpad/keymaps/drashna/rules.mk
index c3b1e0a8b9..c3b1e0a8b9 100644
--- a/keyboards/launchpad/keymaps/drashna/rules.mk
+++ b/keyboards/maple_computing/launchpad/keymaps/drashna/rules.mk
diff --git a/keyboards/launchpad/keymaps/via/keymap.c b/keyboards/maple_computing/launchpad/keymaps/via/keymap.c
index ac25fa1e1e..ac25fa1e1e 100644
--- a/keyboards/launchpad/keymaps/via/keymap.c
+++ b/keyboards/maple_computing/launchpad/keymaps/via/keymap.c
diff --git a/keyboards/launchpad/keymaps/via/rules.mk b/keyboards/maple_computing/launchpad/keymaps/via/rules.mk
index 37484844f5..37484844f5 100644
--- a/keyboards/launchpad/keymaps/via/rules.mk
+++ b/keyboards/maple_computing/launchpad/keymaps/via/rules.mk
diff --git a/keyboards/launchpad/launchpad.c b/keyboards/maple_computing/launchpad/launchpad.c
index cc2812a76c..cc2812a76c 100644
--- a/keyboards/launchpad/launchpad.c
+++ b/keyboards/maple_computing/launchpad/launchpad.c
diff --git a/keyboards/launchpad/launchpad.h b/keyboards/maple_computing/launchpad/launchpad.h
index 59cf64afec..f2a1b40588 100644
--- a/keyboards/launchpad/launchpad.h
+++ b/keyboards/maple_computing/launchpad/launchpad.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(KEYBOARD_launchpad_rev1)
+#if defined(KEYBOARD_maple_computing_launchpad_rev1)
 #    include "rev1.h"
 #endif
 
diff --git a/keyboards/launchpad/readme.md b/keyboards/maple_computing/launchpad/readme.md
index 8128121946..1dc7a9b4cf 100644
--- a/keyboards/launchpad/readme.md
+++ b/keyboards/maple_computing/launchpad/readme.md
@@ -21,7 +21,7 @@ A fantastic project for beginners to learn to solder, veteran's of the hobby who
 
 Make example for this keyboard (after setting up your build environment):
 
-    make launchpad/rev1:default
+    make maple_computing/launchpad/rev1:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
@@ -29,4 +29,4 @@ See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools)
 
 Due to PCB tolerance issues outside of our control, the snap-apart legs included on the PCB may need extra padding to prevent a small amount of wobbling once placed properly. We have included small, clear, and semi-permanent "glue dots" in each order (PCB Only -and- Full Kit) to help with this. You may also use plastic wrap, tape, Elmer's glue, hot glue, rubber cement, etc. We advise against using anything more "permanent" in case you wish to make changes to your Launch Pad in the future. It is also best to attach legs after all of your soldering and building is finished, to get the most accurate feel for your Launch Pad.
 
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
\ No newline at end of file
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/keyboards/launchpad/rev1/config.h b/keyboards/maple_computing/launchpad/rev1/config.h
index debc28fab3..debc28fab3 100644
--- a/keyboards/launchpad/rev1/config.h
+++ b/keyboards/maple_computing/launchpad/rev1/config.h
diff --git a/keyboards/launchpad/rev1/info.json b/keyboards/maple_computing/launchpad/rev1/info.json
index c8ba35c966..c8ba35c966 100644
--- a/keyboards/launchpad/rev1/info.json
+++ b/keyboards/maple_computing/launchpad/rev1/info.json
diff --git a/keyboards/launchpad/rev1/rev1.c b/keyboards/maple_computing/launchpad/rev1/rev1.c
index cc2812a76c..cc2812a76c 100644
--- a/keyboards/launchpad/rev1/rev1.c
+++ b/keyboards/maple_computing/launchpad/rev1/rev1.c
diff --git a/keyboards/launchpad/rev1/rev1.h b/keyboards/maple_computing/launchpad/rev1/rev1.h
index 2ea6e7e775..2ea6e7e775 100644
--- a/keyboards/launchpad/rev1/rev1.h
+++ b/keyboards/maple_computing/launchpad/rev1/rev1.h
diff --git a/keyboards/launchpad/rev1/rules.mk b/keyboards/maple_computing/launchpad/rev1/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/launchpad/rev1/rules.mk
+++ b/keyboards/maple_computing/launchpad/rev1/rules.mk
diff --git a/keyboards/launchpad/rules.mk b/keyboards/maple_computing/launchpad/rules.mk
index 3bfec56432..67e76c6244 100644
--- a/keyboards/launchpad/rules.mk
+++ b/keyboards/maple_computing/launchpad/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 = launchpad/rev1
+DEFAULT_FOLDER = maple_computing/launchpad/rev1
diff --git a/keyboards/lets_split_eh/.noci b/keyboards/maple_computing/lets_split_eh/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/lets_split_eh/.noci
+++ b/keyboards/maple_computing/lets_split_eh/.noci
diff --git a/keyboards/lets_split_eh/config.h b/keyboards/maple_computing/lets_split_eh/config.h
index 787b9783b8..787b9783b8 100644
--- a/keyboards/lets_split_eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/config.h
diff --git a/keyboards/lets_split_eh/eh/config.h b/keyboards/maple_computing/lets_split_eh/eh/config.h
index 43e0266502..43e0266502 100644
--- a/keyboards/lets_split_eh/eh/config.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/config.h
diff --git a/keyboards/lets_split_eh/eh/eh.c b/keyboards/maple_computing/lets_split_eh/eh/eh.c
index d5a312085d..d5a312085d 100644
--- a/keyboards/lets_split_eh/eh/eh.c
+++ b/keyboards/maple_computing/lets_split_eh/eh/eh.c
diff --git a/keyboards/lets_split_eh/eh/eh.h b/keyboards/maple_computing/lets_split_eh/eh/eh.h
index ff37229787..ff37229787 100644
--- a/keyboards/lets_split_eh/eh/eh.h
+++ b/keyboards/maple_computing/lets_split_eh/eh/eh.h
diff --git a/keyboards/lets_split_eh/eh/info.json b/keyboards/maple_computing/lets_split_eh/eh/info.json
index c241fa3813..c241fa3813 100644
--- a/keyboards/lets_split_eh/eh/info.json
+++ b/keyboards/maple_computing/lets_split_eh/eh/info.json
diff --git a/keyboards/lets_split_eh/eh/rules.mk b/keyboards/maple_computing/lets_split_eh/eh/rules.mk
index 0c7e1cb04e..0c7e1cb04e 100644
--- a/keyboards/lets_split_eh/eh/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/eh/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/README.md b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/README.md
index fcb7037937..fcb7037937 100644
--- a/keyboards/lets_split_eh/keymaps/bbaserdem/README.md
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/README.md
diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/config.h
index 47be76567e..47be76567e 100755
--- a/keyboards/lets_split_eh/keymaps/bbaserdem/config.h
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/config.h
diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
index 92e72bbf1c..92e72bbf1c 100755
--- a/keyboards/lets_split_eh/keymaps/bbaserdem/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/rules.mk
index 7a37e989d8..7a37e989d8 100755
--- a/keyboards/lets_split_eh/keymaps/bbaserdem/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/bbaserdem/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/default/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/default/keymap.c
index 3f41051cf6..3f41051cf6 100644
--- a/keyboards/lets_split_eh/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/default/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/doxish_dvorak/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/config.h
index 526c0837c7..526c0837c7 100644
--- a/keyboards/lets_split_eh/keymaps/doxish_dvorak/config.h
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/config.h
diff --git a/keyboards/lets_split_eh/keymaps/doxish_dvorak/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
index 06ddace84c..06ddace84c 100644
--- a/keyboards/lets_split_eh/keymaps/doxish_dvorak/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/doxish_dvorak/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/lets_split_eh/keymaps/doxish_dvorak/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/doxish_dvorak/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/mikethetiger/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/config.h
index c535299e74..c535299e74 100644
--- a/keyboards/lets_split_eh/keymaps/mikethetiger/config.h
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/config.h
diff --git a/keyboards/lets_split_eh/keymaps/mikethetiger/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c
index 9e67b7dda8..9e67b7dda8 100644
--- a/keyboards/lets_split_eh/keymaps/mikethetiger/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/mikethetiger/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/lets_split_eh/keymaps/mikethetiger/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/mikethetiger/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/msiu/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/config.h
index 526c0837c7..526c0837c7 100644
--- a/keyboards/lets_split_eh/keymaps/msiu/config.h
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/config.h
diff --git a/keyboards/lets_split_eh/keymaps/msiu/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c
index af5c98241a..af5c98241a 100644
--- a/keyboards/lets_split_eh/keymaps/msiu/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/msiu/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/resfury/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h
index 0055bbf459..0055bbf459 100644
--- a/keyboards/lets_split_eh/keymaps/resfury/config.h
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/config.h
diff --git a/keyboards/lets_split_eh/keymaps/resfury/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
index 17f790675b..17f790675b 100644
--- a/keyboards/lets_split_eh/keymaps/resfury/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/resfury/readme.md b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md
index 6a882307b7..6a882307b7 100644
--- a/keyboards/lets_split_eh/keymaps/resfury/readme.md
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/readme.md
diff --git a/keyboards/lets_split_eh/keymaps/resfury/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk
index 7ad666d1a3..7ad666d1a3 100644
--- a/keyboards/lets_split_eh/keymaps/resfury/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/resfury/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/romus/README.md b/keyboards/maple_computing/lets_split_eh/keymaps/romus/README.md
index d54ed6856f..d54ed6856f 100644
--- a/keyboards/lets_split_eh/keymaps/romus/README.md
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/romus/README.md
diff --git a/keyboards/lets_split_eh/keymaps/romus/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/romus/keymap.c
index ba5b75a5cf..ba5b75a5cf 100644
--- a/keyboards/lets_split_eh/keymaps/romus/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/romus/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/romus/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/romus/rules.mk
index ad7dd4c474..ad7dd4c474 100644
--- a/keyboards/lets_split_eh/keymaps/romus/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/romus/rules.mk
diff --git a/keyboards/lets_split_eh/keymaps/that_canadian/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/config.h
index a1df337bd9..a1df337bd9 100644
--- a/keyboards/lets_split_eh/keymaps/that_canadian/config.h
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/config.h
diff --git a/keyboards/lets_split_eh/keymaps/that_canadian/keymap.c b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c
index bba9a02c8c..bba9a02c8c 100644
--- a/keyboards/lets_split_eh/keymaps/that_canadian/keymap.c
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/keymap.c
diff --git a/keyboards/lets_split_eh/keymaps/that_canadian/rules.mk b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/lets_split_eh/keymaps/that_canadian/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/keymaps/that_canadian/rules.mk
diff --git a/keyboards/lets_split_eh/lets_split_eh.c b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c
index 37075aa67d..37075aa67d 100644
--- a/keyboards/lets_split_eh/lets_split_eh.c
+++ b/keyboards/maple_computing/lets_split_eh/lets_split_eh.c
diff --git a/keyboards/lets_split_eh/lets_split_eh.h b/keyboards/maple_computing/lets_split_eh/lets_split_eh.h
index aa1f213b20..aae072e0b6 100644
--- a/keyboards/lets_split_eh/lets_split_eh.h
+++ b/keyboards/maple_computing/lets_split_eh/lets_split_eh.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_lets_split_eh_eh
+#ifdef KEYBOARD_maple_computing_lets_split_eh_eh
     #include "eh.h"
 #endif
diff --git a/keyboards/lets_split_eh/readme.md b/keyboards/maple_computing/lets_split_eh/readme.md
index 180cb33d73..90ae5393d1 100644
--- a/keyboards/lets_split_eh/readme.md
+++ b/keyboards/maple_computing/lets_split_eh/readme.md
@@ -8,6 +8,6 @@ Keyboard Maintainer: [Christopher Poole (That-Canadian)](https://github.com/That
 
 Make example for this keyboard (after setting up your build environment):
 
-    make lets_split_eh/eh:default
+    make maple_computing/lets_split_eh/eh:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
\ No newline at end of file
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/lets_split_eh/rules.mk b/keyboards/maple_computing/lets_split_eh/rules.mk
index 9662dfc60e..325d4e278c 100644
--- a/keyboards/lets_split_eh/rules.mk
+++ b/keyboards/maple_computing/lets_split_eh/rules.mk
@@ -21,4 +21,4 @@ SPLIT_KEYBOARD = yes
 
 LAYOUTS = ortho_4x12
 
-DEFAULT_FOLDER = lets_split_eh/eh
+DEFAULT_FOLDER = maple_computing/lets_split_eh/eh
diff --git a/keyboards/minidox/.noci b/keyboards/maple_computing/minidox/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/minidox/.noci
+++ b/keyboards/maple_computing/minidox/.noci
diff --git a/keyboards/minidox/config.h b/keyboards/maple_computing/minidox/config.h
index 2c71378961..2c71378961 100644
--- a/keyboards/minidox/config.h
+++ b/keyboards/maple_computing/minidox/config.h
diff --git a/keyboards/minidox/keymaps/alairock/config.h b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
index 6b0069f4b2..6b0069f4b2 100644
--- a/keyboards/minidox/keymaps/alairock/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/config.h
diff --git a/keyboards/minidox/keymaps/alairock/keymap.c b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
index c592b1a6a9..c592b1a6a9 100644
--- a/keyboards/minidox/keymaps/alairock/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/keymap.c
diff --git a/keyboards/minidox/keymaps/alairock/rules.mk b/keyboards/maple_computing/minidox/keymaps/alairock/rules.mk
index ebada165ae..ebada165ae 100644
--- a/keyboards/minidox/keymaps/alairock/rules.mk
+++ b/keyboards/maple_computing/minidox/keymaps/alairock/rules.mk
diff --git a/keyboards/minidox/keymaps/bepo/config.h b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
index 7338c24c68..7338c24c68 100644
--- a/keyboards/minidox/keymaps/bepo/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
diff --git a/keyboards/minidox/keymaps/bepo/keymap.c b/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
index 331a22314d..331a22314d 100644
--- a/keyboards/minidox/keymaps/bepo/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
diff --git a/keyboards/minidox/keymaps/bepo/readme.md b/keyboards/maple_computing/minidox/keymaps/bepo/readme.md
index f928c94471..f928c94471 100644
--- a/keyboards/minidox/keymaps/bepo/readme.md
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/readme.md
diff --git a/keyboards/minidox/keymaps/default/keymap.c b/keyboards/maple_computing/minidox/keymaps/default/keymap.c
index 737b53d301..737b53d301 100644
--- a/keyboards/minidox/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/default/keymap.c
diff --git a/keyboards/minidox/keymaps/dustypomerleau/README.md b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/README.md
index b2ec771257..b2ec771257 100644
--- a/keyboards/minidox/keymaps/dustypomerleau/README.md
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/README.md
diff --git a/keyboards/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
index b2169947b7..b2169947b7 100644
--- a/keyboards/minidox/keymaps/dustypomerleau/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
diff --git a/keyboards/minidox/keymaps/dustypomerleau/keymap.c b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
index e93a09f64a..e93a09f64a 100644
--- a/keyboards/minidox/keymaps/dustypomerleau/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/keymap.c
diff --git a/keyboards/minidox/keymaps/dustypomerleau/rules.mk b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/rules.mk
index 2a74d95536..2a74d95536 100644
--- a/keyboards/minidox/keymaps/dustypomerleau/rules.mk
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/rules.mk
diff --git a/keyboards/minidox/keymaps/haegin/keymap.c b/keyboards/maple_computing/minidox/keymaps/haegin/keymap.c
index d95243f10b..d95243f10b 100644
--- a/keyboards/minidox/keymaps/haegin/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/haegin/keymap.c
diff --git a/keyboards/minidox/keymaps/khitsule/config.h b/keyboards/maple_computing/minidox/keymaps/khitsule/config.h
index 645e80ee8f..645e80ee8f 100644
--- a/keyboards/minidox/keymaps/khitsule/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/khitsule/config.h
diff --git a/keyboards/minidox/keymaps/khitsule/keymap.c b/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c
index 1c6b6749f3..1c6b6749f3 100644
--- a/keyboards/minidox/keymaps/khitsule/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/khitsule/keymap.c
diff --git a/keyboards/minidox/keymaps/khitsule/readme.md b/keyboards/maple_computing/minidox/keymaps/khitsule/readme.md
index 92e2527942..92e2527942 100644
--- a/keyboards/minidox/keymaps/khitsule/readme.md
+++ b/keyboards/maple_computing/minidox/keymaps/khitsule/readme.md
diff --git a/keyboards/minidox/keymaps/norman/config.h b/keyboards/maple_computing/minidox/keymaps/norman/config.h
index 0d3542a03e..0d3542a03e 100644
--- a/keyboards/minidox/keymaps/norman/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/norman/config.h
diff --git a/keyboards/minidox/keymaps/norman/keymap.c b/keyboards/maple_computing/minidox/keymaps/norman/keymap.c
index 2786b7dd93..2786b7dd93 100644
--- a/keyboards/minidox/keymaps/norman/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/norman/keymap.c
diff --git a/keyboards/minidox/keymaps/norman/readme.md b/keyboards/maple_computing/minidox/keymaps/norman/readme.md
index 018e436322..018e436322 100644
--- a/keyboards/minidox/keymaps/norman/readme.md
+++ b/keyboards/maple_computing/minidox/keymaps/norman/readme.md
diff --git a/keyboards/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
index 1106412b59..1106412b59 100644
--- a/keyboards/minidox/keymaps/rsthd_combos/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
diff --git a/keyboards/minidox/keymaps/rsthd_combos/keymap.c b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
index d80febecaf..d80febecaf 100644
--- a/keyboards/minidox/keymaps/rsthd_combos/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/keymap.c
diff --git a/keyboards/minidox/keymaps/rsthd_combos/readme.md b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/readme.md
index 877d7059e7..877d7059e7 100644
--- a/keyboards/minidox/keymaps/rsthd_combos/readme.md
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/readme.md
diff --git a/keyboards/minidox/keymaps/rsthd_combos/rules.mk b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/minidox/keymaps/rsthd_combos/rules.mk
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/rules.mk
diff --git a/keyboards/minidox/keymaps/that_canadian/config.h b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
index b85609127e..b85609127e 100644
--- a/keyboards/minidox/keymaps/that_canadian/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/config.h
diff --git a/keyboards/minidox/keymaps/that_canadian/keymap.c b/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c
index 78ddca30e8..78ddca30e8 100644
--- a/keyboards/minidox/keymaps/that_canadian/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/keymap.c
diff --git a/keyboards/minidox/keymaps/that_canadian/rules.mk b/keyboards/maple_computing/minidox/keymaps/that_canadian/rules.mk
index f1ef68387f..f1ef68387f 100644
--- a/keyboards/minidox/keymaps/that_canadian/rules.mk
+++ b/keyboards/maple_computing/minidox/keymaps/that_canadian/rules.mk
diff --git a/keyboards/minidox/keymaps/tomb0y/README.md b/keyboards/maple_computing/minidox/keymaps/tomb0y/README.md
index c00cca1c5b..c00cca1c5b 100644
--- a/keyboards/minidox/keymaps/tomb0y/README.md
+++ b/keyboards/maple_computing/minidox/keymaps/tomb0y/README.md
diff --git a/keyboards/minidox/keymaps/tomb0y/keymap.c b/keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c
index cb7cd4d0a5..cb7cd4d0a5 100644
--- a/keyboards/minidox/keymaps/tomb0y/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/tomb0y/keymap.c
diff --git a/keyboards/minidox/keymaps/tw1t611/keymap.c b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
index f479b10f67..f479b10f67 100644
--- a/keyboards/minidox/keymaps/tw1t611/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/tw1t611/keymap.c
diff --git a/keyboards/minidox/keymaps/tw1t611/readme.md b/keyboards/maple_computing/minidox/keymaps/tw1t611/readme.md
index 7ab4526fbc..7ab4526fbc 100644
--- a/keyboards/minidox/keymaps/tw1t611/readme.md
+++ b/keyboards/maple_computing/minidox/keymaps/tw1t611/readme.md
diff --git a/keyboards/minidox/keymaps/tw1t611/rules.mk b/keyboards/maple_computing/minidox/keymaps/tw1t611/rules.mk
index fcfd2225bc..fcfd2225bc 100644
--- a/keyboards/minidox/keymaps/tw1t611/rules.mk
+++ b/keyboards/maple_computing/minidox/keymaps/tw1t611/rules.mk
diff --git a/keyboards/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
index ae26f94999..ae26f94999 100644
--- a/keyboards/minidox/keymaps/xyverz/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
diff --git a/keyboards/minidox/keymaps/xyverz/keymap.c b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
index 4c7a05227f..4c7a05227f 100644
--- a/keyboards/minidox/keymaps/xyverz/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/keymap.c
diff --git a/keyboards/minidox/keymaps/xyverz/rules.mk b/keyboards/maple_computing/minidox/keymaps/xyverz/rules.mk
index c777cb1b9f..c777cb1b9f 100644
--- a/keyboards/minidox/keymaps/xyverz/rules.mk
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/rules.mk
diff --git a/keyboards/minidox/minidox.c b/keyboards/maple_computing/minidox/minidox.c
index b4bffbb3e4..b4bffbb3e4 100644
--- a/keyboards/minidox/minidox.c
+++ b/keyboards/maple_computing/minidox/minidox.c
diff --git a/keyboards/minidox/minidox.h b/keyboards/maple_computing/minidox/minidox.h
index 5d5ca9f501..bae36b5560 100644
--- a/keyboards/minidox/minidox.h
+++ b/keyboards/maple_computing/minidox/minidox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef KEYBOARD_minidox_rev1
+#ifdef KEYBOARD_maple_computing_minidox_rev1
     #include "rev1.h"
 #endif
 
diff --git a/keyboards/minidox/readme.md b/keyboards/maple_computing/minidox/readme.md
index ec52e1f757..934985348c 100644
--- a/keyboards/minidox/readme.md
+++ b/keyboards/maple_computing/minidox/readme.md
@@ -9,11 +9,11 @@ A compact version of the ErgoDox
 
 Make example for this keyboard (after setting up your build environment):
 
-    make minidox/rev1:default
+    make maple_computing/minidox/rev1:default
 
 Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
 
-    make minidox/rev1:default:flash
+    make maple_computing/minidox/rev1:default:flash
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
diff --git a/keyboards/minidox/rev1/config.h b/keyboards/maple_computing/minidox/rev1/config.h
index 734ca562fd..734ca562fd 100644
--- a/keyboards/minidox/rev1/config.h
+++ b/keyboards/maple_computing/minidox/rev1/config.h
diff --git a/keyboards/minidox/rev1/info.json b/keyboards/maple_computing/minidox/rev1/info.json
index 47ed14dab0..47ed14dab0 100644
--- a/keyboards/minidox/rev1/info.json
+++ b/keyboards/maple_computing/minidox/rev1/info.json
diff --git a/keyboards/minidox/rev1/rev1.c b/keyboards/maple_computing/minidox/rev1/rev1.c
index 72b473933e..72b473933e 100644
--- a/keyboards/minidox/rev1/rev1.c
+++ b/keyboards/maple_computing/minidox/rev1/rev1.c
diff --git a/keyboards/minidox/rev1/rev1.h b/keyboards/maple_computing/minidox/rev1/rev1.h
index bb8bd64666..bb8bd64666 100644
--- a/keyboards/minidox/rev1/rev1.h
+++ b/keyboards/maple_computing/minidox/rev1/rev1.h
diff --git a/keyboards/minidox/rev1/rules.mk b/keyboards/maple_computing/minidox/rev1/rules.mk
index 8ec0de6f7f..8ec0de6f7f 100644
--- a/keyboards/minidox/rev1/rules.mk
+++ b/keyboards/maple_computing/minidox/rev1/rules.mk
diff --git a/keyboards/minidox/rules.mk b/keyboards/maple_computing/minidox/rules.mk
index 69d7bcced4..175ed0f6be 100644
--- a/keyboards/minidox/rules.mk
+++ b/keyboards/maple_computing/minidox/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes
 
-DEFAULT_FOLDER = minidox/rev1
+DEFAULT_FOLDER = maple_computing/minidox/rev1
diff --git a/keyboards/the_ruler/config.h b/keyboards/maple_computing/the_ruler/config.h
index bcb7441140..bcb7441140 100644
--- a/keyboards/the_ruler/config.h
+++ b/keyboards/maple_computing/the_ruler/config.h
diff --git a/keyboards/the_ruler/info.json b/keyboards/maple_computing/the_ruler/info.json
index 5f2b9fba8f..5f2b9fba8f 100644
--- a/keyboards/the_ruler/info.json
+++ b/keyboards/maple_computing/the_ruler/info.json
diff --git a/keyboards/the_ruler/keymaps/default/keymap.c b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
index 898881fc3c..898881fc3c 100644
--- a/keyboards/the_ruler/keymaps/default/keymap.c
+++ b/keyboards/maple_computing/the_ruler/keymaps/default/keymap.c
diff --git a/keyboards/the_ruler/keymaps/default/readme.md b/keyboards/maple_computing/the_ruler/keymaps/default/readme.md
index b515c1d48e..b515c1d48e 100644
--- a/keyboards/the_ruler/keymaps/default/readme.md
+++ b/keyboards/maple_computing/the_ruler/keymaps/default/readme.md
diff --git a/keyboards/the_ruler/readme.md b/keyboards/maple_computing/the_ruler/readme.md
index 13ea61c9a7..ff958db029 100644
--- a/keyboards/the_ruler/readme.md
+++ b/keyboards/maple_computing/the_ruler/readme.md
@@ -8,6 +8,6 @@ Hardware Availability: [Bishop Keyboards](https://bishopkeyboards.com/product/pc
 
 Make example for this keyboard (after setting up your build environment):
 
-    make the_ruler:default
+    make maple_computing/the_ruler: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/the_ruler/rules.mk b/keyboards/maple_computing/the_ruler/rules.mk
index 986f0f277a..986f0f277a 100644
--- a/keyboards/the_ruler/rules.mk
+++ b/keyboards/maple_computing/the_ruler/rules.mk
diff --git a/keyboards/the_ruler/the_ruler.c b/keyboards/maple_computing/the_ruler/the_ruler.c
index 29a8248924..29a8248924 100644
--- a/keyboards/the_ruler/the_ruler.c
+++ b/keyboards/maple_computing/the_ruler/the_ruler.c
diff --git a/keyboards/the_ruler/the_ruler.h b/keyboards/maple_computing/the_ruler/the_ruler.h
index 171d21a072..171d21a072 100644
--- a/keyboards/the_ruler/the_ruler.h
+++ b/keyboards/maple_computing/the_ruler/the_ruler.h