qmk · zvecr · Feb 21, 2019 · Feb 21, 2019 · Feb 21, 2019 · Feb 21, 2019
diff --git a/keyboards/cospad/config.h → keyboards/kprepublic/cospad/config.h b/keyboards/cospad/config.h → keyboards/kprepublic/cospad/config.h
diff --git a/keyboards/cospad/cospad.c → keyboards/kprepublic/cospad/cospad.c b/keyboards/cospad/cospad.c → keyboards/kprepublic/cospad/cospad.c
diff --git a/keyboards/cospad/cospad.h → keyboards/kprepublic/cospad/cospad.h b/keyboards/cospad/cospad.h → keyboards/kprepublic/cospad/cospad.h
diff --git a/keyboards/cospad/info.json → keyboards/kprepublic/cospad/info.json b/keyboards/cospad/info.json → keyboards/kprepublic/cospad/info.json
diff --git a/keyboards/cospad/keymaps/default/keymap.c → ...prepublic/cospad/keymaps/default/keymap.c b/keyboards/cospad/keymaps/default/keymap.c → ...prepublic/cospad/keymaps/default/keymap.c
diff --git a/keyboards/cospad/keymaps/detrus/keymap.c → ...kprepublic/cospad/keymaps/detrus/keymap.c b/keyboards/cospad/keymaps/detrus/keymap.c → ...kprepublic/cospad/keymaps/detrus/keymap.c
diff --git a/keyboards/cospad/readme.md → keyboards/kprepublic/cospad/readme.md b/keyboards/cospad/readme.md → keyboards/kprepublic/cospad/readme.md
@@ -1,11 +1,12 @@
-COSPAD
-===
+# COSPAD
+
+![COSPAD](https://ae01.alicdn.com/kf/HTB1.lwARFXXXXcKXXXXq6xXFXXXK.jpg?size=289297&height=518&width=750&hash=7c5d826f928b91436cb36dca2746b424)
 
 A DIY Keypad Kit sold by KPRepublic, runs TKG natively.
 
 Keyboard Maintainer: QMK Community  
 Hardware Supported: COSPAD  
-Hardware Availability: [KPrepublic on Aliexpress](https://aliexpress.com/item/cospad-Custom-Mechanical-Keyboard-Kit-up-tp-24-keys-Supports-TKG-TOOLS-Underglow-RGB-PCB-20/32818383873.html)
+Hardware Availability: [KPrepublic](https://kprepublic.com/collections/cospad-xd24/products/cospad-20-numpad-xd24-xiudi-custom-keyboard-pcb); [AliExpress](https://aliexpress.com/item/cospad-Custom-Mechanical-Keyboard-Kit-up-tp-24-keys-Supports-TKG-TOOLS-Underglow-RGB-PCB-20/32818383873.html)
 
 Only supports on and off for the backlight leds, as they are not connected to a PWM pin.
 
@@ -16,6 +17,6 @@ Supported Layouts:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make cospad:default
+    make kprepublic/cospad: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/cospad/rules.mk → keyboards/kprepublic/cospad/rules.mk b/keyboards/cospad/rules.mk → keyboards/kprepublic/cospad/rules.mk
diff --git a/keyboards/daisy/config.h → keyboards/kprepublic/daisy/config.h b/keyboards/daisy/config.h → keyboards/kprepublic/daisy/config.h
diff --git a/keyboards/daisy/daisy.c → keyboards/kprepublic/daisy/daisy.c b/keyboards/daisy/daisy.c → keyboards/kprepublic/daisy/daisy.c
diff --git a/keyboards/daisy/daisy.h → keyboards/kprepublic/daisy/daisy.h b/keyboards/daisy/daisy.h → keyboards/kprepublic/daisy/daisy.h
diff --git a/keyboards/daisy/info.json → keyboards/kprepublic/daisy/info.json b/keyboards/daisy/info.json → keyboards/kprepublic/daisy/info.json
diff --git a/keyboards/daisy/keymaps/default/keymap.c → ...kprepublic/daisy/keymaps/default/keymap.c b/keyboards/daisy/keymaps/default/keymap.c → ...kprepublic/daisy/keymaps/default/keymap.c
diff --git a/keyboards/daisy/keymaps/default/readme.md → ...prepublic/daisy/keymaps/default/readme.md b/keyboards/daisy/keymaps/default/readme.md → ...prepublic/daisy/keymaps/default/readme.md
diff --git a/keyboards/daisy/readme.md → keyboards/kprepublic/daisy/readme.md b/keyboards/daisy/readme.md → keyboards/kprepublic/daisy/readme.md
@@ -1,16 +1,18 @@
 # Daisy
 
+![Daisy](https://cdn.shopify.com/s/files/1/2711/4238/products/HTB1ahNecamgSKJjSsplq6yICpXaY_1024x1024.jpg?v=1515526190)
+
 A 40% keyboard kit sold by KPRepublic.
 
 Keyboard Maintainer: westfoxtrot (https://github.com/westfoxtrot)  
 Hardware Supported: Daisy PCB Rev.1, Daisy PCB Rev.2  
-Hardware Availability: http://tinyurl.com/yc26lq22
+Hardware Availability: [KPrepublic](https://kprepublic.com/collections/daisy-41/products/daisy-40-custom-keyboard-pcb); [AliExpress](https://kprepublic.aliexpress.com/store/group/Daisy-40/3034003_512069836.html)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make daisy:default
+    make kprepublic/daisy: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.
+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).
 
 
 # Other Keymaps
@@ -21,7 +23,7 @@ A printable picture showing this layout is available here: https://imgur.com/9mS
 
 
 ```
-$ make daisy:[default|<name>]
+$ make kprepublic/daisy:[default|<name>]
 ```
 
 # Bootloader

diff --git a/keyboards/daisy/rules.mk → keyboards/kprepublic/daisy/rules.mk b/keyboards/daisy/rules.mk → keyboards/kprepublic/daisy/rules.mk
diff --git a/keyboards/jj40/backlight.c → keyboards/kprepublic/jj40/backlight.c b/keyboards/jj40/backlight.c → keyboards/kprepublic/jj40/backlight.c
diff --git a/keyboards/jj40/backlight_custom.h → keyboards/kprepublic/jj40/backlight_custom.h b/keyboards/jj40/backlight_custom.h → keyboards/kprepublic/jj40/backlight_custom.h
diff --git a/keyboards/jj40/breathing_custom.h → keyboards/kprepublic/jj40/breathing_custom.h b/keyboards/jj40/breathing_custom.h → keyboards/kprepublic/jj40/breathing_custom.h
diff --git a/keyboards/jj40/config.h → keyboards/kprepublic/jj40/config.h b/keyboards/jj40/config.h → keyboards/kprepublic/jj40/config.h
diff --git a/keyboards/jj40/i2c.c → keyboards/kprepublic/jj40/i2c.c b/keyboards/jj40/i2c.c → keyboards/kprepublic/jj40/i2c.c
diff --git a/keyboards/jj40/i2c.h → keyboards/kprepublic/jj40/i2c.h b/keyboards/jj40/i2c.h → keyboards/kprepublic/jj40/i2c.h
diff --git a/keyboards/jj40/info.json → keyboards/kprepublic/jj40/info.json b/keyboards/jj40/info.json → keyboards/kprepublic/jj40/info.json
diff --git a/keyboards/jj40/jj40.c → keyboards/kprepublic/jj40/jj40.c b/keyboards/jj40/jj40.c → keyboards/kprepublic/jj40/jj40.c
diff --git a/keyboards/jj40/jj40.h → keyboards/kprepublic/jj40/jj40.h b/keyboards/jj40/jj40.h → keyboards/kprepublic/jj40/jj40.h
diff --git a/keyboards/jj40/keymaps/ajp10304/keymap.c → ...kprepublic/jj40/keymaps/ajp10304/keymap.c b/keyboards/jj40/keymaps/ajp10304/keymap.c → ...kprepublic/jj40/keymaps/ajp10304/keymap.c
diff --git a/keyboards/jj40/keymaps/ajp10304/readme.md → ...prepublic/jj40/keymaps/ajp10304/readme.md b/keyboards/jj40/keymaps/ajp10304/readme.md → ...prepublic/jj40/keymaps/ajp10304/readme.md
diff --git a/keyboards/jj40/keymaps/ajp10304/rules.mk → ...kprepublic/jj40/keymaps/ajp10304/rules.mk b/keyboards/jj40/keymaps/ajp10304/rules.mk → ...kprepublic/jj40/keymaps/ajp10304/rules.mk
diff --git a/keyboards/jj40/keymaps/cockpit/keymap.c → .../kprepublic/jj40/keymaps/cockpit/keymap.c b/keyboards/jj40/keymaps/cockpit/keymap.c → .../kprepublic/jj40/keymaps/cockpit/keymap.c
diff --git a/keyboards/jj40/keymaps/cockpit/readme.md → ...kprepublic/jj40/keymaps/cockpit/readme.md b/keyboards/jj40/keymaps/cockpit/readme.md → ...kprepublic/jj40/keymaps/cockpit/readme.md
diff --git a/keyboards/jj40/keymaps/default/keymap.c → .../kprepublic/jj40/keymaps/default/keymap.c b/keyboards/jj40/keymaps/default/keymap.c → .../kprepublic/jj40/keymaps/default/keymap.c
diff --git a/keyboards/jj40/keymaps/fun40/config.h → ...ds/kprepublic/jj40/keymaps/fun40/config.h b/keyboards/jj40/keymaps/fun40/config.h → ...ds/kprepublic/jj40/keymaps/fun40/config.h
diff --git a/keyboards/jj40/keymaps/fun40/keymap.c → ...ds/kprepublic/jj40/keymaps/fun40/keymap.c b/keyboards/jj40/keymaps/fun40/keymap.c → ...ds/kprepublic/jj40/keymaps/fun40/keymap.c
diff --git a/keyboards/jj40/keymaps/fun40/readme.md → ...s/kprepublic/jj40/keymaps/fun40/readme.md b/keyboards/jj40/keymaps/fun40/readme.md → ...s/kprepublic/jj40/keymaps/fun40/readme.md
diff --git a/keyboards/jj40/keymaps/fun40/rules.mk → ...ds/kprepublic/jj40/keymaps/fun40/rules.mk b/keyboards/jj40/keymaps/fun40/rules.mk → ...ds/kprepublic/jj40/keymaps/fun40/rules.mk
diff --git a/keyboards/jj40/keymaps/krusli/config.h → ...s/kprepublic/jj40/keymaps/krusli/config.h b/keyboards/jj40/keymaps/krusli/config.h → ...s/kprepublic/jj40/keymaps/krusli/config.h
diff --git a/keyboards/jj40/keymaps/krusli/keymap.c → ...s/kprepublic/jj40/keymaps/krusli/keymap.c b/keyboards/jj40/keymaps/krusli/keymap.c → ...s/kprepublic/jj40/keymaps/krusli/keymap.c
diff --git a/keyboards/jj40/keymaps/krusli/numpad.txt → ...kprepublic/jj40/keymaps/krusli/numpad.txt b/keyboards/jj40/keymaps/krusli/numpad.txt → ...kprepublic/jj40/keymaps/krusli/numpad.txt
diff --git a/keyboards/jj40/keymaps/krusli/readme.md → .../kprepublic/jj40/keymaps/krusli/readme.md b/keyboards/jj40/keymaps/krusli/readme.md → .../kprepublic/jj40/keymaps/krusli/readme.md
diff --git a/keyboards/jj40/keymaps/krusli/rules.mk → ...s/kprepublic/jj40/keymaps/krusli/rules.mk b/keyboards/jj40/keymaps/krusli/rules.mk → ...s/kprepublic/jj40/keymaps/krusli/rules.mk
diff --git a/keyboards/jj40/keymaps/like_jis/config.h → ...kprepublic/jj40/keymaps/like_jis/config.h b/keyboards/jj40/keymaps/like_jis/config.h → ...kprepublic/jj40/keymaps/like_jis/config.h
diff --git a/keyboards/jj40/keymaps/like_jis/keymap.c → ...kprepublic/jj40/keymaps/like_jis/keymap.c b/keyboards/jj40/keymaps/like_jis/keymap.c → ...kprepublic/jj40/keymaps/like_jis/keymap.c
diff --git a/keyboards/jj40/keymaps/like_jis/rules.mk → ...kprepublic/jj40/keymaps/like_jis/rules.mk b/keyboards/jj40/keymaps/like_jis/rules.mk → ...kprepublic/jj40/keymaps/like_jis/rules.mk
diff --git a/keyboards/jj40/keymaps/oscillope/config.h → ...prepublic/jj40/keymaps/oscillope/config.h b/keyboards/jj40/keymaps/oscillope/config.h → ...prepublic/jj40/keymaps/oscillope/config.h
diff --git a/keyboards/jj40/keymaps/oscillope/keymap.c → ...prepublic/jj40/keymaps/oscillope/keymap.c b/keyboards/jj40/keymaps/oscillope/keymap.c → ...prepublic/jj40/keymaps/oscillope/keymap.c
diff --git a/keyboards/jj40/keymaps/oscillope/rules.mk → ...prepublic/jj40/keymaps/oscillope/rules.mk b/keyboards/jj40/keymaps/oscillope/rules.mk → ...prepublic/jj40/keymaps/oscillope/rules.mk
diff --git a/keyboards/jj40/keymaps/skewwhiffy/keymap.c → ...republic/jj40/keymaps/skewwhiffy/keymap.c b/keyboards/jj40/keymaps/skewwhiffy/keymap.c → ...republic/jj40/keymaps/skewwhiffy/keymap.c
diff --git a/keyboards/jj40/keymaps/suzuken/config.h → .../kprepublic/jj40/keymaps/suzuken/config.h b/keyboards/jj40/keymaps/suzuken/config.h → .../kprepublic/jj40/keymaps/suzuken/config.h
diff --git a/keyboards/jj40/keymaps/suzuken/keymap.c → .../kprepublic/jj40/keymaps/suzuken/keymap.c b/keyboards/jj40/keymaps/suzuken/keymap.c → .../kprepublic/jj40/keymaps/suzuken/keymap.c
diff --git a/keyboards/jj40/keymaps/waples/README.md → .../kprepublic/jj40/keymaps/waples/README.md b/keyboards/jj40/keymaps/waples/README.md → .../kprepublic/jj40/keymaps/waples/README.md
diff --git a/keyboards/jj40/keymaps/waples/config.h → ...s/kprepublic/jj40/keymaps/waples/config.h b/keyboards/jj40/keymaps/waples/config.h → ...s/kprepublic/jj40/keymaps/waples/config.h
diff --git a/keyboards/jj40/keymaps/waples/keymap.c → ...s/kprepublic/jj40/keymaps/waples/keymap.c b/keyboards/jj40/keymaps/waples/keymap.c → ...s/kprepublic/jj40/keymaps/waples/keymap.c
diff --git a/keyboards/jj40/keymaps/waples/rules.mk → ...s/kprepublic/jj40/keymaps/waples/rules.mk b/keyboards/jj40/keymaps/waples/rules.mk → ...s/kprepublic/jj40/keymaps/waples/rules.mk
diff --git a/keyboards/jj40/matrix.c → keyboards/kprepublic/jj40/matrix.c b/keyboards/jj40/matrix.c → keyboards/kprepublic/jj40/matrix.c
diff --git a/keyboards/jj40/README.md → keyboards/kprepublic/jj40/readme.md b/keyboards/jj40/README.md → keyboards/kprepublic/jj40/readme.md
@@ -6,13 +6,13 @@ A compact 40% (12x4) ortholinear keyboard kit made and KPRepublic on AliExpress.
 
 Keyboard Maintainer: [QMK Community](https://github.com/qmk)  
 Hardware Supported: Atmega32A  
-Hardware Availability: [AliExpress](https://www.aliexpress.com/store/product/jj40-Custom-Mechanical-Keyboard-40-PCB-programmed-40-planck-layouts-bface-firmware-gh40/3034003_32828781103.html)
+Hardware Availability: [KPrepublic](https://kprepublic.com/collections/pcb/products/jj40-v1-5-40-custom-keyboard-pcb-similar-with-planck); [AliExpress](https://www.aliexpress.com/store/product/jj40-Custom-Mechanical-Keyboard-40-PCB-programmed-40-planck-layouts-bface-firmware-gh40/3034003_32828781103.html)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jj40:default:program
+    make kprepublic/jj40:default:program
 
-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.
+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).
 
 Note that this is a complete replacement for the firmware, so you won't be
 using Bootmapper Client to change any keyboard settings, since not all the
@@ -43,20 +43,20 @@ the bootloader, you'll need Python 2 with PyUSB installed:
 $ pip install pyusb
 ```
 
-If you prefer (or are having issues with a `program` flash), you can just build it (`make jj40:<keymap-name>` and flash the firmware (`.hex` file) directly with
+If you prefer (or are having issues with a `program` flash), you can just build it (`make kprepublic/jj40:<keymap-name>` and flash the firmware (`.hex` file) directly with
 `bootloadHID` if you boot the board while holding down `Backspace` (`Top Right Key`) to keep it
 in the bootloader:
 
 ```
-$ make jj40
+$ make kprepublic/jj40:default
 $ bootloadHID -r jj40_default.hex
 ```
 
 For Windows 10:
 Windows sometimes doesn't recognize the jj40. The easiest way of flashing a new layout is probably using [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash).
 1. Go to Windows Device Manager and find the keyboard (plug it in while holding down `Backspace` (`Top Right Key`)). It can be found under Human Interface Devices or under Keyboards.
 2. Go to properties and the Details tab to find the hardware ID. You want the VID and the PID (code after the underscore). Plug them into HIDBootFlash and hit Find Device.
-3. Use `make jj40:<keymap-name>` to generate the .hex file in the qmk basis folder. Select the .hex file in HIDBootFlash and press Flash Device.
+3. Use `make kprepublic/jj40:<keymap-name>` to generate the .hex file in the qmk basis folder. Select the .hex file in HIDBootFlash and press Flash Device.
 
 
 ## Troubleshooting

diff --git a/keyboards/jj40/rules.mk → keyboards/kprepublic/jj40/rules.mk b/keyboards/jj40/rules.mk → keyboards/kprepublic/jj40/rules.mk
diff --git a/keyboards/jj40/usbconfig.h → keyboards/kprepublic/jj40/usbconfig.h b/keyboards/jj40/usbconfig.h → keyboards/kprepublic/jj40/usbconfig.h
diff --git a/keyboards/jj4x4/backlight.c → keyboards/kprepublic/jj4x4/backlight.c b/keyboards/jj4x4/backlight.c → keyboards/kprepublic/jj4x4/backlight.c
diff --git a/keyboards/jj4x4/backlight_custom.h → ...oards/kprepublic/jj4x4/backlight_custom.h b/keyboards/jj4x4/backlight_custom.h → ...oards/kprepublic/jj4x4/backlight_custom.h
diff --git a/keyboards/jj4x4/breathing_custom.h → ...oards/kprepublic/jj4x4/breathing_custom.h b/keyboards/jj4x4/breathing_custom.h → ...oards/kprepublic/jj4x4/breathing_custom.h
diff --git a/keyboards/jj4x4/config.h → keyboards/kprepublic/jj4x4/config.h b/keyboards/jj4x4/config.h → keyboards/kprepublic/jj4x4/config.h
diff --git a/keyboards/jj4x4/i2c.c → keyboards/kprepublic/jj4x4/i2c.c b/keyboards/jj4x4/i2c.c → keyboards/kprepublic/jj4x4/i2c.c
diff --git a/keyboards/jj4x4/i2c.h → keyboards/kprepublic/jj4x4/i2c.h b/keyboards/jj4x4/i2c.h → keyboards/kprepublic/jj4x4/i2c.h
diff --git a/keyboards/jj4x4/info.json → keyboards/kprepublic/jj4x4/info.json b/keyboards/jj4x4/info.json → keyboards/kprepublic/jj4x4/info.json
diff --git a/keyboards/jj4x4/jj4x4.c → keyboards/kprepublic/jj4x4/jj4x4.c b/keyboards/jj4x4/jj4x4.c → keyboards/kprepublic/jj4x4/jj4x4.c
diff --git a/keyboards/jj4x4/jj4x4.h → keyboards/kprepublic/jj4x4/jj4x4.h b/keyboards/jj4x4/jj4x4.h → keyboards/kprepublic/jj4x4/jj4x4.h
diff --git a/keyboards/jj4x4/keymaps/default/keymap.c → ...kprepublic/jj4x4/keymaps/default/keymap.c b/keyboards/jj4x4/keymaps/default/keymap.c → ...kprepublic/jj4x4/keymaps/default/keymap.c
diff --git a/keyboards/jj4x4/README.md → keyboards/kprepublic/jj4x4/readme.md b/keyboards/jj4x4/README.md → keyboards/kprepublic/jj4x4/readme.md
@@ -6,13 +6,13 @@ A  4x4 keypad kit made and KPRepublic on AliExpress. This is a chopped off versi
 
 Keyboard Maintainer: [QMK Community](https://github.com/qmk)  
 Hardware Supported: Atmega32A  
-Hardware Availability: [AliExpress](https://www.aliexpress.com/item/jj4x4-jj4X4-16-keys-Custom-Mechanical-Keyboard-PCB-programmed-numpad-layouts-bface-firmware-with-rgb-bottom/32901955446.html?spm=2114.search0104.3.7.3ebf431ae1d9ic&ws_ab_test=searchweb0_0,searchweb201602_4_10065_10130_10068_10547_319_317_10548_10545_10696_453_10084_454_10083_433_10618_431_10307_537_536_10902_10059_10884_10887_321_322_10103,searchweb201603_6,ppcSwitch_0&algo_expid=9d1891dd-80af-4793-a889-5a62e1fdfdd8-1&algo_pvid=9d1891dd-80af-4793-a889-5a62e1fdfdd8&transAbTest=ae803_5)
+Hardware Availability: Hardware Availability: [KPrepublic](https://kprepublic.com/products/jj4x4-jj4x4-16-keys-custom-mechanical-keyboard-pcb-programmed-numpad-layouts-bface-firmware-with-rgb-bottom-underglow-alps-mx); [AliExpress](https://www.aliexpress.com/item/jj4x4-jj4X4-16-keys-Custom-Mechanical-Keyboard-PCB-programmed-numpad-layouts-bface-firmware-with-rgb-bottom/32901955446.html)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jj4x4:default:program
+    make kprepublic/jj4x4:default:program
 
-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.
+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).
 
 Note that this is a complete replacement for the firmware, so you won't be
 using Bootmapper Client to change any keyboard settings, since not all the
@@ -43,20 +43,20 @@ the bootloader, you'll need Python 2 with PyUSB installed:
 $ pip install pyusb
 ```
 
-If you prefer (or are having issues with a `program` flash), you can just build it (`make jj40:<keymap-name>` and flash the firmware (`.hex` file) directly with
+If you prefer (or are having issues with a `program` flash), you can just build it (`make kprepublic/jj40:<keymap-name>` and flash the firmware (`.hex` file) directly with
 `bootloadHID` if you boot the board while holding down `8` (second from top, second from left, with usb plug is at the top) to keep it
 in the bootloader:
 
 ```
-$ make jj40
+$ make kprepublic/jj40:default
 $ bootloadHID -r jj4x4_default.hex
 ```
 
 For Windows 10:
 Windows sometimes doesn't recognize the jj4x4. The easiest way of flashing a new layout is probably using [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash).
 1. Go to Windows Device Manager and find the keyboard (plug it in while holding down `8` (second from top, second from left, with usb plug is at the top)). It can be found under Human Interface Devices or under Keyboards.
 2. Go to properties and the Details tab to find the hardware ID. You want the VID and the PID (code after the underscore). Plug them into HIDBootFlash and hit Find Device.
-3. Use `make jj4x4:<keymap-name>` to generate the .hex file in the qmk basis folder. Select the .hex file in HIDBootFlash and press Flash Device.
+3. Use `make kprepublic/jj4x4:<keymap-name>` to generate the .hex file in the qmk basis folder. Select the .hex file in HIDBootFlash and press Flash Device.
 
 
 ## Troubleshooting

diff --git a/keyboards/jj4x4/rules.mk → keyboards/kprepublic/jj4x4/rules.mk b/keyboards/jj4x4/rules.mk → keyboards/kprepublic/jj4x4/rules.mk
diff --git a/keyboards/jj4x4/usbconfig.h → keyboards/kprepublic/jj4x4/usbconfig.h b/keyboards/jj4x4/usbconfig.h → keyboards/kprepublic/jj4x4/usbconfig.h
diff --git a/keyboards/jj50/backlight.c → keyboards/kprepublic/jj50/backlight.c b/keyboards/jj50/backlight.c → keyboards/kprepublic/jj50/backlight.c
diff --git a/keyboards/jj50/backlight_custom.h → keyboards/kprepublic/jj50/backlight_custom.h b/keyboards/jj50/backlight_custom.h → keyboards/kprepublic/jj50/backlight_custom.h
diff --git a/keyboards/jj50/breathing_custom.h → keyboards/kprepublic/jj50/breathing_custom.h b/keyboards/jj50/breathing_custom.h → keyboards/kprepublic/jj50/breathing_custom.h
diff --git a/keyboards/jj50/config.h → keyboards/kprepublic/jj50/config.h b/keyboards/jj50/config.h → keyboards/kprepublic/jj50/config.h
diff --git a/keyboards/jj50/i2c.c → keyboards/kprepublic/jj50/i2c.c b/keyboards/jj50/i2c.c → keyboards/kprepublic/jj50/i2c.c
diff --git a/keyboards/jj50/i2c.h → keyboards/kprepublic/jj50/i2c.h b/keyboards/jj50/i2c.h → keyboards/kprepublic/jj50/i2c.h
diff --git a/keyboards/jj50/info.json → keyboards/kprepublic/jj50/info.json b/keyboards/jj50/info.json → keyboards/kprepublic/jj50/info.json
diff --git a/keyboards/jj50/jj50.c → keyboards/kprepublic/jj50/jj50.c b/keyboards/jj50/jj50.c → keyboards/kprepublic/jj50/jj50.c
diff --git a/keyboards/jj50/jj50.h → keyboards/kprepublic/jj50/jj50.h b/keyboards/jj50/jj50.h → keyboards/kprepublic/jj50/jj50.h
diff --git a/keyboards/jj50/keymaps/default/keymap.c → .../kprepublic/jj50/keymaps/default/keymap.c b/keyboards/jj50/keymaps/default/keymap.c → .../kprepublic/jj50/keymaps/default/keymap.c
diff --git a/keyboards/jj50/matrix.c → keyboards/kprepublic/jj50/matrix.c b/keyboards/jj50/matrix.c → keyboards/kprepublic/jj50/matrix.c
diff --git a/keyboards/jj50/program → keyboards/kprepublic/jj50/program b/keyboards/jj50/program → keyboards/kprepublic/jj50/program
diff --git a/keyboards/jj50/README.md → keyboards/kprepublic/jj50/readme.md b/keyboards/jj50/README.md → keyboards/kprepublic/jj50/readme.md
@@ -1,5 +1,6 @@
-JJ50
-==========================
+# JJ50
+
+![jj50](https://cdn.shopify.com/s/files/1/2711/4238/products/HTB1xlBMksLJ8KJjy0Fnq6AFDpXar_1024x1024.jpg?v=1515585489)
 
 This is a port of the QMK firmware for boards that are based on the
 ps2avrGB firmware, like the [ps2avrGB keyboard](https://www.keyclack.com/product/gb-ps2avrgb/), for use on the JJ50, a preonic-like board.
@@ -10,22 +11,21 @@ Note that this is a complete replacement for the firmware, so you won't be
 using Bootmapper Client to change any keyboard settings, since not all the
 USB report options are supported.  
 
+Keyboard Maintainer: [Wayne K. Jones](github.com/WarmCatUK).  
 Hardware Supported: JJ50 with the ATmega32a chip.  
-Hardware Availability: [KPrepublic on AliExpress](https://www.aliexpress.com/item/jj50-v1-0-Custom-Mechanical-Keyboard-50-PCB-programmed-50-preonic-layouts-bface-firmware-with-rgb/32848915277.html)
-
-This version by [Wayne K. Jones](github.com/WarmCatUK).
+Hardware Availability: [KPrepublic](https://kprepublic.com/collections/jj50-50/products/jj50-50-custom-keyboard-pcb-similar-with-preonic); [AliExpress](https://www.aliexpress.com/item/jj50-v1-0-Custom-Mechanical-Keyboard-50-PCB-programmed-50-preonic-layouts-bface-firmware-with-rgb/32848915277.html)
 
 
 ## Installing and Building
 
 Make example for this keyboard (after setting up your build environment):
 
 ```
-$ make jj50:default:program
+$ make kprepublic/jj50:default:program
 ```
 It should detect the keyboard and set it to bootloader mode automatically, prior to flashing firmware.
 
-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.
+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).
 
 Note that this is a complete replacement for the firmware, so you won't be
 using Bootmapper Client to change any keyboard settings, since not all the
@@ -49,7 +49,7 @@ If you prefer, you can just build it and flash the firmware directly with
 in the bootloader:
 
 ```
-$ make jj50
+$ make kprepublic/jj50:default
 $ bootloadHID -r jj50_default.hex
 ```
 I dont use windows personally, but the following is from ymd96 regarding flashing the atmega32a:
@@ -60,7 +60,7 @@ On Windows, I use [MINGw](http://www.mingw.org/) to compile the keymaps. On Linu
 Once you have those two pieces of software:
 Build the keyboard with  
 ```
-$ make jj50:default
+$ make kprepublic/jj50:default
 ```  
 If you make your own layout, change the `default` word to whatever your layout is.  
 
@@ -75,8 +75,8 @@ And flash the compiled hex file with `HIDBootFlash`. Simply put the board in fla
 4. I was occasionally finding that I wasn't flashing changes that I was making to my keymap. If that happens, remove the previous build and simply force rebuild by making with:
 ```
 $ rm jj50_default.hex
-$ make -B jj50:default
-$ make -B jj50:default:program
+$ make -B kprepublic/jj50:default
+$ make -B kprepublic/jj50:default:program
 ```
 
 

diff --git a/keyboards/jj50/rules.mk → keyboards/kprepublic/jj50/rules.mk b/keyboards/jj50/rules.mk → keyboards/kprepublic/jj50/rules.mk
diff --git a/keyboards/jj50/usbconfig.h → keyboards/kprepublic/jj50/usbconfig.h b/keyboards/jj50/usbconfig.h → keyboards/kprepublic/jj50/usbconfig.h
diff --git a/keyboards/kprepublic/readme.md b/keyboards/kprepublic/readme.md
@@ -0,0 +1,14 @@
+# KPrepublic
+
+KPrepublic is a keyboard retailer located in China. 
+
+## Online Stores
+
+**Website:** https://kprepublic.com/  
+**AliExpress:** https://kprepublic.aliexpress.com/  
+
+## Social Media
+
+**Facebook:** https://facebook.com/KPrepublic/  
+**Instagram:** https://instagram.com/kprepublic/  
+**Twitter:** https://twitter.com/kp_republic/  
diff --git a/keyboards/staryu/backlight_staryu.c → ...ards/kprepublic/staryu/backlight_staryu.c b/keyboards/staryu/backlight_staryu.c → ...ards/kprepublic/staryu/backlight_staryu.c
diff --git a/keyboards/staryu/backlight_staryu.h → ...ards/kprepublic/staryu/backlight_staryu.h b/keyboards/staryu/backlight_staryu.h → ...ards/kprepublic/staryu/backlight_staryu.h
diff --git a/keyboards/staryu/config.h → keyboards/kprepublic/staryu/config.h b/keyboards/staryu/config.h → keyboards/kprepublic/staryu/config.h
diff --git a/keyboards/staryu/info.json → keyboards/kprepublic/staryu/info.json b/keyboards/staryu/info.json → keyboards/kprepublic/staryu/info.json
diff --git a/keyboards/staryu/keymaps/default/README.md → ...republic/staryu/keymaps/default/README.md b/keyboards/staryu/keymaps/default/README.md → ...republic/staryu/keymaps/default/README.md
diff --git a/keyboards/staryu/keymaps/default/keymap.c → ...prepublic/staryu/keymaps/default/keymap.c b/keyboards/staryu/keymaps/default/keymap.c → ...prepublic/staryu/keymaps/default/keymap.c
diff --git a/keyboards/staryu/keymaps/default/rules.mk → ...prepublic/staryu/keymaps/default/rules.mk b/keyboards/staryu/keymaps/default/rules.mk → ...prepublic/staryu/keymaps/default/rules.mk
diff --git a/keyboards/staryu/keymaps/krusli/README.md → ...prepublic/staryu/keymaps/krusli/README.md b/keyboards/staryu/keymaps/krusli/README.md → ...prepublic/staryu/keymaps/krusli/README.md
diff --git a/keyboards/staryu/keymaps/krusli/keymap.c → ...kprepublic/staryu/keymaps/krusli/keymap.c b/keyboards/staryu/keymaps/krusli/keymap.c → ...kprepublic/staryu/keymaps/krusli/keymap.c
diff --git a/keyboards/kprepublic/staryu/readme.md b/keyboards/kprepublic/staryu/readme.md
@@ -0,0 +1,15 @@
+# Staryu
+
+![Staryu](https://i.imgur.com/obcCpZN.jpg)
+
+A 5 key macropad, designed by Kai and sold by KPRepublic.
+
+Keyboard Maintainer: QMK Community  
+Hardware Supported: Staryu (only the non-lite version has been tested)  
+Hardware Availability: [KPrepublic](https://kprepublic.com/collections/staryu/products/staryu-5-custom-keyboard-pcb); [AliExpress](https://www.aliexpress.com/item/Staryu-Mini-Macro-Pad-custom-keyboard-by-tkg-kai-Mini-macro-pad-mechanical-keyboard-5-keys/32817560746.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make kprepublic/staryu: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/staryu/rules.mk → keyboards/kprepublic/staryu/rules.mk b/keyboards/staryu/rules.mk → keyboards/kprepublic/staryu/rules.mk
diff --git a/keyboards/staryu/staryu.c → keyboards/kprepublic/staryu/staryu.c b/keyboards/staryu/staryu.c → keyboards/kprepublic/staryu/staryu.c
diff --git a/keyboards/staryu/staryu.h → keyboards/kprepublic/staryu/staryu.h b/keyboards/staryu/staryu.h → keyboards/kprepublic/staryu/staryu.h
diff --git a/keyboards/xd84/config.h → keyboards/kprepublic/xd84/config.h b/keyboards/xd84/config.h → keyboards/kprepublic/xd84/config.h
diff --git a/keyboards/xd84/custom_matrix_helper.c → ...ds/kprepublic/xd84/custom_matrix_helper.c b/keyboards/xd84/custom_matrix_helper.c → ...ds/kprepublic/xd84/custom_matrix_helper.c
diff --git a/keyboards/xd84/dev.md → keyboards/kprepublic/xd84/dev.md b/keyboards/xd84/dev.md → keyboards/kprepublic/xd84/dev.md
diff --git a/keyboards/xd84/info.json → keyboards/kprepublic/xd84/info.json b/keyboards/xd84/info.json → keyboards/kprepublic/xd84/info.json
diff --git a/keyboards/xd84/keymaps/default/keymap.c → .../kprepublic/xd84/keymaps/default/keymap.c b/keyboards/xd84/keymaps/default/keymap.c → .../kprepublic/xd84/keymaps/default/keymap.c
diff --git a/keyboards/xd84/keymaps/default_iso/keymap.c → ...epublic/xd84/keymaps/default_iso/keymap.c b/keyboards/xd84/keymaps/default_iso/keymap.c → ...epublic/xd84/keymaps/default_iso/keymap.c
diff --git a/keyboards/xd84/matrix.c → keyboards/kprepublic/xd84/matrix.c b/keyboards/xd84/matrix.c → keyboards/kprepublic/xd84/matrix.c
diff --git a/keyboards/xd84/pca9555.c → keyboards/kprepublic/xd84/pca9555.c b/keyboards/xd84/pca9555.c → keyboards/kprepublic/xd84/pca9555.c
diff --git a/keyboards/xd84/pca9555.h → keyboards/kprepublic/xd84/pca9555.h b/keyboards/xd84/pca9555.h → keyboards/kprepublic/xd84/pca9555.h
diff --git a/keyboards/xd84/readme.md → keyboards/kprepublic/xd84/readme.md b/keyboards/xd84/readme.md → keyboards/kprepublic/xd84/readme.md
@@ -10,14 +10,14 @@ Compact With 84 Keys & RGB LED Underglow
 
 Keyboard Maintainer: QMK Community  
 Hardware Supported: XD84  
-Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd84-xiudi-70-custom-keyboard-pcb)
+Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd84-xiudi-70-custom-keyboard-pcb); [AliExpress](https://www.aliexpress.com/item/xd84-75-eepw84-Custom-Mechanical-Keyboard-Supports-TKG-TOOLS-Underglow-RGB-PCB-programmed-kle-Kimera-core/32819790747.html)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make xd84:default
+    make kprepublic/xd84:default
 
 Install examples:
 
-    make xd84:default:dfu
+    make kprepublic/xd84: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/xd84/rules.mk → keyboards/kprepublic/xd84/rules.mk b/keyboards/xd84/rules.mk → keyboards/kprepublic/xd84/rules.mk
diff --git a/keyboards/xd84/xd84.c → keyboards/kprepublic/xd84/xd84.c b/keyboards/xd84/xd84.c → keyboards/kprepublic/xd84/xd84.c
diff --git a/keyboards/xd84/xd84.h → keyboards/kprepublic/xd84/xd84.h b/keyboards/xd84/xd84.h → keyboards/kprepublic/xd84/xd84.h
diff --git a/keyboards/xd87/config.h → keyboards/kprepublic/xd87/config.h b/keyboards/xd87/config.h → keyboards/kprepublic/xd87/config.h
diff --git a/keyboards/xd87/info.json → keyboards/kprepublic/xd87/info.json b/keyboards/xd87/info.json → keyboards/kprepublic/xd87/info.json
diff --git a/keyboards/xd87/keymaps/default/config.h → .../kprepublic/xd87/keymaps/default/config.h b/keyboards/xd87/keymaps/default/config.h → .../kprepublic/xd87/keymaps/default/config.h
diff --git a/keyboards/xd87/keymaps/default/keymap.c → .../kprepublic/xd87/keymaps/default/keymap.c b/keyboards/xd87/keymaps/default/keymap.c → .../kprepublic/xd87/keymaps/default/keymap.c
diff --git a/keyboards/xd87/keymaps/default/readme.md → ...kprepublic/xd87/keymaps/default/readme.md b/keyboards/xd87/keymaps/default/readme.md → ...kprepublic/xd87/keymaps/default/readme.md
diff --git a/keyboards/xd87/readme.md → keyboards/kprepublic/xd87/readme.md b/keyboards/xd87/readme.md → keyboards/kprepublic/xd87/readme.md
@@ -5,20 +5,18 @@
 
 - Keyboard Maintainer: [Alexander Fougner](https://github.com/fougner)  
 - Hardware Supported: XD87 PCB v1.1  
-- Hardware Availability:  
-	- [KPrepublic.com](https://kprepublic.com/products/xd87-xd87-xd80-custom-mechanical-keyboard-kit80-supports-tkg-tools-support-underglow-rgb-pcb-programmed-gh80-kle)
-	- [AliExpress](https://www.aliexpress.com/item/xd87-XD87-XD80-Custom-Mechanical-Keyboard-Kit80-Supports-TKG-TOOLS-Support-Underglow-RGB-PCB-programmed-gh80/32892540743.html)
+- Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd87-xd87-xd80-custom-mechanical-keyboard-kit80-supports-tkg-tools-support-underglow-rgb-pcb-programmed-gh80-kle); [AliExpress](https://www.aliexpress.com/item/xd87-XD87-XD80-Custom-Mechanical-Keyboard-Kit80-Supports-TKG-TOOLS-Support-Underglow-RGB-PCB-programmed-gh80/32892540743.html)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make xd87:default
+    make kprepublic/xd87:default
 
 It also supports the tkl_ansi and tkl_iso community layouts:
 
 	  # Build firmware with ANSI layout
-	  make xd87:default_tkl_ansi
+	  make kprepublic/xd87:default_tkl_ansi
 	  # Build firmware with ISO layout
-	  make xd87:default_tkl_iso
+	  make kprepublic/xd87:default_tkl_iso
 
 
 The keyboard can be reset to bootloader by using bootmagic (space+b by default) or short out the small connector between the Delete and End keys.

diff --git a/keyboards/xd87/rules.mk → keyboards/kprepublic/xd87/rules.mk b/keyboards/xd87/rules.mk → keyboards/kprepublic/xd87/rules.mk
diff --git a/keyboards/xd87/xd87.c → keyboards/kprepublic/xd87/xd87.c b/keyboards/xd87/xd87.c → keyboards/kprepublic/xd87/xd87.c
diff --git a/keyboards/xd87/xd87.h → keyboards/kprepublic/xd87/xd87.h b/keyboards/xd87/xd87.h → keyboards/kprepublic/xd87/xd87.h
diff --git a/keyboards/staryu/readme.md b/keyboards/staryu/readme.md