112 files changed, 13 insertions, 13 deletions
diff --git a/keyboards/ergodox_infinity/MEMO.txt b/keyboards/input_club/ergodox_infinity/MEMO.txt
index e2886aa002..e2886aa002 100644
--- a/keyboards/ergodox_infinity/MEMO.txt
+++ b/keyboards/input_club/ergodox_infinity/MEMO.txt
diff --git a/keyboards/ergodox_infinity/chconf.h b/keyboards/input_club/ergodox_infinity/chconf.h
index 710d8aa437..710d8aa437 100644
--- a/keyboards/ergodox_infinity/chconf.h
+++ b/keyboards/input_club/ergodox_infinity/chconf.h
diff --git a/keyboards/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index e6f1b81f54..e6f1b81f54 100644
--- a/keyboards/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.c b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
index e6ac2c4559..e6ac2c4559 100644
--- a/keyboards/ergodox_infinity/ergodox_infinity.c
+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.c
diff --git a/keyboards/ergodox_infinity/ergodox_infinity.h b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
index b9636b69be..b9636b69be 100644
--- a/keyboards/ergodox_infinity/ergodox_infinity.h
+++ b/keyboards/input_club/ergodox_infinity/ergodox_infinity.h
diff --git a/keyboards/ergodox_infinity/halconf.h b/keyboards/input_club/ergodox_infinity/halconf.h
index 8c050a2d5c..8c050a2d5c 100644
--- a/keyboards/ergodox_infinity/halconf.h
+++ b/keyboards/input_club/ergodox_infinity/halconf.h
diff --git a/keyboards/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index 22b20eec39..22b20eec39 100644
--- a/keyboards/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
diff --git a/keyboards/ergodox_infinity/keymaps/default/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
index cd65001803..cd65001803 100644
--- a/keyboards/ergodox_infinity/keymaps/default/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/README.md
index a0e4565b10..a0e4565b10 100644
--- a/keyboards/ergodox_infinity/keymaps/dudeofawesome/README.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/config.h b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/config.h
index 9dcf8a7f43..9dcf8a7f43 100644
--- a/keyboards/ergodox_infinity/keymaps/dudeofawesome/config.h
+++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
index 675b56edec..675b56edec 100644
--- a/keyboards/ergodox_infinity/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/dudeofawesome/layers.h b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/layers.h
index d852fe9803..d852fe9803 100644
--- a/keyboards/ergodox_infinity/keymaps/dudeofawesome/layers.h
+++ b/keyboards/input_club/ergodox_infinity/keymaps/dudeofawesome/layers.h
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/config.h b/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h
index 772ce0bac9..772ce0bac9 100644
--- a/keyboards/ergodox_infinity/keymaps/gordon/config.h
+++ b/keyboards/input_club/ergodox_infinity/keymaps/gordon/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
index c321d546fb..c321d546fb 100644
--- a/keyboards/ergodox_infinity/keymaps/gordon/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/gordon/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/gordon/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk
index 9a56408f8e..9a56408f8e 100644
--- a/keyboards/ergodox_infinity/keymaps/gordon/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/keymaps/gordon/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/config.h
index bca8571e79..bca8571e79 100644
--- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/config.h
+++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index 3870dd8ffd..3870dd8ffd 100644
--- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/halfkeyboard/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/rules.mk
index 04cd01b2b7..04cd01b2b7 100644
--- a/keyboards/ergodox_infinity/keymaps/halfkeyboard/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/input_club/README.md b/keyboards/input_club/ergodox_infinity/keymaps/input_club/README.md
index 31ae23ac40..31ae23ac40 100644
--- a/keyboards/ergodox_infinity/keymaps/input_club/README.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/input_club/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/input_club/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
index 545429fca0..545429fca0 100644
--- a/keyboards/ergodox_infinity/keymaps/input_club/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/input_club/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/narze/config.h b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
index d5ed0a8e9e..d5ed0a8e9e 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/config.h
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
diff --git a/keyboards/ergodox_infinity/keymaps/narze/default.png.md b/keyboards/input_club/ergodox_infinity/keymaps/narze/default.png.md
index 744e7d172a..744e7d172a 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/default.png.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/default.png.md
diff --git a/keyboards/ergodox_infinity/keymaps/narze/default_highres.png.md b/keyboards/input_club/ergodox_infinity/keymaps/narze/default_highres.png.md
index 074e0634d2..074e0634d2 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/default_highres.png.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/default_highres.png.md
diff --git a/keyboards/ergodox_infinity/keymaps/narze/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
index dd721e9a78..dd721e9a78 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/narze/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/narze/readme.md
index 3094b021e0..3094b021e0 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/readme.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/narze/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/narze/rules.mk
index 4a4ed58610..4a4ed58610 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/narze/visualizer.c b/keyboards/input_club/ergodox_infinity/keymaps/narze/visualizer.c
index 88f658d6b9..88f658d6b9 100644
--- a/keyboards/ergodox_infinity/keymaps/narze/visualizer.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/visualizer.c
diff --git a/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
index d08b96cc6e..d08b96cc6e 100644
--- a/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/nordic_ergo/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
index 2ed5268649..2ed5268649 100644
--- a/keyboards/ergodox_infinity/keymaps/nordic_ergo/readme.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/nordic_ergo/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/not-quite-neo/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
index 8cf51842a2..8cf51842a2 100644
--- a/keyboards/ergodox_infinity/keymaps/not-quite-neo/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/not-quite-neo/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/readme.md
index 3fcb4edf0d..3fcb4edf0d 100644
--- a/keyboards/ergodox_infinity/keymaps/not-quite-neo/readme.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/not-quite-neo/rules.mk b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/rules.mk
index 74505bd69e..74505bd69e 100644
--- a/keyboards/ergodox_infinity/keymaps/not-quite-neo/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/keymaps/not-quite-neo/rules.mk
diff --git a/keyboards/ergodox_infinity/keymaps/rask/README.md b/keyboards/input_club/ergodox_infinity/keymaps/rask/README.md
index 8a13994301..8a13994301 100644
--- a/keyboards/ergodox_infinity/keymaps/rask/README.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/rask/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/rask/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
index e31c1c5d6b..e31c1c5d6b 100644
--- a/keyboards/ergodox_infinity/keymaps/rask/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/rask/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
index 31d218ebfb..31d218ebfb 100644
--- a/keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/keymap.c
diff --git a/keyboards/ergodox_infinity/keymaps/rjhilgefort/readme.md b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/readme.md
index bb141b99dc..bb141b99dc 100644
--- a/keyboards/ergodox_infinity/keymaps/rjhilgefort/readme.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/rjhilgefort/readme.md
diff --git a/keyboards/ergodox_infinity/keymaps/trulyergonomic/README.md b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
index 1e248742ee..1e248742ee 100644
--- a/keyboards/ergodox_infinity/keymaps/trulyergonomic/README.md
+++ b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/README.md
diff --git a/keyboards/ergodox_infinity/keymaps/trulyergonomic/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
index 02f409ad9e..02f409ad9e 100644
--- a/keyboards/ergodox_infinity/keymaps/trulyergonomic/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/trulyergonomic/keymap.c
diff --git a/keyboards/ergodox_infinity/mcuconf.h b/keyboards/input_club/ergodox_infinity/mcuconf.h
index f6730b99ca..f6730b99ca 100644
--- a/keyboards/ergodox_infinity/mcuconf.h
+++ b/keyboards/input_club/ergodox_infinity/mcuconf.h
diff --git a/keyboards/ergodox_infinity/readme.md b/keyboards/input_club/ergodox_infinity/readme.md
index c51bdd7c82..1f8b643340 100644
--- a/keyboards/ergodox_infinity/readme.md
+++ b/keyboards/input_club/ergodox_infinity/readme.md
@@ -5,19 +5,19 @@ for the left and right halves seperately.  To flash them:
 
   - Make sure you are in the top-level qmk_firmware directory
 
-  - Build the firmware with `make ergodox_infinity:keymapname`
+  - Build the firmware with `make input_club/ergodox_infinity:keymapname`
 
   - Plug in the left hand keyboard only.
 
   - Press the program button (back of keyboard, above thumb pad).
 
-  - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util`
+  - Install the firmware with `sudo make input_club/ergodox_infinity:keymapname:dfu-util`
 
   - Plug in the right hand keyboard only.
 
   - Press the program button (back of keyboard, above thumb pad).
 
-  - Install the firmware with `sudo make ergodox_infinity:keymapname:dfu-util`
+  - Install the firmware with `sudo make input_club/ergodox_infinity:keymapname:dfu-util`
 
 More information on the Infinity firmware is available in the [TMK/chibios for
 Input Club Infinity Ergodox](https://github.com/fredizzimo/infinity_ergodox/blob/master/README.md)
@@ -43,7 +43,7 @@ They only need to be done once, unless you reset the EEPROM later.
 
   - Plug in the left keyboard half to the computer, and press its program button.
 
-  - Flash the left half with `make ergodox_infinity:default:dfu-util-split-left`
+  - Flash the left half with `make input_club/ergodox_infinity:default:dfu-util-split-left`
     (If you need to use a different method to flash your keyboard, still run this command,
     and abort it with Ctrl+C when the flashing attempts starts to print errors,
     then flash the built firmware).
@@ -53,13 +53,13 @@ They only need to be done once, unless you reset the EEPROM later.
 
   - Plug in the right keyboard half to the computer, and press its program button.
 
-  - Flash the right half with `make ergodox_infinity:default:dfu-util-split-right`
+  - Flash the right half with `make input_club/ergodox_infinity:default:dfu-util-split-right`
 
   - On the right half, press the top vertical 1.5U key (second from the top in the leftmost column) once,
     then the 1U key at the bottom in the opposite corner (bottom right corner).
 
   - Add `#define EE_HANDS` to the config.h file of your keymap, and build your firmware using
-    `make ergodox_infinity:keymapname`.
+    `make input_club/ergodox_infinity:keymapname`.
 
   - After this, you can flash both halves with the same firmware, _without_ risking a mirrored keyboard when connected the wrong way.
     If you reset your EEPROM later, you'll have to follow these steps again, though.
diff --git a/keyboards/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk
index c35f54de30..c35f54de30 100644
--- a/keyboards/ergodox_infinity/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/rules.mk
diff --git a/keyboards/infinity60/chconf.h b/keyboards/input_club/infinity60/chconf.h
index 3f1f9a8d76..3f1f9a8d76 100644
--- a/keyboards/infinity60/chconf.h
+++ b/keyboards/input_club/infinity60/chconf.h
diff --git a/keyboards/infinity60/config.h b/keyboards/input_club/infinity60/config.h
index e73a663b39..e73a663b39 100644
--- a/keyboards/infinity60/config.h
+++ b/keyboards/input_club/infinity60/config.h
diff --git a/keyboards/infinity60/halconf.h b/keyboards/input_club/infinity60/halconf.h
index f2a330b416..f2a330b416 100644
--- a/keyboards/infinity60/halconf.h
+++ b/keyboards/input_club/infinity60/halconf.h
diff --git a/keyboards/infinity60/infinity60.c b/keyboards/input_club/infinity60/infinity60.c
index 73751140ea..73751140ea 100644
--- a/keyboards/infinity60/infinity60.c
+++ b/keyboards/input_club/infinity60/infinity60.c
diff --git a/keyboards/infinity60/infinity60.h b/keyboards/input_club/infinity60/infinity60.h
index ac1470d5f6..ac1470d5f6 100644
--- a/keyboards/infinity60/infinity60.h
+++ b/keyboards/input_club/infinity60/infinity60.h
diff --git a/keyboards/infinity60/info.json b/keyboards/input_club/infinity60/info.json
index 3fbd8b1b25..3fbd8b1b25 100644
--- a/keyboards/infinity60/info.json
+++ b/keyboards/input_club/infinity60/info.json
diff --git a/keyboards/infinity60/keymaps/default/keymap.c b/keyboards/input_club/infinity60/keymaps/default/keymap.c
index 334c24e29e..334c24e29e 100644
--- a/keyboards/infinity60/keymaps/default/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/default/keymap.c
diff --git a/keyboards/infinity60/keymaps/depariel/keymap.c b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
index 22d74b866b..22d74b866b 100755
--- a/keyboards/infinity60/keymaps/depariel/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/depariel/keymap.c
diff --git a/keyboards/infinity60/keymaps/hasu/keymap.c b/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
index be14c1b977..be14c1b977 100644
--- a/keyboards/infinity60/keymaps/hasu/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
diff --git a/keyboards/infinity60/keymaps/jpetermans/config.h b/keyboards/input_club/infinity60/keymaps/jpetermans/config.h
index 1949a9ad9d..1949a9ad9d 100644
--- a/keyboards/infinity60/keymaps/jpetermans/config.h
+++ b/keyboards/input_club/infinity60/keymaps/jpetermans/config.h
diff --git a/keyboards/infinity60/keymaps/jpetermans/keymap.c b/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
index 3c2e0d4da8..3c2e0d4da8 100644
--- a/keyboards/infinity60/keymaps/jpetermans/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/jpetermans/keymap.c
diff --git a/keyboards/infinity60/keymaps/jpetermans/readme.md b/keyboards/input_club/infinity60/keymaps/jpetermans/readme.md
index 00421015bd..00421015bd 100644
--- a/keyboards/infinity60/keymaps/jpetermans/readme.md
+++ b/keyboards/input_club/infinity60/keymaps/jpetermans/readme.md
diff --git a/keyboards/infinity60/led.c b/keyboards/input_club/infinity60/led.c
index 8effcea81a..8effcea81a 100644
--- a/keyboards/infinity60/led.c
+++ b/keyboards/input_club/infinity60/led.c
diff --git a/keyboards/infinity60/led/config.h b/keyboards/input_club/infinity60/led/config.h
index 5bd3b590b9..5bd3b590b9 100644
--- a/keyboards/infinity60/led/config.h
+++ b/keyboards/input_club/infinity60/led/config.h
diff --git a/keyboards/infinity60/led/readme.md b/keyboards/input_club/infinity60/led/readme.md
index d31335031f..d31335031f 100644
--- a/keyboards/infinity60/led/readme.md
+++ b/keyboards/input_club/infinity60/led/readme.md
diff --git a/keyboards/infinity60/led/rules.mk b/keyboards/input_club/infinity60/led/rules.mk
index d48f3b73a5..d48f3b73a5 100644
--- a/keyboards/infinity60/led/rules.mk
+++ b/keyboards/input_club/infinity60/led/rules.mk
diff --git a/keyboards/infinity60/led_controller.c b/keyboards/input_club/infinity60/led_controller.c
index cf3edf20dd..cf3edf20dd 100644
--- a/keyboards/infinity60/led_controller.c
+++ b/keyboards/input_club/infinity60/led_controller.c
diff --git a/keyboards/infinity60/led_controller.h b/keyboards/input_club/infinity60/led_controller.h
index e4b4717646..e4b4717646 100644
--- a/keyboards/infinity60/led_controller.h
+++ b/keyboards/input_club/infinity60/led_controller.h
diff --git a/keyboards/infinity60/mcuconf.h b/keyboards/input_club/infinity60/mcuconf.h
index 6af85d0796..6af85d0796 100644
--- a/keyboards/infinity60/mcuconf.h
+++ b/keyboards/input_club/infinity60/mcuconf.h
diff --git a/keyboards/infinity60/readme.md b/keyboards/input_club/infinity60/readme.md
index d99d1df080..e8ee6a9dad 100644
--- a/keyboards/infinity60/readme.md
+++ b/keyboards/input_club/infinity60/readme.md
@@ -8,10 +8,10 @@ A compact community driven keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make infinity60:default
+    make input_club/infinity60/rev1:default
 
 Flashing example for this keyboard:
 
-    make infinity60:default:flash
+    make input_club/infinity60/rev1:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/infinity60/rev1/config.h b/keyboards/input_club/infinity60/rev1/config.h
index d4ab34bccc..d4ab34bccc 100644
--- a/keyboards/infinity60/rev1/config.h
+++ b/keyboards/input_club/infinity60/rev1/config.h
diff --git a/keyboards/infinity60/rev1/readme.md b/keyboards/input_club/infinity60/rev1/readme.md
index 5df5cf5336..5df5cf5336 100644
--- a/keyboards/infinity60/rev1/readme.md
+++ b/keyboards/input_club/infinity60/rev1/readme.md
diff --git a/keyboards/infinity60/rev1/rules.mk b/keyboards/input_club/infinity60/rev1/rules.mk
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/infinity60/rev1/rules.mk
+++ b/keyboards/input_club/infinity60/rev1/rules.mk
diff --git a/keyboards/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk
index a3e05edde1..7e21a06a9b 100644
--- a/keyboards/infinity60/rules.mk
+++ b/keyboards/input_club/infinity60/rules.mk
@@ -26,7 +26,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 
-DEFAULT_FOLDER = infinity60/led
+DEFAULT_FOLDER = input_club/infinity60/led
 
 LAYOUTS = 60_ansi_split_bs_rshift
 
diff --git a/keyboards/k_type/chconf.h b/keyboards/input_club/k_type/chconf.h
index ae0cce51ed..ae0cce51ed 100644
--- a/keyboards/k_type/chconf.h
+++ b/keyboards/input_club/k_type/chconf.h
diff --git a/keyboards/k_type/config.h b/keyboards/input_club/k_type/config.h
index de73e06a98..de73e06a98 100644
--- a/keyboards/k_type/config.h
+++ b/keyboards/input_club/k_type/config.h
diff --git a/keyboards/k_type/halconf.h b/keyboards/input_club/k_type/halconf.h
index c615d9656f..c615d9656f 100644
--- a/keyboards/k_type/halconf.h
+++ b/keyboards/input_club/k_type/halconf.h
diff --git a/keyboards/k_type/i2c_master.c b/keyboards/input_club/k_type/i2c_master.c
index af34d55ef6..af34d55ef6 100644
--- a/keyboards/k_type/i2c_master.c
+++ b/keyboards/input_club/k_type/i2c_master.c
diff --git a/keyboards/k_type/i2c_master.h b/keyboards/input_club/k_type/i2c_master.h
index d4e9d6878f..d4e9d6878f 100644
--- a/keyboards/k_type/i2c_master.h
+++ b/keyboards/input_club/k_type/i2c_master.h
diff --git a/keyboards/k_type/info.json b/keyboards/input_club/k_type/info.json
index cf0c9253bd..cf0c9253bd 100644
--- a/keyboards/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
diff --git a/keyboards/k_type/is31fl3733-dual.c b/keyboards/input_club/k_type/is31fl3733-dual.c
index e76479b01a..e76479b01a 100644
--- a/keyboards/k_type/is31fl3733-dual.c
+++ b/keyboards/input_club/k_type/is31fl3733-dual.c
diff --git a/keyboards/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
index d4af1848fb..d4af1848fb 100644
--- a/keyboards/k_type/is31fl3733-dual.h
+++ b/keyboards/input_club/k_type/is31fl3733-dual.h
diff --git a/keyboards/k_type/k_type-rgbdriver.c b/keyboards/input_club/k_type/k_type-rgbdriver.c
index 5ae132d63a..5ae132d63a 100644
--- a/keyboards/k_type/k_type-rgbdriver.c
+++ b/keyboards/input_club/k_type/k_type-rgbdriver.c
diff --git a/keyboards/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
index 0e10710cb1..0e10710cb1 100644
--- a/keyboards/k_type/k_type.c
+++ b/keyboards/input_club/k_type/k_type.c
diff --git a/keyboards/k_type/k_type.h b/keyboards/input_club/k_type/k_type.h
index 077c013066..077c013066 100644
--- a/keyboards/k_type/k_type.h
+++ b/keyboards/input_club/k_type/k_type.h
diff --git a/keyboards/k_type/keymaps/andrew-fahmy/config.h b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
index c035255de6..c035255de6 100644
--- a/keyboards/k_type/keymaps/andrew-fahmy/config.h
+++ b/keyboards/input_club/k_type/keymaps/andrew-fahmy/config.h
diff --git a/keyboards/k_type/keymaps/andrew-fahmy/keymap.c b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
index 1611c25e41..1611c25e41 100644
--- a/keyboards/k_type/keymaps/andrew-fahmy/keymap.c
+++ b/keyboards/input_club/k_type/keymaps/andrew-fahmy/keymap.c
diff --git a/keyboards/k_type/keymaps/andrew-fahmy/rules.mk b/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
index aad92997d0..aad92997d0 100644
--- a/keyboards/k_type/keymaps/andrew-fahmy/rules.mk
+++ b/keyboards/input_club/k_type/keymaps/andrew-fahmy/rules.mk
diff --git a/keyboards/k_type/keymaps/belak/keymap.c b/keyboards/input_club/k_type/keymaps/belak/keymap.c
index e920579317..e920579317 100644
--- a/keyboards/k_type/keymaps/belak/keymap.c
+++ b/keyboards/input_club/k_type/keymaps/belak/keymap.c
diff --git a/keyboards/k_type/keymaps/default/keymap.c b/keyboards/input_club/k_type/keymaps/default/keymap.c
index ef069af650..ef069af650 100644
--- a/keyboards/k_type/keymaps/default/keymap.c
+++ b/keyboards/input_club/k_type/keymaps/default/keymap.c
diff --git a/keyboards/k_type/keymaps/default/rules.mk b/keyboards/input_club/k_type/keymaps/default/rules.mk
index aad92997d0..aad92997d0 100644
--- a/keyboards/k_type/keymaps/default/rules.mk
+++ b/keyboards/input_club/k_type/keymaps/default/rules.mk
diff --git a/keyboards/k_type/mcuconf.h b/keyboards/input_club/k_type/mcuconf.h
index b898d25e88..b898d25e88 100644
--- a/keyboards/k_type/mcuconf.h
+++ b/keyboards/input_club/k_type/mcuconf.h
diff --git a/keyboards/k_type/readme.md b/keyboards/input_club/k_type/readme.md
index 11123c357c..a69ca38d4d 100644
--- a/keyboards/k_type/readme.md
+++ b/keyboards/input_club/k_type/readme.md
@@ -8,10 +8,10 @@ Firmware for custom keyboard PCB with TKL Key Layout
 
 Make example for this keyboard (after setting up your build environment):
 
-    make k_type:default
+    make input_club/k_type:default
 
 Flashing example for this keyboard:
 
-    make k_type:default:flash
+    make input_club/k_type:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk
index 93c81d9ada..93c81d9ada 100644
--- a/keyboards/k_type/rules.mk
+++ b/keyboards/input_club/k_type/rules.mk
diff --git a/keyboards/whitefox/board_is31fl3731c.h b/keyboards/input_club/whitefox/board_is31fl3731c.h
index 238d30cb44..238d30cb44 100644
--- a/keyboards/whitefox/board_is31fl3731c.h
+++ b/keyboards/input_club/whitefox/board_is31fl3731c.h
diff --git a/keyboards/whitefox/chconf.h b/keyboards/input_club/whitefox/chconf.h
index d220eec49b..d220eec49b 100644
--- a/keyboards/whitefox/chconf.h
+++ b/keyboards/input_club/whitefox/chconf.h
diff --git a/keyboards/whitefox/config.h b/keyboards/input_club/whitefox/config.h
index d2b6639a30..d2b6639a30 100644
--- a/keyboards/whitefox/config.h
+++ b/keyboards/input_club/whitefox/config.h
diff --git a/keyboards/whitefox/halconf.h b/keyboards/input_club/whitefox/halconf.h
index 04a228dc9e..04a228dc9e 100644
--- a/keyboards/whitefox/halconf.h
+++ b/keyboards/input_club/whitefox/halconf.h
diff --git a/keyboards/whitefox/info.json b/keyboards/input_club/whitefox/info.json
index a920d7c129..a920d7c129 100644
--- a/keyboards/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
diff --git a/keyboards/whitefox/keymaps/billypython/config.h b/keyboards/input_club/whitefox/keymaps/billypython/config.h
index 4b511eb848..4b511eb848 100644
--- a/keyboards/whitefox/keymaps/billypython/config.h
+++ b/keyboards/input_club/whitefox/keymaps/billypython/config.h
diff --git a/keyboards/whitefox/keymaps/billypython/keymap.c b/keyboards/input_club/whitefox/keymaps/billypython/keymap.c
index 79758de807..79758de807 100644
--- a/keyboards/whitefox/keymaps/billypython/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/billypython/keymap.c
diff --git a/keyboards/whitefox/keymaps/billypython/rules.mk b/keyboards/input_club/whitefox/keymaps/billypython/rules.mk
index 4bb1fdfaf7..4bb1fdfaf7 100644
--- a/keyboards/whitefox/keymaps/billypython/rules.mk
+++ b/keyboards/input_club/whitefox/keymaps/billypython/rules.mk
diff --git a/keyboards/whitefox/keymaps/default/keymap.c b/keyboards/input_club/whitefox/keymaps/default/keymap.c
index 353e282f2d..353e282f2d 100644
--- a/keyboards/whitefox/keymaps/default/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/default/keymap.c
diff --git a/keyboards/whitefox/keymaps/dhertz/keymap.c b/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
index 1d3bd224de..1d3bd224de 100644
--- a/keyboards/whitefox/keymaps/dhertz/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/dhertz/keymap.c
diff --git a/keyboards/whitefox/keymaps/dudeofawesome/keymap.c b/keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c
index 2388201b7e..2388201b7e 100644
--- a/keyboards/whitefox/keymaps/dudeofawesome/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/dudeofawesome/keymap.c
diff --git a/keyboards/whitefox/keymaps/dudeofawesome/readme.md b/keyboards/input_club/whitefox/keymaps/dudeofawesome/readme.md
index b5a33e74f6..b5a33e74f6 100644
--- a/keyboards/whitefox/keymaps/dudeofawesome/readme.md
+++ b/keyboards/input_club/whitefox/keymaps/dudeofawesome/readme.md
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/keymap.c b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
index 8a93f03188..8a93f03188 100644
--- a/keyboards/whitefox/keymaps/jetpacktuxedo/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/keymap.c
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/readme.md b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/readme.md
index 2c714f067a..2c714f067a 100644
--- a/keyboards/whitefox/keymaps/jetpacktuxedo/readme.md
+++ b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/readme.md
diff --git a/keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/rules.mk
index c9c8cbea51..c9c8cbea51 100644
--- a/keyboards/whitefox/keymaps/jetpacktuxedo/rules.mk
+++ b/keyboards/input_club/whitefox/keymaps/jetpacktuxedo/rules.mk
diff --git a/keyboards/whitefox/keymaps/kim-kim/keymap.c b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
index baaa136873..baaa136873 100644
--- a/keyboards/whitefox/keymaps/kim-kim/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/kim-kim/keymap.c
diff --git a/keyboards/whitefox/keymaps/konstantin/config.h b/keyboards/input_club/whitefox/keymaps/konstantin/config.h
index 3c2583e2d4..3c2583e2d4 100644
--- a/keyboards/whitefox/keymaps/konstantin/config.h
+++ b/keyboards/input_club/whitefox/keymaps/konstantin/config.h
diff --git a/keyboards/whitefox/keymaps/konstantin/keymap.c b/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
index 4c587dd272..4c587dd272 100644
--- a/keyboards/whitefox/keymaps/konstantin/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/konstantin/keymap.c
diff --git a/keyboards/whitefox/keymaps/konstantin/rules.mk b/keyboards/input_club/whitefox/keymaps/konstantin/rules.mk
index db238f1d04..db238f1d04 100644
--- a/keyboards/whitefox/keymaps/konstantin/rules.mk
+++ b/keyboards/input_club/whitefox/keymaps/konstantin/rules.mk
diff --git a/keyboards/whitefox/keymaps/matt3o/keymap.c b/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
index bb84196684..bb84196684 100644
--- a/keyboards/whitefox/keymaps/matt3o/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/matt3o/keymap.c
diff --git a/keyboards/whitefox/keymaps/mattrighetti/keymap.c b/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
index 67aed537dd..67aed537dd 100644
--- a/keyboards/whitefox/keymaps/mattrighetti/keymap.c
+++ b/keyboards/input_club/whitefox/keymaps/mattrighetti/keymap.c
diff --git a/keyboards/whitefox/keymaps/mattrighetti/rules.mk b/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
index 7a421cc9ae..7a421cc9ae 100644
--- a/keyboards/whitefox/keymaps/mattrighetti/rules.mk
+++ b/keyboards/input_club/whitefox/keymaps/mattrighetti/rules.mk
diff --git a/keyboards/whitefox/mcuconf.h b/keyboards/input_club/whitefox/mcuconf.h
index 28f3c6cdae..28f3c6cdae 100644
--- a/keyboards/whitefox/mcuconf.h
+++ b/keyboards/input_club/whitefox/mcuconf.h
diff --git a/keyboards/whitefox/readme.md b/keyboards/input_club/whitefox/readme.md
index a170723e22..d6676f6ce7 100644
--- a/keyboards/whitefox/readme.md
+++ b/keyboards/input_club/whitefox/readme.md
@@ -8,10 +8,10 @@ A compact 65% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make whitefox:default
+    make input_club/whitefox:default
 
 Flashing example for this keyboard:
 
-    make whitefox:default:flash
+    make input_club/whitefox:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk
index dfdb5845ab..dfdb5845ab 100644
--- a/keyboards/whitefox/rules.mk
+++ b/keyboards/input_club/whitefox/rules.mk
diff --git a/keyboards/whitefox/whitefox.c b/keyboards/input_club/whitefox/whitefox.c
index 99c59f7732..99c59f7732 100644
--- a/keyboards/whitefox/whitefox.c
+++ b/keyboards/input_club/whitefox/whitefox.c
diff --git a/keyboards/whitefox/whitefox.h b/keyboards/input_club/whitefox/whitefox.h
index 7e6648e5e7..7e6648e5e7 100644
--- a/keyboards/whitefox/whitefox.h
+++ b/keyboards/input_club/whitefox/whitefox.h