From 73883425a55f23a319eb1522c2e3ce52b8e2f042 Mon Sep 17 00:00:00 2001
From: zvecr <z.zvecr@gmail.com>
Date: Thu, 8 Nov 2018 23:17:41 +0000
Subject: [PATCH] relocate 40percent.club boards to new parent folder (#4380)

* Initial move of 40percent.club boards to common parent folder.

* Refactor readme files to be consistent

* Refactor readme files to be consistent - fix make command examples.

* Refactor readme files to be consistent - align readme filenames.

* Refactor readme files to be consistent - fix repo url.

* Disable Community keymap builds as they are currently failing due to missing functionality

* Move more of 40percent.club boards to common parent folder.

* Refactor readme files to be consistent - align readme filenames.

* Refactor readme files to be consistent - fix make command examples.
---
 keyboards/{ => 40percentclub}/4x4/4x4.c        |  0
 keyboards/{ => 40percentclub}/4x4/4x4.h        |  0
 keyboards/{ => 40percentclub}/4x4/config.h     |  0
 .../4x4/keymaps/default/config.h               |  0
 .../4x4/keymaps/default/keymap.c               |  0
 keyboards/{ => 40percentclub}/4x4/readme.md    |  5 +++--
 keyboards/{ => 40percentclub}/4x4/rules.mk     |  8 ++++----
 keyboards/{ => 40percentclub}/5x5/5x5.c        |  0
 keyboards/{ => 40percentclub}/5x5/5x5.h        |  0
 keyboards/{ => 40percentclub}/5x5/config.h     |  0
 .../5x5/keymaps/default/config.h               |  0
 .../5x5/keymaps/default/keymap.c               |  0
 keyboards/{ => 40percentclub}/5x5/readme.md    |  5 +++--
 keyboards/{ => 40percentclub}/5x5/rules.mk     |  6 +++---
 keyboards/{ => 40percentclub}/6lit/6lit.c      |  0
 keyboards/{ => 40percentclub}/6lit/6lit.h      |  0
 keyboards/{ => 40percentclub}/6lit/config.h    |  0
 keyboards/{ => 40percentclub}/6lit/info.json   |  0
 .../6lit/keymaps/default/config.h              |  0
 .../6lit/keymaps/default/keymap.c              |  0
 .../6lit/keymaps/default/readme.md             |  0
 .../6lit/keymaps/macro/config.h                |  0
 .../6lit/keymaps/macro/keymap.c                |  0
 .../6lit/keymaps/macro/readme.md               |  0
 keyboards/{ => 40percentclub}/6lit/readme.md   |  3 ++-
 keyboards/{ => 40percentclub}/6lit/rules.mk    |  0
 keyboards/{ => 40percentclub}/foobar/config.h  |  0
 keyboards/{ => 40percentclub}/foobar/foobar.c  |  0
 keyboards/{ => 40percentclub}/foobar/foobar.h  |  0
 keyboards/{ => 40percentclub}/foobar/info.json |  0
 .../foobar/keymaps/default/config.h            |  0
 .../foobar/keymaps/default/keymap.c            |  0
 .../foobar/keymaps/default/readme.md           |  0
 .../foobar/keymaps/macro/config.h              |  0
 .../foobar/keymaps/macro/keymap.c              |  0
 .../foobar/keymaps/macro/readme.md             |  0
 keyboards/{ => 40percentclub}/foobar/readme.md |  3 ++-
 keyboards/{ => 40percentclub}/foobar/rules.mk  |  0
 keyboards/{ => 40percentclub}/gherkin/config.h |  0
 .../{ => 40percentclub}/gherkin/gherkin.c      |  0
 .../{ => 40percentclub}/gherkin/gherkin.h      |  0
 .../{ => 40percentclub}/gherkin/info.json      |  0
 .../gherkin/keymaps/bbaserdem/README.md        |  0
 .../gherkin/keymaps/bbaserdem/config.h         |  0
 .../gherkin/keymaps/bbaserdem/keymap.c         |  0
 .../gherkin/keymaps/bbaserdem/rules.mk         |  0
 .../gherkin/keymaps/default/keymap.c           |  0
 .../gherkin/keymaps/itsaferbie/config.h        |  0
 .../gherkin/keymaps/itsaferbie/keymap.c        |  0
 .../gherkin/keymaps/itsaferbie/rules.mk        |  0
 .../gherkin/keymaps/mjt/config.h               |  0
 .../gherkin/keymaps/mjt/keymap.c               |  0
 .../gherkin/keymaps/mjt/rules.mk               |  0
 .../gherkin/keymaps/steno/config.h             |  0
 .../gherkin/keymaps/steno/keymap.c             |  0
 .../gherkin/keymaps/steno/readme.md            |  0
 .../gherkin/keymaps/steno/rules.mk             |  0
 .../gherkin/keymaps/talljoe-gherkin/config.h   |  0
 .../gherkin/keymaps/talljoe-gherkin/keymap.c   |  0
 .../gherkin/keymaps/talljoe-gherkin/rules.mk   |  0
 .../gherkin/readme.md}                         |  9 ++++++---
 keyboards/{ => 40percentclub}/gherkin/rules.mk |  0
 keyboards/{ => 40percentclub}/luddite/config.h |  0
 .../luddite/keymaps/default/keymap.c           |  0
 .../{ => 40percentclub}/luddite/luddite.c      |  0
 .../{ => 40percentclub}/luddite/luddite.h      |  0
 .../luddite/readme.md}                         |  5 ++++-
 keyboards/{ => 40percentclub}/luddite/rules.mk |  0
 keyboards/{ => 40percentclub}/mf68/config.h    |  0
 keyboards/{ => 40percentclub}/mf68/info.json   |  0
 .../mf68/keymaps/default/keymap.c              |  0
 .../mf68/keymaps/factory/keymap.c              |  0
 keyboards/{ => 40percentclub}/mf68/mf68.c      |  0
 keyboards/{ => 40percentclub}/mf68/mf68.h      |  0
 keyboards/40percentclub/mf68/readme.md         | 18 ++++++++++++++++++
 keyboards/{ => 40percentclub}/mf68/rules.mk    |  0
 .../{ => 40percentclub}/mf68_ble/config.h      |  0
 .../{ => 40percentclub}/mf68_ble/info.json     |  0
 .../mf68_ble/keymaps/default/keymap.c          |  0
 .../{ => 40percentclub}/mf68_ble/mf68_ble.c    |  0
 .../{ => 40percentclub}/mf68_ble/mf68_ble.h    |  0
 .../mf68_ble/readme.md}                        | 16 +++++++++-------
 .../{ => 40percentclub}/mf68_ble/rules.mk      |  0
 keyboards/{ => 40percentclub}/nano/config.h    |  0
 keyboards/{ => 40percentclub}/nano/info.json   |  0
 .../nano/keymaps/default/keymap.c              |  0
 .../nano/keymaps/default/rules.mk              |  0
 .../nano/keymaps/spooka/config.h               |  0
 .../nano/keymaps/spooka/keymap.c               |  0
 .../nano/keymaps/spooka/rules.mk               |  0
 keyboards/{ => 40percentclub}/nano/matrix.c    |  0
 keyboards/{ => 40percentclub}/nano/nano.c      |  0
 keyboards/{ => 40percentclub}/nano/nano.h      |  0
 keyboards/40percentclub/nano/readme.md         | 16 ++++++++++++++++
 keyboards/{ => 40percentclub}/nano/rules.mk    |  0
 keyboards/40percentclub/readme.md              |  4 ++++
 keyboards/{ => 40percentclub}/tomato/config.h  |  0
 keyboards/{ => 40percentclub}/tomato/info.json |  0
 .../tomato/keymaps/default/keymap.c            |  0
 keyboards/{ => 40percentclub}/tomato/readme.md |  8 +++++---
 keyboards/{ => 40percentclub}/tomato/rules.mk  |  0
 keyboards/{ => 40percentclub}/tomato/tomato.c  |  0
 keyboards/{ => 40percentclub}/tomato/tomato.h  |  0
 .../{ => 40percentclub}/ut47/LED_controls.ino  |  0
 keyboards/{ => 40percentclub}/ut47/config.h    |  0
 keyboards/{ => 40percentclub}/ut47/info.json   |  0
 .../ut47/keymaps/default/config.h              |  0
 .../ut47/keymaps/default/keymap.c              |  0
 .../ut47/keymaps/default/readme.md             |  0
 .../ut47/keymaps/non-us/config.h               |  0
 .../ut47/keymaps/non-us/keymap.c               |  0
 .../ut47/keymaps/non-us/readme.md              |  0
 .../ut47/keymaps/nordic/config.h               |  0
 .../ut47/keymaps/nordic/keymap.c               |  0
 .../ut47/keymaps/nordic/readme.md              |  0
 .../ut47/keymaps/rgb/config.h                  |  0
 .../ut47/keymaps/rgb/keymap.c                  |  0
 .../ut47/keymaps/rgb/readme.md                 |  0
 .../ut47/keymaps/rgb/rules.mk                  |  0
 keyboards/{ => 40percentclub}/ut47/led.c       |  0
 keyboards/{ => 40percentclub}/ut47/matrix.c    |  0
 keyboards/{ => 40percentclub}/ut47/readme.md   |  7 ++++---
 keyboards/{ => 40percentclub}/ut47/rules.mk    |  0
 keyboards/{ => 40percentclub}/ut47/ut47.c      |  0
 keyboards/{ => 40percentclub}/ut47/ut47.h      |  0
 keyboards/mf68/README.md                       | 18 ------------------
 keyboards/nano/readme.md                       | 14 --------------
 127 files changed, 83 insertions(+), 62 deletions(-)
 rename keyboards/{ => 40percentclub}/4x4/4x4.c (100%)
 rename keyboards/{ => 40percentclub}/4x4/4x4.h (100%)
 rename keyboards/{ => 40percentclub}/4x4/config.h (100%)
 rename keyboards/{ => 40percentclub}/4x4/keymaps/default/config.h (100%)
 rename keyboards/{ => 40percentclub}/4x4/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/4x4/readme.md (77%)
 rename keyboards/{ => 40percentclub}/4x4/rules.mk (94%)
 rename keyboards/{ => 40percentclub}/5x5/5x5.c (100%)
 rename keyboards/{ => 40percentclub}/5x5/5x5.h (100%)
 rename keyboards/{ => 40percentclub}/5x5/config.h (100%)
 rename keyboards/{ => 40percentclub}/5x5/keymaps/default/config.h (100%)
 rename keyboards/{ => 40percentclub}/5x5/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/5x5/readme.md (77%)
 rename keyboards/{ => 40percentclub}/5x5/rules.mk (95%)
 rename keyboards/{ => 40percentclub}/6lit/6lit.c (100%)
 rename keyboards/{ => 40percentclub}/6lit/6lit.h (100%)
 rename keyboards/{ => 40percentclub}/6lit/config.h (100%)
 rename keyboards/{ => 40percentclub}/6lit/info.json (100%)
 rename keyboards/{ => 40percentclub}/6lit/keymaps/default/config.h (100%)
 rename keyboards/{ => 40percentclub}/6lit/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/6lit/keymaps/default/readme.md (100%)
 rename keyboards/{ => 40percentclub}/6lit/keymaps/macro/config.h (100%)
 rename keyboards/{ => 40percentclub}/6lit/keymaps/macro/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/6lit/keymaps/macro/readme.md (100%)
 rename keyboards/{ => 40percentclub}/6lit/readme.md (95%)
 rename keyboards/{ => 40percentclub}/6lit/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/foobar/config.h (100%)
 rename keyboards/{ => 40percentclub}/foobar/foobar.c (100%)
 rename keyboards/{ => 40percentclub}/foobar/foobar.h (100%)
 rename keyboards/{ => 40percentclub}/foobar/info.json (100%)
 rename keyboards/{ => 40percentclub}/foobar/keymaps/default/config.h (100%)
 rename keyboards/{ => 40percentclub}/foobar/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/foobar/keymaps/default/readme.md (100%)
 rename keyboards/{ => 40percentclub}/foobar/keymaps/macro/config.h (100%)
 rename keyboards/{ => 40percentclub}/foobar/keymaps/macro/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/foobar/keymaps/macro/readme.md (100%)
 rename keyboards/{ => 40percentclub}/foobar/readme.md (95%)
 rename keyboards/{ => 40percentclub}/foobar/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/gherkin/config.h (100%)
 rename keyboards/{ => 40percentclub}/gherkin/gherkin.c (100%)
 rename keyboards/{ => 40percentclub}/gherkin/gherkin.h (100%)
 rename keyboards/{ => 40percentclub}/gherkin/info.json (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/bbaserdem/README.md (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/bbaserdem/config.h (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/bbaserdem/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/bbaserdem/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/itsaferbie/config.h (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/itsaferbie/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/itsaferbie/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/mjt/config.h (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/mjt/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/mjt/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/steno/config.h (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/steno/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/steno/readme.md (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/steno/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/talljoe-gherkin/config.h (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/talljoe-gherkin/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/gherkin/keymaps/talljoe-gherkin/rules.mk (100%)
 rename keyboards/{gherkin/README.md => 40percentclub/gherkin/readme.md} (52%)
 rename keyboards/{ => 40percentclub}/gherkin/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/luddite/config.h (100%)
 rename keyboards/{ => 40percentclub}/luddite/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/luddite/luddite.c (100%)
 rename keyboards/{ => 40percentclub}/luddite/luddite.h (100%)
 rename keyboards/{luddite/README.md => 40percentclub/luddite/readme.md} (82%)
 rename keyboards/{ => 40percentclub}/luddite/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/mf68/config.h (100%)
 rename keyboards/{ => 40percentclub}/mf68/info.json (100%)
 rename keyboards/{ => 40percentclub}/mf68/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/mf68/keymaps/factory/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/mf68/mf68.c (100%)
 rename keyboards/{ => 40percentclub}/mf68/mf68.h (100%)
 create mode 100644 keyboards/40percentclub/mf68/readme.md
 rename keyboards/{ => 40percentclub}/mf68/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/mf68_ble/config.h (100%)
 rename keyboards/{ => 40percentclub}/mf68_ble/info.json (100%)
 rename keyboards/{ => 40percentclub}/mf68_ble/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/mf68_ble/mf68_ble.c (100%)
 rename keyboards/{ => 40percentclub}/mf68_ble/mf68_ble.h (100%)
 rename keyboards/{mf68_ble/README.md => 40percentclub/mf68_ble/readme.md} (58%)
 rename keyboards/{ => 40percentclub}/mf68_ble/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/nano/config.h (100%)
 rename keyboards/{ => 40percentclub}/nano/info.json (100%)
 rename keyboards/{ => 40percentclub}/nano/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/nano/keymaps/default/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/nano/keymaps/spooka/config.h (100%)
 rename keyboards/{ => 40percentclub}/nano/keymaps/spooka/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/nano/keymaps/spooka/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/nano/matrix.c (100%)
 rename keyboards/{ => 40percentclub}/nano/nano.c (100%)
 rename keyboards/{ => 40percentclub}/nano/nano.h (100%)
 create mode 100644 keyboards/40percentclub/nano/readme.md
 rename keyboards/{ => 40percentclub}/nano/rules.mk (100%)
 create mode 100644 keyboards/40percentclub/readme.md
 rename keyboards/{ => 40percentclub}/tomato/config.h (100%)
 rename keyboards/{ => 40percentclub}/tomato/info.json (100%)
 rename keyboards/{ => 40percentclub}/tomato/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/tomato/readme.md (56%)
 rename keyboards/{ => 40percentclub}/tomato/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/tomato/tomato.c (100%)
 rename keyboards/{ => 40percentclub}/tomato/tomato.h (100%)
 rename keyboards/{ => 40percentclub}/ut47/LED_controls.ino (100%)
 rename keyboards/{ => 40percentclub}/ut47/config.h (100%)
 rename keyboards/{ => 40percentclub}/ut47/info.json (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/default/config.h (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/default/readme.md (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/non-us/config.h (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/non-us/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/non-us/readme.md (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/nordic/config.h (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/nordic/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/nordic/readme.md (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/rgb/config.h (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/rgb/keymap.c (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/rgb/readme.md (100%)
 rename keyboards/{ => 40percentclub}/ut47/keymaps/rgb/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/ut47/led.c (100%)
 rename keyboards/{ => 40percentclub}/ut47/matrix.c (100%)
 rename keyboards/{ => 40percentclub}/ut47/readme.md (92%)
 rename keyboards/{ => 40percentclub}/ut47/rules.mk (100%)
 rename keyboards/{ => 40percentclub}/ut47/ut47.c (100%)
 rename keyboards/{ => 40percentclub}/ut47/ut47.h (100%)
 delete mode 100644 keyboards/mf68/README.md
 delete mode 100644 keyboards/nano/readme.md

diff --git a/keyboards/4x4/4x4.c b/keyboards/40percentclub/4x4/4x4.c
similarity index 100%
rename from keyboards/4x4/4x4.c
rename to keyboards/40percentclub/4x4/4x4.c
diff --git a/keyboards/4x4/4x4.h b/keyboards/40percentclub/4x4/4x4.h
similarity index 100%
rename from keyboards/4x4/4x4.h
rename to keyboards/40percentclub/4x4/4x4.h
diff --git a/keyboards/4x4/config.h b/keyboards/40percentclub/4x4/config.h
similarity index 100%
rename from keyboards/4x4/config.h
rename to keyboards/40percentclub/4x4/config.h
diff --git a/keyboards/4x4/keymaps/default/config.h b/keyboards/40percentclub/4x4/keymaps/default/config.h
similarity index 100%
rename from keyboards/4x4/keymaps/default/config.h
rename to keyboards/40percentclub/4x4/keymaps/default/config.h
diff --git a/keyboards/4x4/keymaps/default/keymap.c b/keyboards/40percentclub/4x4/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/4x4/keymaps/default/keymap.c
rename to keyboards/40percentclub/4x4/keymaps/default/keymap.c
diff --git a/keyboards/4x4/readme.md b/keyboards/40percentclub/4x4/readme.md
similarity index 77%
rename from keyboards/4x4/readme.md
rename to keyboards/40percentclub/4x4/readme.md
index 3ca074fddd2..077a2049be9 100644
--- a/keyboards/4x4/readme.md
+++ b/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 b/keyboards/40percentclub/4x4/rules.mk
similarity index 94%
rename from keyboards/4x4/rules.mk
rename to keyboards/40percentclub/4x4/rules.mk
index b8b4bccc424..d572e724444 100644
--- a/keyboards/4x4/rules.mk
+++ b/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 b/keyboards/40percentclub/5x5/5x5.c
similarity index 100%
rename from keyboards/5x5/5x5.c
rename to keyboards/40percentclub/5x5/5x5.c
diff --git a/keyboards/5x5/5x5.h b/keyboards/40percentclub/5x5/5x5.h
similarity index 100%
rename from keyboards/5x5/5x5.h
rename to keyboards/40percentclub/5x5/5x5.h
diff --git a/keyboards/5x5/config.h b/keyboards/40percentclub/5x5/config.h
similarity index 100%
rename from keyboards/5x5/config.h
rename to keyboards/40percentclub/5x5/config.h
diff --git a/keyboards/5x5/keymaps/default/config.h b/keyboards/40percentclub/5x5/keymaps/default/config.h
similarity index 100%
rename from keyboards/5x5/keymaps/default/config.h
rename to keyboards/40percentclub/5x5/keymaps/default/config.h
diff --git a/keyboards/5x5/keymaps/default/keymap.c b/keyboards/40percentclub/5x5/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/5x5/keymaps/default/keymap.c
rename to keyboards/40percentclub/5x5/keymaps/default/keymap.c
diff --git a/keyboards/5x5/readme.md b/keyboards/40percentclub/5x5/readme.md
similarity index 77%
rename from keyboards/5x5/readme.md
rename to keyboards/40percentclub/5x5/readme.md
index e25535968d2..8f0d8e16677 100644
--- a/keyboards/5x5/readme.md
+++ b/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 b/keyboards/40percentclub/5x5/rules.mk
similarity index 95%
rename from keyboards/5x5/rules.mk
rename to keyboards/40percentclub/5x5/rules.mk
index 24e0e020fda..abc961a86fe 100644
--- a/keyboards/5x5/rules.mk
+++ b/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 b/keyboards/40percentclub/6lit/6lit.c
similarity index 100%
rename from keyboards/6lit/6lit.c
rename to keyboards/40percentclub/6lit/6lit.c
diff --git a/keyboards/6lit/6lit.h b/keyboards/40percentclub/6lit/6lit.h
similarity index 100%
rename from keyboards/6lit/6lit.h
rename to keyboards/40percentclub/6lit/6lit.h
diff --git a/keyboards/6lit/config.h b/keyboards/40percentclub/6lit/config.h
similarity index 100%
rename from keyboards/6lit/config.h
rename to keyboards/40percentclub/6lit/config.h
diff --git a/keyboards/6lit/info.json b/keyboards/40percentclub/6lit/info.json
similarity index 100%
rename from keyboards/6lit/info.json
rename to keyboards/40percentclub/6lit/info.json
diff --git a/keyboards/6lit/keymaps/default/config.h b/keyboards/40percentclub/6lit/keymaps/default/config.h
similarity index 100%
rename from keyboards/6lit/keymaps/default/config.h
rename to keyboards/40percentclub/6lit/keymaps/default/config.h
diff --git a/keyboards/6lit/keymaps/default/keymap.c b/keyboards/40percentclub/6lit/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/6lit/keymaps/default/keymap.c
rename to keyboards/40percentclub/6lit/keymaps/default/keymap.c
diff --git a/keyboards/6lit/keymaps/default/readme.md b/keyboards/40percentclub/6lit/keymaps/default/readme.md
similarity index 100%
rename from keyboards/6lit/keymaps/default/readme.md
rename to keyboards/40percentclub/6lit/keymaps/default/readme.md
diff --git a/keyboards/6lit/keymaps/macro/config.h b/keyboards/40percentclub/6lit/keymaps/macro/config.h
similarity index 100%
rename from keyboards/6lit/keymaps/macro/config.h
rename to keyboards/40percentclub/6lit/keymaps/macro/config.h
diff --git a/keyboards/6lit/keymaps/macro/keymap.c b/keyboards/40percentclub/6lit/keymaps/macro/keymap.c
similarity index 100%
rename from keyboards/6lit/keymaps/macro/keymap.c
rename to keyboards/40percentclub/6lit/keymaps/macro/keymap.c
diff --git a/keyboards/6lit/keymaps/macro/readme.md b/keyboards/40percentclub/6lit/keymaps/macro/readme.md
similarity index 100%
rename from keyboards/6lit/keymaps/macro/readme.md
rename to keyboards/40percentclub/6lit/keymaps/macro/readme.md
diff --git a/keyboards/6lit/readme.md b/keyboards/40percentclub/6lit/readme.md
similarity index 95%
rename from keyboards/6lit/readme.md
rename to keyboards/40percentclub/6lit/readme.md
index d5b21002855..3d28df2d756 100644
--- a/keyboards/6lit/readme.md
+++ b/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 b/keyboards/40percentclub/6lit/rules.mk
similarity index 100%
rename from keyboards/6lit/rules.mk
rename to keyboards/40percentclub/6lit/rules.mk
diff --git a/keyboards/foobar/config.h b/keyboards/40percentclub/foobar/config.h
similarity index 100%
rename from keyboards/foobar/config.h
rename to keyboards/40percentclub/foobar/config.h
diff --git a/keyboards/foobar/foobar.c b/keyboards/40percentclub/foobar/foobar.c
similarity index 100%
rename from keyboards/foobar/foobar.c
rename to keyboards/40percentclub/foobar/foobar.c
diff --git a/keyboards/foobar/foobar.h b/keyboards/40percentclub/foobar/foobar.h
similarity index 100%
rename from keyboards/foobar/foobar.h
rename to keyboards/40percentclub/foobar/foobar.h
diff --git a/keyboards/foobar/info.json b/keyboards/40percentclub/foobar/info.json
similarity index 100%
rename from keyboards/foobar/info.json
rename to keyboards/40percentclub/foobar/info.json
diff --git a/keyboards/foobar/keymaps/default/config.h b/keyboards/40percentclub/foobar/keymaps/default/config.h
similarity index 100%
rename from keyboards/foobar/keymaps/default/config.h
rename to keyboards/40percentclub/foobar/keymaps/default/config.h
diff --git a/keyboards/foobar/keymaps/default/keymap.c b/keyboards/40percentclub/foobar/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/foobar/keymaps/default/keymap.c
rename to keyboards/40percentclub/foobar/keymaps/default/keymap.c
diff --git a/keyboards/foobar/keymaps/default/readme.md b/keyboards/40percentclub/foobar/keymaps/default/readme.md
similarity index 100%
rename from keyboards/foobar/keymaps/default/readme.md
rename to keyboards/40percentclub/foobar/keymaps/default/readme.md
diff --git a/keyboards/foobar/keymaps/macro/config.h b/keyboards/40percentclub/foobar/keymaps/macro/config.h
similarity index 100%
rename from keyboards/foobar/keymaps/macro/config.h
rename to keyboards/40percentclub/foobar/keymaps/macro/config.h
diff --git a/keyboards/foobar/keymaps/macro/keymap.c b/keyboards/40percentclub/foobar/keymaps/macro/keymap.c
similarity index 100%
rename from keyboards/foobar/keymaps/macro/keymap.c
rename to keyboards/40percentclub/foobar/keymaps/macro/keymap.c
diff --git a/keyboards/foobar/keymaps/macro/readme.md b/keyboards/40percentclub/foobar/keymaps/macro/readme.md
similarity index 100%
rename from keyboards/foobar/keymaps/macro/readme.md
rename to keyboards/40percentclub/foobar/keymaps/macro/readme.md
diff --git a/keyboards/foobar/readme.md b/keyboards/40percentclub/foobar/readme.md
similarity index 95%
rename from keyboards/foobar/readme.md
rename to keyboards/40percentclub/foobar/readme.md
index 3898d4bb1a0..0acdf7252d2 100644
--- a/keyboards/foobar/readme.md
+++ b/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 b/keyboards/40percentclub/foobar/rules.mk
similarity index 100%
rename from keyboards/foobar/rules.mk
rename to keyboards/40percentclub/foobar/rules.mk
diff --git a/keyboards/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h
similarity index 100%
rename from keyboards/gherkin/config.h
rename to keyboards/40percentclub/gherkin/config.h
diff --git a/keyboards/gherkin/gherkin.c b/keyboards/40percentclub/gherkin/gherkin.c
similarity index 100%
rename from keyboards/gherkin/gherkin.c
rename to keyboards/40percentclub/gherkin/gherkin.c
diff --git a/keyboards/gherkin/gherkin.h b/keyboards/40percentclub/gherkin/gherkin.h
similarity index 100%
rename from keyboards/gherkin/gherkin.h
rename to keyboards/40percentclub/gherkin/gherkin.h
diff --git a/keyboards/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json
similarity index 100%
rename from keyboards/gherkin/info.json
rename to keyboards/40percentclub/gherkin/info.json
diff --git a/keyboards/gherkin/keymaps/bbaserdem/README.md b/keyboards/40percentclub/gherkin/keymaps/bbaserdem/README.md
similarity index 100%
rename from keyboards/gherkin/keymaps/bbaserdem/README.md
rename to keyboards/40percentclub/gherkin/keymaps/bbaserdem/README.md
diff --git a/keyboards/gherkin/keymaps/bbaserdem/config.h b/keyboards/40percentclub/gherkin/keymaps/bbaserdem/config.h
similarity index 100%
rename from keyboards/gherkin/keymaps/bbaserdem/config.h
rename to keyboards/40percentclub/gherkin/keymaps/bbaserdem/config.h
diff --git a/keyboards/gherkin/keymaps/bbaserdem/keymap.c b/keyboards/40percentclub/gherkin/keymaps/bbaserdem/keymap.c
similarity index 100%
rename from keyboards/gherkin/keymaps/bbaserdem/keymap.c
rename to keyboards/40percentclub/gherkin/keymaps/bbaserdem/keymap.c
diff --git a/keyboards/gherkin/keymaps/bbaserdem/rules.mk b/keyboards/40percentclub/gherkin/keymaps/bbaserdem/rules.mk
similarity index 100%
rename from keyboards/gherkin/keymaps/bbaserdem/rules.mk
rename to keyboards/40percentclub/gherkin/keymaps/bbaserdem/rules.mk
diff --git a/keyboards/gherkin/keymaps/default/keymap.c b/keyboards/40percentclub/gherkin/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/gherkin/keymaps/default/keymap.c
rename to keyboards/40percentclub/gherkin/keymaps/default/keymap.c
diff --git a/keyboards/gherkin/keymaps/itsaferbie/config.h b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
similarity index 100%
rename from keyboards/gherkin/keymaps/itsaferbie/config.h
rename to keyboards/40percentclub/gherkin/keymaps/itsaferbie/config.h
diff --git a/keyboards/gherkin/keymaps/itsaferbie/keymap.c b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
similarity index 100%
rename from keyboards/gherkin/keymaps/itsaferbie/keymap.c
rename to keyboards/40percentclub/gherkin/keymaps/itsaferbie/keymap.c
diff --git a/keyboards/gherkin/keymaps/itsaferbie/rules.mk b/keyboards/40percentclub/gherkin/keymaps/itsaferbie/rules.mk
similarity index 100%
rename from keyboards/gherkin/keymaps/itsaferbie/rules.mk
rename to keyboards/40percentclub/gherkin/keymaps/itsaferbie/rules.mk
diff --git a/keyboards/gherkin/keymaps/mjt/config.h b/keyboards/40percentclub/gherkin/keymaps/mjt/config.h
similarity index 100%
rename from keyboards/gherkin/keymaps/mjt/config.h
rename to keyboards/40percentclub/gherkin/keymaps/mjt/config.h
diff --git a/keyboards/gherkin/keymaps/mjt/keymap.c b/keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
similarity index 100%
rename from keyboards/gherkin/keymaps/mjt/keymap.c
rename to keyboards/40percentclub/gherkin/keymaps/mjt/keymap.c
diff --git a/keyboards/gherkin/keymaps/mjt/rules.mk b/keyboards/40percentclub/gherkin/keymaps/mjt/rules.mk
similarity index 100%
rename from keyboards/gherkin/keymaps/mjt/rules.mk
rename to keyboards/40percentclub/gherkin/keymaps/mjt/rules.mk
diff --git a/keyboards/gherkin/keymaps/steno/config.h b/keyboards/40percentclub/gherkin/keymaps/steno/config.h
similarity index 100%
rename from keyboards/gherkin/keymaps/steno/config.h
rename to keyboards/40percentclub/gherkin/keymaps/steno/config.h
diff --git a/keyboards/gherkin/keymaps/steno/keymap.c b/keyboards/40percentclub/gherkin/keymaps/steno/keymap.c
similarity index 100%
rename from keyboards/gherkin/keymaps/steno/keymap.c
rename to keyboards/40percentclub/gherkin/keymaps/steno/keymap.c
diff --git a/keyboards/gherkin/keymaps/steno/readme.md b/keyboards/40percentclub/gherkin/keymaps/steno/readme.md
similarity index 100%
rename from keyboards/gherkin/keymaps/steno/readme.md
rename to keyboards/40percentclub/gherkin/keymaps/steno/readme.md
diff --git a/keyboards/gherkin/keymaps/steno/rules.mk b/keyboards/40percentclub/gherkin/keymaps/steno/rules.mk
similarity index 100%
rename from keyboards/gherkin/keymaps/steno/rules.mk
rename to keyboards/40percentclub/gherkin/keymaps/steno/rules.mk
diff --git a/keyboards/gherkin/keymaps/talljoe-gherkin/config.h b/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/config.h
similarity index 100%
rename from keyboards/gherkin/keymaps/talljoe-gherkin/config.h
rename to keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/config.h
diff --git a/keyboards/gherkin/keymaps/talljoe-gherkin/keymap.c b/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c
similarity index 100%
rename from keyboards/gherkin/keymaps/talljoe-gherkin/keymap.c
rename to keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/keymap.c
diff --git a/keyboards/gherkin/keymaps/talljoe-gherkin/rules.mk b/keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/rules.mk
similarity index 100%
rename from keyboards/gherkin/keymaps/talljoe-gherkin/rules.mk
rename to keyboards/40percentclub/gherkin/keymaps/talljoe-gherkin/rules.mk
diff --git a/keyboards/gherkin/README.md b/keyboards/40percentclub/gherkin/readme.md
similarity index 52%
rename from keyboards/gherkin/README.md
rename to keyboards/40percentclub/gherkin/readme.md
index 5e0daeabf93..a6680d72057 100644
--- a/keyboards/gherkin/README.md
+++ b/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 b/keyboards/40percentclub/gherkin/rules.mk
similarity index 100%
rename from keyboards/gherkin/rules.mk
rename to keyboards/40percentclub/gherkin/rules.mk
diff --git a/keyboards/luddite/config.h b/keyboards/40percentclub/luddite/config.h
similarity index 100%
rename from keyboards/luddite/config.h
rename to keyboards/40percentclub/luddite/config.h
diff --git a/keyboards/luddite/keymaps/default/keymap.c b/keyboards/40percentclub/luddite/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/luddite/keymaps/default/keymap.c
rename to keyboards/40percentclub/luddite/keymaps/default/keymap.c
diff --git a/keyboards/luddite/luddite.c b/keyboards/40percentclub/luddite/luddite.c
similarity index 100%
rename from keyboards/luddite/luddite.c
rename to keyboards/40percentclub/luddite/luddite.c
diff --git a/keyboards/luddite/luddite.h b/keyboards/40percentclub/luddite/luddite.h
similarity index 100%
rename from keyboards/luddite/luddite.h
rename to keyboards/40percentclub/luddite/luddite.h
diff --git a/keyboards/luddite/README.md b/keyboards/40percentclub/luddite/readme.md
similarity index 82%
rename from keyboards/luddite/README.md
rename to keyboards/40percentclub/luddite/readme.md
index 72666dda5fd..928b6de8f3f 100644
--- a/keyboards/luddite/README.md
+++ b/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 b/keyboards/40percentclub/luddite/rules.mk
similarity index 100%
rename from keyboards/luddite/rules.mk
rename to keyboards/40percentclub/luddite/rules.mk
diff --git a/keyboards/mf68/config.h b/keyboards/40percentclub/mf68/config.h
similarity index 100%
rename from keyboards/mf68/config.h
rename to keyboards/40percentclub/mf68/config.h
diff --git a/keyboards/mf68/info.json b/keyboards/40percentclub/mf68/info.json
similarity index 100%
rename from keyboards/mf68/info.json
rename to keyboards/40percentclub/mf68/info.json
diff --git a/keyboards/mf68/keymaps/default/keymap.c b/keyboards/40percentclub/mf68/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mf68/keymaps/default/keymap.c
rename to keyboards/40percentclub/mf68/keymaps/default/keymap.c
diff --git a/keyboards/mf68/keymaps/factory/keymap.c b/keyboards/40percentclub/mf68/keymaps/factory/keymap.c
similarity index 100%
rename from keyboards/mf68/keymaps/factory/keymap.c
rename to keyboards/40percentclub/mf68/keymaps/factory/keymap.c
diff --git a/keyboards/mf68/mf68.c b/keyboards/40percentclub/mf68/mf68.c
similarity index 100%
rename from keyboards/mf68/mf68.c
rename to keyboards/40percentclub/mf68/mf68.c
diff --git a/keyboards/mf68/mf68.h b/keyboards/40percentclub/mf68/mf68.h
similarity index 100%
rename from keyboards/mf68/mf68.h
rename to keyboards/40percentclub/mf68/mf68.h
diff --git a/keyboards/40percentclub/mf68/readme.md b/keyboards/40percentclub/mf68/readme.md
new file mode 100644
index 00000000000..825c265f167
--- /dev/null
+++ b/keyboards/40percentclub/mf68/readme.md
@@ -0,0 +1,18 @@
+# mf68
+
+![mf68](https://3.bp.blogspot.com/-0YCA3Hx2Rq0/WD3U3GWhyvI/AAAAAAAB_Uo/RWTeyCPblGcxDrDwT9WL9ck2ZRuR26DgACLcB/s640/IMG_20161129_063741.jpg)
+===
+
+Magicforce 68 with [replacement PCB](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/mf68) designed by [di0ib](https://github.com/di0ib).
+
+* [The original TMK firmware](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/mf68)
+
+Keyboard Maintainer: QMK Community
+Hardware Supported: Pro Micro  
+Hardware Availability: [PCB files](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/mf68/pcb)  
+
+Make example for this keyboard (after setting up your build environment):  
+
+    make 40percentclub/mf68: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/mf68/rules.mk b/keyboards/40percentclub/mf68/rules.mk
similarity index 100%
rename from keyboards/mf68/rules.mk
rename to keyboards/40percentclub/mf68/rules.mk
diff --git a/keyboards/mf68_ble/config.h b/keyboards/40percentclub/mf68_ble/config.h
similarity index 100%
rename from keyboards/mf68_ble/config.h
rename to keyboards/40percentclub/mf68_ble/config.h
diff --git a/keyboards/mf68_ble/info.json b/keyboards/40percentclub/mf68_ble/info.json
similarity index 100%
rename from keyboards/mf68_ble/info.json
rename to keyboards/40percentclub/mf68_ble/info.json
diff --git a/keyboards/mf68_ble/keymaps/default/keymap.c b/keyboards/40percentclub/mf68_ble/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mf68_ble/keymaps/default/keymap.c
rename to keyboards/40percentclub/mf68_ble/keymaps/default/keymap.c
diff --git a/keyboards/mf68_ble/mf68_ble.c b/keyboards/40percentclub/mf68_ble/mf68_ble.c
similarity index 100%
rename from keyboards/mf68_ble/mf68_ble.c
rename to keyboards/40percentclub/mf68_ble/mf68_ble.c
diff --git a/keyboards/mf68_ble/mf68_ble.h b/keyboards/40percentclub/mf68_ble/mf68_ble.h
similarity index 100%
rename from keyboards/mf68_ble/mf68_ble.h
rename to keyboards/40percentclub/mf68_ble/mf68_ble.h
diff --git a/keyboards/mf68_ble/README.md b/keyboards/40percentclub/mf68_ble/readme.md
similarity index 58%
rename from keyboards/mf68_ble/README.md
rename to keyboards/40percentclub/mf68_ble/readme.md
index 3829c8fd7de..0e0f4b90d83 100644
--- a/keyboards/mf68_ble/README.md
+++ b/keyboards/40percentclub/mf68_ble/readme.md
@@ -1,10 +1,12 @@
-MF68
-====
+# mf68_ble
+
+![mf68_ble](https://3.bp.blogspot.com/-0YCA3Hx2Rq0/WD3U3GWhyvI/AAAAAAAB_Uo/RWTeyCPblGcxDrDwT9WL9ck2ZRuR26DgACLcB/s640/IMG_20161129_063741.jpg)
+===
 
 Magicforce 68 with [replacement PCB](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/mf68) designed by [di0ib](https://github.com/di0ib).
 
-Keyboard Maintainer: [di0ib](http://www.40percent.club)  
-Hardware Supported: [Feather 32u4 Bluefruit](https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/) 
+Keyboard Maintainer: QMK Community  
+Hardware Supported: [Feather 32u4 Bluefruit](https://learn.adafruit.com/adafruit-feather-32u4-bluefruit-le/)
 Please note: This is 32u4 and not M0
 Hardware Availability: [PCB files](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/mf68/pcb)  
 [MF68 thicc case files](https://github.com/harshitgoel96/mf68-case-thicc)  
@@ -20,8 +22,8 @@ Below is how you wire the Feather to PCB
 
 ![wire map](https://i.imgur.com/zYOjlTA.png)
 
-Make example for this keyboard (after setting up your build environment):
+Make example for this keyboard (after setting up your build environment):  
 
-    make mf68_ble:default
+    make 40percentclub/mf68_ble: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).
diff --git a/keyboards/mf68_ble/rules.mk b/keyboards/40percentclub/mf68_ble/rules.mk
similarity index 100%
rename from keyboards/mf68_ble/rules.mk
rename to keyboards/40percentclub/mf68_ble/rules.mk
diff --git a/keyboards/nano/config.h b/keyboards/40percentclub/nano/config.h
similarity index 100%
rename from keyboards/nano/config.h
rename to keyboards/40percentclub/nano/config.h
diff --git a/keyboards/nano/info.json b/keyboards/40percentclub/nano/info.json
similarity index 100%
rename from keyboards/nano/info.json
rename to keyboards/40percentclub/nano/info.json
diff --git a/keyboards/nano/keymaps/default/keymap.c b/keyboards/40percentclub/nano/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nano/keymaps/default/keymap.c
rename to keyboards/40percentclub/nano/keymaps/default/keymap.c
diff --git a/keyboards/nano/keymaps/default/rules.mk b/keyboards/40percentclub/nano/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/nano/keymaps/default/rules.mk
rename to keyboards/40percentclub/nano/keymaps/default/rules.mk
diff --git a/keyboards/nano/keymaps/spooka/config.h b/keyboards/40percentclub/nano/keymaps/spooka/config.h
similarity index 100%
rename from keyboards/nano/keymaps/spooka/config.h
rename to keyboards/40percentclub/nano/keymaps/spooka/config.h
diff --git a/keyboards/nano/keymaps/spooka/keymap.c b/keyboards/40percentclub/nano/keymaps/spooka/keymap.c
similarity index 100%
rename from keyboards/nano/keymaps/spooka/keymap.c
rename to keyboards/40percentclub/nano/keymaps/spooka/keymap.c
diff --git a/keyboards/nano/keymaps/spooka/rules.mk b/keyboards/40percentclub/nano/keymaps/spooka/rules.mk
similarity index 100%
rename from keyboards/nano/keymaps/spooka/rules.mk
rename to keyboards/40percentclub/nano/keymaps/spooka/rules.mk
diff --git a/keyboards/nano/matrix.c b/keyboards/40percentclub/nano/matrix.c
similarity index 100%
rename from keyboards/nano/matrix.c
rename to keyboards/40percentclub/nano/matrix.c
diff --git a/keyboards/nano/nano.c b/keyboards/40percentclub/nano/nano.c
similarity index 100%
rename from keyboards/nano/nano.c
rename to keyboards/40percentclub/nano/nano.c
diff --git a/keyboards/nano/nano.h b/keyboards/40percentclub/nano/nano.h
similarity index 100%
rename from keyboards/nano/nano.h
rename to keyboards/40percentclub/nano/nano.h
diff --git a/keyboards/40percentclub/nano/readme.md b/keyboards/40percentclub/nano/readme.md
new file mode 100644
index 00000000000..2677e5b7b74
--- /dev/null
+++ b/keyboards/40percentclub/nano/readme.md
@@ -0,0 +1,16 @@
+# nano
+
+![nano](https://1.bp.blogspot.com/-goa_eXx1McA/WEhvoSdfDSI/AAAAAAAB_bM/XdstcXe_eKkQxuYcNI5cTySTVo3xZxaeQCEw/s640/IMG_20161207_101051.jpg)
+===
+
+A 2x4 mini switch pad built using 6mm x 6mm tactile switches and a Pro Micro. [More info here.](http://www.40percent.club/2016/12/nano-tmk.html)
+
+Keyboard Maintainer: QMK Community   
+Hardware Supported: Pro Micro ATmega32U4  
+Hardware Availability: [PCB Files](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/nano/pcb)
+
+Make example for this keyboard (after setting up your build environment):  
+
+    make 40percentclub/nano: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/nano/rules.mk b/keyboards/40percentclub/nano/rules.mk
similarity index 100%
rename from keyboards/nano/rules.mk
rename to keyboards/40percentclub/nano/rules.mk
diff --git a/keyboards/40percentclub/readme.md b/keyboards/40percentclub/readme.md
new file mode 100644
index 00000000000..a8dd0e84f5f
--- /dev/null
+++ 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 b/keyboards/40percentclub/tomato/config.h
similarity index 100%
rename from keyboards/tomato/config.h
rename to keyboards/40percentclub/tomato/config.h
diff --git a/keyboards/tomato/info.json b/keyboards/40percentclub/tomato/info.json
similarity index 100%
rename from keyboards/tomato/info.json
rename to keyboards/40percentclub/tomato/info.json
diff --git a/keyboards/tomato/keymaps/default/keymap.c b/keyboards/40percentclub/tomato/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/tomato/keymaps/default/keymap.c
rename to keyboards/40percentclub/tomato/keymaps/default/keymap.c
diff --git a/keyboards/tomato/readme.md b/keyboards/40percentclub/tomato/readme.md
similarity index 56%
rename from keyboards/tomato/readme.md
rename to keyboards/40percentclub/tomato/readme.md
index e3851f18ca6..f93105ffdda 100644
--- a/keyboards/tomato/readme.md
+++ b/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 b/keyboards/40percentclub/tomato/rules.mk
similarity index 100%
rename from keyboards/tomato/rules.mk
rename to keyboards/40percentclub/tomato/rules.mk
diff --git a/keyboards/tomato/tomato.c b/keyboards/40percentclub/tomato/tomato.c
similarity index 100%
rename from keyboards/tomato/tomato.c
rename to keyboards/40percentclub/tomato/tomato.c
diff --git a/keyboards/tomato/tomato.h b/keyboards/40percentclub/tomato/tomato.h
similarity index 100%
rename from keyboards/tomato/tomato.h
rename to keyboards/40percentclub/tomato/tomato.h
diff --git a/keyboards/ut47/LED_controls.ino b/keyboards/40percentclub/ut47/LED_controls.ino
similarity index 100%
rename from keyboards/ut47/LED_controls.ino
rename to keyboards/40percentclub/ut47/LED_controls.ino
diff --git a/keyboards/ut47/config.h b/keyboards/40percentclub/ut47/config.h
similarity index 100%
rename from keyboards/ut47/config.h
rename to keyboards/40percentclub/ut47/config.h
diff --git a/keyboards/ut47/info.json b/keyboards/40percentclub/ut47/info.json
similarity index 100%
rename from keyboards/ut47/info.json
rename to keyboards/40percentclub/ut47/info.json
diff --git a/keyboards/ut47/keymaps/default/config.h b/keyboards/40percentclub/ut47/keymaps/default/config.h
similarity index 100%
rename from keyboards/ut47/keymaps/default/config.h
rename to keyboards/40percentclub/ut47/keymaps/default/config.h
diff --git a/keyboards/ut47/keymaps/default/keymap.c b/keyboards/40percentclub/ut47/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ut47/keymaps/default/keymap.c
rename to keyboards/40percentclub/ut47/keymaps/default/keymap.c
diff --git a/keyboards/ut47/keymaps/default/readme.md b/keyboards/40percentclub/ut47/keymaps/default/readme.md
similarity index 100%
rename from keyboards/ut47/keymaps/default/readme.md
rename to keyboards/40percentclub/ut47/keymaps/default/readme.md
diff --git a/keyboards/ut47/keymaps/non-us/config.h b/keyboards/40percentclub/ut47/keymaps/non-us/config.h
similarity index 100%
rename from keyboards/ut47/keymaps/non-us/config.h
rename to keyboards/40percentclub/ut47/keymaps/non-us/config.h
diff --git a/keyboards/ut47/keymaps/non-us/keymap.c b/keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
similarity index 100%
rename from keyboards/ut47/keymaps/non-us/keymap.c
rename to keyboards/40percentclub/ut47/keymaps/non-us/keymap.c
diff --git a/keyboards/ut47/keymaps/non-us/readme.md b/keyboards/40percentclub/ut47/keymaps/non-us/readme.md
similarity index 100%
rename from keyboards/ut47/keymaps/non-us/readme.md
rename to keyboards/40percentclub/ut47/keymaps/non-us/readme.md
diff --git a/keyboards/ut47/keymaps/nordic/config.h b/keyboards/40percentclub/ut47/keymaps/nordic/config.h
similarity index 100%
rename from keyboards/ut47/keymaps/nordic/config.h
rename to keyboards/40percentclub/ut47/keymaps/nordic/config.h
diff --git a/keyboards/ut47/keymaps/nordic/keymap.c b/keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
similarity index 100%
rename from keyboards/ut47/keymaps/nordic/keymap.c
rename to keyboards/40percentclub/ut47/keymaps/nordic/keymap.c
diff --git a/keyboards/ut47/keymaps/nordic/readme.md b/keyboards/40percentclub/ut47/keymaps/nordic/readme.md
similarity index 100%
rename from keyboards/ut47/keymaps/nordic/readme.md
rename to keyboards/40percentclub/ut47/keymaps/nordic/readme.md
diff --git a/keyboards/ut47/keymaps/rgb/config.h b/keyboards/40percentclub/ut47/keymaps/rgb/config.h
similarity index 100%
rename from keyboards/ut47/keymaps/rgb/config.h
rename to keyboards/40percentclub/ut47/keymaps/rgb/config.h
diff --git a/keyboards/ut47/keymaps/rgb/keymap.c b/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
similarity index 100%
rename from keyboards/ut47/keymaps/rgb/keymap.c
rename to keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
diff --git a/keyboards/ut47/keymaps/rgb/readme.md b/keyboards/40percentclub/ut47/keymaps/rgb/readme.md
similarity index 100%
rename from keyboards/ut47/keymaps/rgb/readme.md
rename to keyboards/40percentclub/ut47/keymaps/rgb/readme.md
diff --git a/keyboards/ut47/keymaps/rgb/rules.mk b/keyboards/40percentclub/ut47/keymaps/rgb/rules.mk
similarity index 100%
rename from keyboards/ut47/keymaps/rgb/rules.mk
rename to keyboards/40percentclub/ut47/keymaps/rgb/rules.mk
diff --git a/keyboards/ut47/led.c b/keyboards/40percentclub/ut47/led.c
similarity index 100%
rename from keyboards/ut47/led.c
rename to keyboards/40percentclub/ut47/led.c
diff --git a/keyboards/ut47/matrix.c b/keyboards/40percentclub/ut47/matrix.c
similarity index 100%
rename from keyboards/ut47/matrix.c
rename to keyboards/40percentclub/ut47/matrix.c
diff --git a/keyboards/ut47/readme.md b/keyboards/40percentclub/ut47/readme.md
similarity index 92%
rename from keyboards/ut47/readme.md
rename to keyboards/40percentclub/ut47/readme.md
index 244bbd1de80..bbae1384a99 100644
--- a/keyboards/ut47/readme.md
+++ b/keyboards/40percentclub/ut47/readme.md
@@ -1,6 +1,7 @@
 # ut47
 
 ![ut47](https://i.imgur.com/ZDKZQaj.jpg)
+===
 
 Somewhere between ortholinear and standard offset. Created to have all the same functions on a Planck in a keyboard but with a more conventional keyboard row stagger.
 
@@ -12,15 +13,15 @@ Hardware Availability: [How to order](http://www.40percent.club/2017/03/ordering
 
 To flash the UT47 without LEDs (single controller), run:
 
-    make ut47:default
+    make 40percentclub/ut47:default
 
 To enable the UT47 LEDs (dual controller), run this for the main controller:
 
-    make ut47:default LED_ENABLE=yes
+    make 40percentclub/ut47:default LED_ENABLE=yes
 
 Or you can add `LED_ENABLE = yes` to *rules.mk*
 
-And then flash [LED_controls.ino](LED_controls.ino) to the second controller using [Arduino IDE](https://www.arduino.cc/en/Main/Software) or similar. NOTE: Arduino IDE will require importing additional libraries to compile. 
+And then flash [LED_controls.ino](LED_controls.ino) to the second controller using [Arduino IDE](https://www.arduino.cc/en/Main/Software) or similar. NOTE: Arduino IDE will require importing additional libraries to compile.
 
 <small>The reason this is an "opt-in" feature is to prevent sending serial communication over the pin, in case it ends up being used for something else (like RGB underglow).</small>
 
diff --git a/keyboards/ut47/rules.mk b/keyboards/40percentclub/ut47/rules.mk
similarity index 100%
rename from keyboards/ut47/rules.mk
rename to keyboards/40percentclub/ut47/rules.mk
diff --git a/keyboards/ut47/ut47.c b/keyboards/40percentclub/ut47/ut47.c
similarity index 100%
rename from keyboards/ut47/ut47.c
rename to keyboards/40percentclub/ut47/ut47.c
diff --git a/keyboards/ut47/ut47.h b/keyboards/40percentclub/ut47/ut47.h
similarity index 100%
rename from keyboards/ut47/ut47.h
rename to keyboards/40percentclub/ut47/ut47.h
diff --git a/keyboards/mf68/README.md b/keyboards/mf68/README.md
deleted file mode 100644
index 7dd3a900a54..00000000000
--- a/keyboards/mf68/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-MF68
-====
-
-Magicforce 68 with [replacement PCB](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/mf68) designed by [di0ib](https://github.com/di0ib).
-
-Keyboard Maintainer: [di0ib](http://www.40percent.club)  
-Hardware Supported: Pro Micro  
-Hardware Availability: [PCB files](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/mf68/pcb)  
-
-Make example for this keyboard (after setting up your build environment):
-
-    make mf68:default
-
-Example of flashing this keyboard:
-
-    make mf68:default:avrdude
-
-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.
diff --git a/keyboards/nano/readme.md b/keyboards/nano/readme.md
deleted file mode 100644
index e8278e340c5..00000000000
--- a/keyboards/nano/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Nano
-====
-
-A 2x4 mini switch pad built using 6mm x 6mm tactile switches and a Pro Micro. [More info here.](http://www.40percent.club/2016/12/nano-tmk.html)
-
-Keyboard Maintainer: [di0ib](https://github.com/di0ib)  
-Hardware Supported: Pro Micro ATmega32U4  
-Hardware Availability: [PCB Files](https://github.com/di0ib/tmk_keyboard/tree/master/keyboard/nano/pcb)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make nano: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.