qmk · drashna · Nov 8, 2018 · Nov 7, 2018 · Nov 7, 2018 · Nov 7, 2018
diff --git a/keyboards/4x4/4x4.c → keyboards/40percentclub/4x4/4x4.c b/keyboards/4x4/4x4.c → keyboards/40percentclub/4x4/4x4.c
diff --git a/keyboards/4x4/4x4.h → keyboards/40percentclub/4x4/4x4.h b/keyboards/4x4/4x4.h → keyboards/40percentclub/4x4/4x4.h
diff --git a/keyboards/4x4/config.h → keyboards/40percentclub/4x4/config.h b/keyboards/4x4/config.h → keyboards/40percentclub/4x4/config.h
diff --git a/keyboards/4x4/keymaps/default/config.h → ...0percentclub/4x4/keymaps/default/config.h b/keyboards/4x4/keymaps/default/config.h → ...0percentclub/4x4/keymaps/default/config.h
diff --git a/keyboards/4x4/keymaps/default/keymap.c → ...0percentclub/4x4/keymaps/default/keymap.c b/keyboards/4x4/keymaps/default/keymap.c → ...0percentclub/4x4/keymaps/default/keymap.c
diff --git a/keyboards/4x4/readme.md → keyboards/40percentclub/4x4/readme.md b/keyboards/4x4/readme.md → keyboards/40percentclub/4x4/readme.md
@@ -17,7 +17,8 @@ Hardware Availability: [4x4x4x4x4 project on 40% Keyboards](http://www.40percent
 
 Make example for this keyboard (after setting up your build environment):  
 
-    make 4x4:default
+    make 40percentclub/4x4: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).
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.  
 First pass at adding support for the 4x4 keyboard. Compiles but completely untested. Intended to kick-start development.  
diff --git a/keyboards/4x4/rules.mk → keyboards/40percentclub/4x4/rules.mk b/keyboards/4x4/rules.mk → keyboards/40percentclub/4x4/rules.mk
@@ -1,5 +1,4 @@
 # MCU name
-#MCU = at90usb1286
 MCU = atmega32u4
 
 # Processor frequency.
@@ -43,11 +42,11 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
 #   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Bootloader
 #     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded 
+#     different sizes, comment this out, and the correct address will be loaded
 #     automatically (+60). See bootloader.mk for all options.
 BOOTLOADER = caterina
 
@@ -71,4 +70,5 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
 
-LAYOUTS = ortho_4x4  ortho_4x8  ortho_4x12  ortho_4x16 
+#FIXME: Community keymap build are currently failing due to missing functionality
+#LAYOUTS = ortho_4x4  ortho_4x8  ortho_4x12  ortho_4x16
diff --git a/keyboards/5x5/5x5.c → keyboards/40percentclub/5x5/5x5.c b/keyboards/5x5/5x5.c → keyboards/40percentclub/5x5/5x5.c
diff --git a/keyboards/5x5/5x5.h → keyboards/40percentclub/5x5/5x5.h b/keyboards/5x5/5x5.h → keyboards/40percentclub/5x5/5x5.h
diff --git a/keyboards/5x5/config.h → keyboards/40percentclub/5x5/config.h b/keyboards/5x5/config.h → keyboards/40percentclub/5x5/config.h
diff --git a/keyboards/5x5/keymaps/default/config.h → ...0percentclub/5x5/keymaps/default/config.h b/keyboards/5x5/keymaps/default/config.h → ...0percentclub/5x5/keymaps/default/config.h
diff --git a/keyboards/5x5/keymaps/default/keymap.c → ...0percentclub/5x5/keymaps/default/keymap.c b/keyboards/5x5/keymaps/default/keymap.c → ...0percentclub/5x5/keymaps/default/keymap.c
diff --git a/keyboards/5x5/readme.md → keyboards/40percentclub/5x5/readme.md b/keyboards/5x5/readme.md → keyboards/40percentclub/5x5/readme.md
@@ -17,7 +17,8 @@ Hardware Availability: [5x5 project on 40% Keyboards](http://www.40percent.club/
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 5x5:default
+    make 40percentclub/5x5: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).
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.    
 First pass at adding support for the 4x4 keyboard. Compiles but completely untested. Intended to kick-start development.  
diff --git a/keyboards/5x5/rules.mk → keyboards/40percentclub/5x5/rules.mk b/keyboards/5x5/rules.mk → keyboards/40percentclub/5x5/rules.mk
@@ -1,5 +1,4 @@
 # MCU name
-#MCU = at90usb1286
 MCU = atmega32u4
 
 # Processor frequency.
@@ -43,7 +42,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   Atmel DFU loader 4096
 #   LUFA bootloader  4096
 #   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=4096
+# OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Bootloader
 #     This definition is optional, and if your keyboard supports multiple bootloaders of
@@ -71,4 +70,5 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
 
-LAYOUTS = ortho_5x5  ortho_5x10  ortho_5x15
+#FIXME: Community keymap build are currently failing due to missing functionality
+#LAYOUTS = ortho_5x5  ortho_5x10  ortho_5x15
diff --git a/keyboards/6lit/6lit.c → keyboards/40percentclub/6lit/6lit.c b/keyboards/6lit/6lit.c → keyboards/40percentclub/6lit/6lit.c
diff --git a/keyboards/6lit/6lit.h → keyboards/40percentclub/6lit/6lit.h b/keyboards/6lit/6lit.h → keyboards/40percentclub/6lit/6lit.h
diff --git a/keyboards/6lit/config.h → keyboards/40percentclub/6lit/config.h b/keyboards/6lit/config.h → keyboards/40percentclub/6lit/config.h
diff --git a/keyboards/6lit/info.json → keyboards/40percentclub/6lit/info.json b/keyboards/6lit/info.json → keyboards/40percentclub/6lit/info.json
diff --git a/keyboards/6lit/keymaps/default/config.h → ...percentclub/6lit/keymaps/default/config.h b/keyboards/6lit/keymaps/default/config.h → ...percentclub/6lit/keymaps/default/config.h
diff --git a/keyboards/6lit/keymaps/default/keymap.c → ...percentclub/6lit/keymaps/default/keymap.c b/keyboards/6lit/keymaps/default/keymap.c → ...percentclub/6lit/keymaps/default/keymap.c
diff --git a/keyboards/6lit/keymaps/default/readme.md → ...ercentclub/6lit/keymaps/default/readme.md b/keyboards/6lit/keymaps/default/readme.md → ...ercentclub/6lit/keymaps/default/readme.md
diff --git a/keyboards/6lit/keymaps/macro/config.h → ...40percentclub/6lit/keymaps/macro/config.h b/keyboards/6lit/keymaps/macro/config.h → ...40percentclub/6lit/keymaps/macro/config.h
diff --git a/keyboards/6lit/keymaps/macro/keymap.c → ...40percentclub/6lit/keymaps/macro/keymap.c b/keyboards/6lit/keymaps/macro/keymap.c → ...40percentclub/6lit/keymaps/macro/keymap.c
diff --git a/keyboards/6lit/keymaps/macro/readme.md → ...0percentclub/6lit/keymaps/macro/readme.md b/keyboards/6lit/keymaps/macro/readme.md → ...0percentclub/6lit/keymaps/macro/readme.md
diff --git a/keyboards/6lit/readme.md → keyboards/40percentclub/6lit/readme.md b/keyboards/6lit/readme.md → keyboards/40percentclub/6lit/readme.md
@@ -1,6 +1,7 @@
 # 6lit
 
 ![6lit](https://1.bp.blogspot.com/-Pa8RgYZ0hy8/Wbmr4bjuV0I/AAAAAAACDbI/WLKQMDlcDVAVf1lAIRMN51usR1XcCCVNgCLcBGAs/s1600/a.JPG)
+===
 
 6 key macropad that fits within the 100mm x 100mm PCB size. Can be used singly as a regular 6 key macropad as well.
 
@@ -12,6 +13,6 @@ Hardware Availability: [6lit project on 40% Keyboards](http://www.40percent.club
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 6lit:default
+    make 40percentclub/6lit: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/6lit/rules.mk → keyboards/40percentclub/6lit/rules.mk b/keyboards/6lit/rules.mk → keyboards/40percentclub/6lit/rules.mk
diff --git a/keyboards/foobar/config.h → keyboards/40percentclub/foobar/config.h b/keyboards/foobar/config.h → keyboards/40percentclub/foobar/config.h
diff --git a/keyboards/foobar/foobar.c → keyboards/40percentclub/foobar/foobar.c b/keyboards/foobar/foobar.c → keyboards/40percentclub/foobar/foobar.c
diff --git a/keyboards/foobar/foobar.h → keyboards/40percentclub/foobar/foobar.h b/keyboards/foobar/foobar.h → keyboards/40percentclub/foobar/foobar.h
diff --git a/keyboards/foobar/info.json → keyboards/40percentclub/foobar/info.json b/keyboards/foobar/info.json → keyboards/40percentclub/foobar/info.json
diff --git a/keyboards/foobar/keymaps/default/config.h → ...rcentclub/foobar/keymaps/default/config.h b/keyboards/foobar/keymaps/default/config.h → ...rcentclub/foobar/keymaps/default/config.h
diff --git a/keyboards/foobar/keymaps/default/keymap.c → ...rcentclub/foobar/keymaps/default/keymap.c b/keyboards/foobar/keymaps/default/keymap.c → ...rcentclub/foobar/keymaps/default/keymap.c
diff --git a/keyboards/foobar/keymaps/default/readme.md → ...centclub/foobar/keymaps/default/readme.md b/keyboards/foobar/keymaps/default/readme.md → ...centclub/foobar/keymaps/default/readme.md
diff --git a/keyboards/foobar/keymaps/macro/config.h → ...percentclub/foobar/keymaps/macro/config.h b/keyboards/foobar/keymaps/macro/config.h → ...percentclub/foobar/keymaps/macro/config.h
diff --git a/keyboards/foobar/keymaps/macro/keymap.c → ...percentclub/foobar/keymaps/macro/keymap.c b/keyboards/foobar/keymaps/macro/keymap.c → ...percentclub/foobar/keymaps/macro/keymap.c
diff --git a/keyboards/foobar/keymaps/macro/readme.md → ...ercentclub/foobar/keymaps/macro/readme.md b/keyboards/foobar/keymaps/macro/readme.md → ...ercentclub/foobar/keymaps/macro/readme.md
diff --git a/keyboards/foobar/readme.md → keyboards/40percentclub/foobar/readme.md b/keyboards/foobar/readme.md → keyboards/40percentclub/foobar/readme.md
@@ -1,6 +1,7 @@
 # foobar
 
 ![foobar](https://2.bp.blogspot.com/-rr8TK6xg2N0/WbwVL2O7EfI/AAAAAAACDc8/209wN69ju0wAFICYYPNLIEGQhat5-5MbwCLcBGAs/s640/a.JPG)
+===
 
 Split 30% keyboard that fits within the 100mm x 100mm PCB size. Can be used together as a split keyboard or as a single 15 key macropad.
 
@@ -12,6 +13,6 @@ Hardware Availability: [foobar project on 40% Keyboards](http://www.40percent.cl
 
 Make example for this keyboard (after setting up your build environment):
 
-    make foobar:default
+    make 40percentclub/foobar: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/foobar/rules.mk → keyboards/40percentclub/foobar/rules.mk b/keyboards/foobar/rules.mk → keyboards/40percentclub/foobar/rules.mk
diff --git a/keyboards/gherkin/config.h → keyboards/40percentclub/gherkin/config.h b/keyboards/gherkin/config.h → keyboards/40percentclub/gherkin/config.h
diff --git a/keyboards/gherkin/gherkin.c → keyboards/40percentclub/gherkin/gherkin.c b/keyboards/gherkin/gherkin.c → keyboards/40percentclub/gherkin/gherkin.c
diff --git a/keyboards/gherkin/gherkin.h → keyboards/40percentclub/gherkin/gherkin.h b/keyboards/gherkin/gherkin.h → keyboards/40percentclub/gherkin/gherkin.h
diff --git a/keyboards/gherkin/info.json → keyboards/40percentclub/gherkin/info.json b/keyboards/gherkin/info.json → keyboards/40percentclub/gherkin/info.json
diff --git a/...oards/gherkin/keymaps/bbaserdem/README.md → ...tclub/gherkin/keymaps/bbaserdem/README.md b/...oards/gherkin/keymaps/bbaserdem/README.md → ...tclub/gherkin/keymaps/bbaserdem/README.md
diff --git a/keyboards/gherkin/keymaps/bbaserdem/config.h → ...ntclub/gherkin/keymaps/bbaserdem/config.h b/keyboards/gherkin/keymaps/bbaserdem/config.h → ...ntclub/gherkin/keymaps/bbaserdem/config.h
diff --git a/keyboards/gherkin/keymaps/bbaserdem/keymap.c → ...ntclub/gherkin/keymaps/bbaserdem/keymap.c b/keyboards/gherkin/keymaps/bbaserdem/keymap.c → ...ntclub/gherkin/keymaps/bbaserdem/keymap.c
diff --git a/keyboards/gherkin/keymaps/bbaserdem/rules.mk → ...ntclub/gherkin/keymaps/bbaserdem/rules.mk b/keyboards/gherkin/keymaps/bbaserdem/rules.mk → ...ntclub/gherkin/keymaps/bbaserdem/rules.mk
diff --git a/keyboards/gherkin/keymaps/default/keymap.c → ...centclub/gherkin/keymaps/default/keymap.c b/keyboards/gherkin/keymaps/default/keymap.c → ...centclub/gherkin/keymaps/default/keymap.c
diff --git a/...oards/gherkin/keymaps/itsaferbie/config.h → ...tclub/gherkin/keymaps/itsaferbie/config.h b/...oards/gherkin/keymaps/itsaferbie/config.h → ...tclub/gherkin/keymaps/itsaferbie/config.h
diff --git a/...oards/gherkin/keymaps/itsaferbie/keymap.c → ...tclub/gherkin/keymaps/itsaferbie/keymap.c b/...oards/gherkin/keymaps/itsaferbie/keymap.c → ...tclub/gherkin/keymaps/itsaferbie/keymap.c
diff --git a/...oards/gherkin/keymaps/itsaferbie/rules.mk → ...tclub/gherkin/keymaps/itsaferbie/rules.mk b/...oards/gherkin/keymaps/itsaferbie/rules.mk → ...tclub/gherkin/keymaps/itsaferbie/rules.mk
diff --git a/keyboards/gherkin/keymaps/mjt/config.h → ...0percentclub/gherkin/keymaps/mjt/config.h b/keyboards/gherkin/keymaps/mjt/config.h → ...0percentclub/gherkin/keymaps/mjt/config.h
diff --git a/keyboards/gherkin/keymaps/mjt/keymap.c → ...0percentclub/gherkin/keymaps/mjt/keymap.c b/keyboards/gherkin/keymaps/mjt/keymap.c → ...0percentclub/gherkin/keymaps/mjt/keymap.c
diff --git a/keyboards/gherkin/keymaps/mjt/rules.mk → ...0percentclub/gherkin/keymaps/mjt/rules.mk b/keyboards/gherkin/keymaps/mjt/rules.mk → ...0percentclub/gherkin/keymaps/mjt/rules.mk
diff --git a/keyboards/gherkin/keymaps/steno/config.h → ...ercentclub/gherkin/keymaps/steno/config.h b/keyboards/gherkin/keymaps/steno/config.h → ...ercentclub/gherkin/keymaps/steno/config.h
diff --git a/keyboards/gherkin/keymaps/steno/keymap.c → ...ercentclub/gherkin/keymaps/steno/keymap.c b/keyboards/gherkin/keymaps/steno/keymap.c → ...ercentclub/gherkin/keymaps/steno/keymap.c
diff --git a/keyboards/gherkin/keymaps/steno/readme.md → ...rcentclub/gherkin/keymaps/steno/readme.md b/keyboards/gherkin/keymaps/steno/readme.md → ...rcentclub/gherkin/keymaps/steno/readme.md
diff --git a/keyboards/gherkin/keymaps/steno/rules.mk → ...ercentclub/gherkin/keymaps/steno/rules.mk b/keyboards/gherkin/keymaps/steno/rules.mk → ...ercentclub/gherkin/keymaps/steno/rules.mk
diff --git a/.../gherkin/keymaps/talljoe-gherkin/config.h → .../gherkin/keymaps/talljoe-gherkin/config.h b/.../gherkin/keymaps/talljoe-gherkin/config.h → .../gherkin/keymaps/talljoe-gherkin/config.h
diff --git a/.../gherkin/keymaps/talljoe-gherkin/keymap.c → .../gherkin/keymaps/talljoe-gherkin/keymap.c b/.../gherkin/keymaps/talljoe-gherkin/keymap.c → .../gherkin/keymaps/talljoe-gherkin/keymap.c
diff --git a/.../gherkin/keymaps/talljoe-gherkin/rules.mk → .../gherkin/keymaps/talljoe-gherkin/rules.mk b/.../gherkin/keymaps/talljoe-gherkin/rules.mk → .../gherkin/keymaps/talljoe-gherkin/rules.mk
diff --git a/keyboards/gherkin/README.md → keyboards/40percentclub/gherkin/readme.md b/keyboards/gherkin/README.md → keyboards/40percentclub/gherkin/readme.md
@@ -1,4 +1,6 @@
-Gherkin
+# Gherkin
+
+![Gherkin](https://4.bp.blogspot.com/-sQ18-lNZXOc/WCzlTde-4PI/AAAAAAAB_JQ/qQrehAMG6DMKf3i4oj4mkmLGOfTUvb3KgCLcB/s640/IMG_20161116_122926.jpg)
 ===
 
 A 30 key keyboard.
@@ -11,8 +13,9 @@ Hardware Availability: [Gherkin project on 40% Keyboards](http://www.40percent.c
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gherkin:default
+    make 40percentclub/gherkin: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).
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
 First pass at adding support for the gherkin keyboard. Compiles but completely
 untested. Intended to kick-start development.
diff --git a/keyboards/gherkin/rules.mk → keyboards/40percentclub/gherkin/rules.mk b/keyboards/gherkin/rules.mk → keyboards/40percentclub/gherkin/rules.mk
diff --git a/keyboards/luddite/config.h → keyboards/40percentclub/luddite/config.h b/keyboards/luddite/config.h → keyboards/40percentclub/luddite/config.h
diff --git a/keyboards/luddite/keymaps/default/keymap.c → ...centclub/luddite/keymaps/default/keymap.c b/keyboards/luddite/keymaps/default/keymap.c → ...centclub/luddite/keymaps/default/keymap.c
diff --git a/keyboards/luddite/luddite.c → keyboards/40percentclub/luddite/luddite.c b/keyboards/luddite/luddite.c → keyboards/40percentclub/luddite/luddite.c
diff --git a/keyboards/luddite/luddite.h → keyboards/40percentclub/luddite/luddite.h b/keyboards/luddite/luddite.h → keyboards/40percentclub/luddite/luddite.h
diff --git a/keyboards/luddite/README.md → keyboards/40percentclub/luddite/readme.md b/keyboards/luddite/README.md → keyboards/40percentclub/luddite/readme.md
@@ -1,5 +1,8 @@
 # Luddite
 
+![Luddite](https://1.bp.blogspot.com/-GAAa-sMU_WU/W7uYLJJ8x1I/AAAAAAACS44/31n2z69BSboM4KT48YkNMJRYciC8LUMWgCLcBGAs/s640/a.jpg)
+===
+
 Luddite 60% keyboard with backlight and RGB underglow.
 
 * [The original TMK firmware](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/luddite)
@@ -10,7 +13,7 @@ Hardware Availability: [Luddite project on 40% Keyboards](http://www.40percent.c
 
 Make example for this keyboard (after setting up your build environment):
 
-    make luddite:default
+    make 40percentclub/luddite: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/luddite/rules.mk → keyboards/40percentclub/luddite/rules.mk b/keyboards/luddite/rules.mk → keyboards/40percentclub/luddite/rules.mk
diff --git a/keyboards/40percentclub/readme.md b/keyboards/40percentclub/readme.md
@@ -0,0 +1,4 @@
+# 40% Keyboards
+
+Website: [40percent.club](http://www.40percent.club/)  
+The original TMK firmware: [repo](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/)
diff --git a/keyboards/tomato/config.h → keyboards/40percentclub/tomato/config.h b/keyboards/tomato/config.h → keyboards/40percentclub/tomato/config.h
diff --git a/keyboards/tomato/info.json → keyboards/40percentclub/tomato/info.json b/keyboards/tomato/info.json → keyboards/40percentclub/tomato/info.json
diff --git a/keyboards/tomato/keymaps/default/keymap.c → ...rcentclub/tomato/keymaps/default/keymap.c b/keyboards/tomato/keymaps/default/keymap.c → ...rcentclub/tomato/keymaps/default/keymap.c
diff --git a/keyboards/tomato/readme.md → keyboards/40percentclub/tomato/readme.md b/keyboards/tomato/readme.md → keyboards/40percentclub/tomato/readme.md
@@ -1,4 +1,6 @@
-Tomato
+# Tomato
+
+![Tomato](https://2.bp.blogspot.com/-k6lyvfZz2WA/WXYyr508D7I/AAAAAAACB8A/UCNP2WCfvWAT8UWsCDICMRXwip5tAZsOwCLcBGAs/s640/a.JPG)
 ===
 
 A 30 key keyboard with programmable rgb backlighting.
@@ -12,9 +14,9 @@ Hardware Availability: [Gherkin project on 40% Keyboards](http://www.40percent.c
 
 Make example for this keyboard (after setting up your build environment):
 
-    make tomato:default
+    make 40percentclub/tomato:default
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) 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).
 
 First pass at adding support for the tomato keyboard. Completely
 untested. Intended to kick-start development.
diff --git a/keyboards/tomato/rules.mk → keyboards/40percentclub/tomato/rules.mk b/keyboards/tomato/rules.mk → keyboards/40percentclub/tomato/rules.mk
diff --git a/keyboards/tomato/tomato.c → keyboards/40percentclub/tomato/tomato.c b/keyboards/tomato/tomato.c → keyboards/40percentclub/tomato/tomato.c
diff --git a/keyboards/tomato/tomato.h → keyboards/40percentclub/tomato/tomato.h b/keyboards/tomato/tomato.h → keyboards/40percentclub/tomato/tomato.h