From 3f3fa0791895f14370b4bb3e8512597688c45122 Mon Sep 17 00:00:00 2001
From: skullydazed <skullydazed@users.noreply.github.com>
Date: Tue, 17 Oct 2017 18:05:21 -0700
Subject: [PATCH] Reorganize clueboard into a single directory (#1855)

---
 .../{clueboard_17 => clueboard/17}/clueboard_17.c   |  0
 .../{clueboard_17 => clueboard/17}/clueboard_17.h   |  0
 keyboards/{clueboard_17 => clueboard/17}/config.h   |  0
 .../17}/keymaps/default/keymap.c                    |  0
 keyboards/{clueboard_17 => clueboard/17}/readme.md  |  9 +++++----
 keyboards/{clueboard_17 => clueboard/17}/rules.mk   |  0
 .../60}/boards/GENERIC_STM32_F303XC/board.c         |  0
 .../60}/boards/GENERIC_STM32_F303XC/board.h         |  0
 .../60}/boards/GENERIC_STM32_F303XC/board.mk        |  0
 .../60}/bootloader_defs.h                           |  0
 keyboards/{clueboard_60 => clueboard/60}/chconf.h   |  0
 .../{clueboard_60 => clueboard/60}/clueboard_60.c   |  0
 .../{clueboard_60 => clueboard/60}/clueboard_60.h   |  0
 keyboards/{clueboard_60 => clueboard/60}/config.h   |  0
 keyboards/{clueboard_60 => clueboard/60}/halconf.h  |  0
 .../60}/keymaps/default/keymap.c                    |  0
 .../60}/keymaps/default/readme.md                   |  0
 .../60}/keymaps/default_aek/keymap.c                |  0
 .../60}/keymaps/default_aek/readme.md               |  0
 keyboards/{clueboard_60 => clueboard/60}/led.c      |  0
 keyboards/{clueboard_60 => clueboard/60}/matrix.c   |  0
 keyboards/{clueboard_60 => clueboard/60}/mcuconf.h  |  0
 keyboards/{clueboard_60 => clueboard/60}/readme.md  |  2 +-
 keyboards/{clueboard_60 => clueboard/60}/rules.mk   |  0
 .../{clueboard_66 => clueboard/66}/clueboard_66.c   |  0
 .../{clueboard_66 => clueboard/66}/clueboard_66.h   |  0
 keyboards/{clueboard_66 => clueboard/66}/config.h   |  4 ++--
 .../66}/keymaps/bloodlvst/Makefile                  |  0
 .../66}/keymaps/bloodlvst/config.h                  |  0
 .../66}/keymaps/bloodlvst/keymap.c                  |  0
 .../66}/keymaps/bloodlvst/readme.md                 |  0
 .../66}/keymaps/bloodlvst/rules.mk                  |  0
 .../66}/keymaps/caps_fn/keymap.c                    |  0
 .../66}/keymaps/caps_fn/readme.md                   |  0
 .../66}/keymaps/colemak/keymap.c                    |  0
 .../66}/keymaps/default/keymap.c                    |  0
 .../66}/keymaps/default/readme.md                   |  0
 .../66}/keymaps/jokrik/keymap.c                     |  0
 .../66}/keymaps/jokrik/readme.md                    |  0
 .../66}/keymaps/mac_optimized/keymap.c              |  0
 .../66}/keymaps/mac_optimized/readme.md             |  0
 .../66}/keymaps/magicmonty/Makefile                 |  0
 .../66}/keymaps/magicmonty/config.h                 |  0
 .../66}/keymaps/magicmonty/keymap.c                 |  0
 .../66}/keymaps/magicmonty/readme.md                |  0
 .../66}/keymaps/magicmonty/rules.mk                 |  0
 .../66}/keymaps/maximised/keymap.c                  |  0
 .../66}/keymaps/maximised/readme.md                 |  0
 .../66}/keymaps/mouse_keys/Makefile                 |  0
 .../66}/keymaps/mouse_keys/keymap.c                 |  0
 .../66}/keymaps/mouse_keys/readme.md                |  0
 .../66}/keymaps/mouse_keys/rules.mk                 |  0
 .../66}/keymaps/serubin/Makefile                    |  0
 .../66}/keymaps/serubin/keymap.c                    |  0
 .../66}/keymaps/serubin/readme.md                   |  0
 .../66}/keymaps/serubin/rules.mk                    |  0
 .../66}/keymaps/shift_fn/keymap.c                   |  0
 .../66}/keymaps/shift_fn/readme.md                  |  0
 .../66}/keymaps/skully/keymap.c                     |  0
 .../66}/keymaps/skully/readme.md                    |  0
 .../66}/keymaps/smt/keymap.c                        |  0
 .../66}/keymaps/smt/readme.md                       |  0
 .../66}/keymaps/tetris/Makefile                     |  0
 .../66}/keymaps/tetris/keymap.c                     |  0
 .../66}/keymaps/tetris/readme.md                    |  0
 .../66}/keymaps/tetris/rules.mk                     |  0
 .../66}/keymaps/tetris/tetris_text.c                |  0
 .../66}/keymaps/tetris/tetris_text.h                |  0
 .../66}/keymaps/unix_optimized/keymap.c             |  0
 .../66}/keymaps/unix_optimized/readme.md            |  0
 .../66}/keymaps/win_optimized/keymap.c              |  0
 .../66}/keymaps/win_optimized/readme.md             |  0
 .../66}/keymaps/xyverz/Makefile                     |  0
 .../66}/keymaps/xyverz/keymap.c                     |  0
 .../66}/keymaps/xyverz/rules.mk                     |  0
 keyboards/{clueboard_66 => clueboard/66}/readme.md  |  2 +-
 .../{clueboard_66 => clueboard/66}/rev1/config.h    |  6 +++---
 .../{clueboard_66 => clueboard/66}/rev1/rev1.c      |  0
 .../{clueboard_66 => clueboard/66}/rev1/rev1.h      |  0
 .../{clueboard_66 => clueboard/66}/rev1/rules.mk    |  0
 .../{clueboard_66 => clueboard/66}/rev2/config.h    |  4 ++--
 .../{clueboard_66 => clueboard/66}/rev2/rev2.c      |  0
 .../{clueboard_66 => clueboard/66}/rev2/rev2.h      |  0
 .../{clueboard_66 => clueboard/66}/rev2/rules.mk    |  0
 .../{clueboard_66 => clueboard/66}/rev3/config.h    |  4 ++--
 .../{clueboard_66 => clueboard/66}/rev3/rev3.c      |  0
 .../{clueboard_66 => clueboard/66}/rev3/rev3.h      |  0
 .../{clueboard_66 => clueboard/66}/rev3/rules.mk    |  0
 keyboards/{clueboard_66 => clueboard/66}/rules.mk   |  3 +--
 keyboards/{cluecard => clueboard/card}/cluecard.c   |  0
 keyboards/{cluecard => clueboard/card}/cluecard.h   |  0
 keyboards/{cluecard => clueboard/card}/config.h     |  0
 .../card}/keymaps/default/config.h                  |  0
 .../card}/keymaps/default/keymap.c                  |  0
 keyboards/clueboard/card/keymaps/default/readme.md  |  3 +++
 .../card}/keymaps/default/rules.mk                  |  0
 .../card}/keymaps/rgb_effects/config.h              |  0
 .../card}/keymaps/rgb_effects/keymap.c              |  0
 .../card}/keymaps/rgb_effects/readme.md             |  4 +---
 .../card}/keymaps/rgb_effects/rules.mk              |  0
 keyboards/{cluecard => clueboard/card}/readme.md    |  2 +-
 keyboards/{cluecard => clueboard/card}/rules.mk     |  0
 keyboards/clueboard/readme.md                       | 13 +++++++++++++
 keyboards/cluecard/keymaps/default/readme.md        |  5 -----
 104 files changed, 35 insertions(+), 26 deletions(-)
 rename keyboards/{clueboard_17 => clueboard/17}/clueboard_17.c (100%)
 rename keyboards/{clueboard_17 => clueboard/17}/clueboard_17.h (100%)
 rename keyboards/{clueboard_17 => clueboard/17}/config.h (100%)
 rename keyboards/{clueboard_17 => clueboard/17}/keymaps/default/keymap.c (100%)
 rename keyboards/{clueboard_17 => clueboard/17}/readme.md (59%)
 rename keyboards/{clueboard_17 => clueboard/17}/rules.mk (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/boards/GENERIC_STM32_F303XC/board.c (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/boards/GENERIC_STM32_F303XC/board.h (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/boards/GENERIC_STM32_F303XC/board.mk (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/bootloader_defs.h (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/chconf.h (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/clueboard_60.c (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/clueboard_60.h (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/config.h (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/halconf.h (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/keymaps/default/keymap.c (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/keymaps/default/readme.md (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/keymaps/default_aek/keymap.c (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/keymaps/default_aek/readme.md (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/led.c (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/matrix.c (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/mcuconf.h (100%)
 rename keyboards/{clueboard_60 => clueboard/60}/readme.md (92%)
 rename keyboards/{clueboard_60 => clueboard/60}/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/clueboard_66.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/clueboard_66.h (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/config.h (96%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/bloodlvst/Makefile (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/bloodlvst/config.h (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/bloodlvst/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/bloodlvst/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/bloodlvst/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/caps_fn/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/caps_fn/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/colemak/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/default/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/default/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/jokrik/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/jokrik/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/mac_optimized/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/mac_optimized/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/magicmonty/Makefile (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/magicmonty/config.h (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/magicmonty/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/magicmonty/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/magicmonty/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/maximised/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/maximised/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/mouse_keys/Makefile (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/mouse_keys/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/mouse_keys/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/mouse_keys/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/serubin/Makefile (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/serubin/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/serubin/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/serubin/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/shift_fn/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/shift_fn/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/skully/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/skully/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/smt/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/smt/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/tetris/Makefile (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/tetris/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/tetris/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/tetris/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/tetris/tetris_text.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/tetris/tetris_text.h (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/unix_optimized/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/unix_optimized/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/win_optimized/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/win_optimized/readme.md (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/xyverz/Makefile (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/xyverz/keymap.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/keymaps/xyverz/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/readme.md (95%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev1/config.h (91%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev1/rev1.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev1/rev1.h (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev1/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev2/config.h (94%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev2/rev2.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev2/rev2.h (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev2/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev3/config.h (94%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev3/rev3.c (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev3/rev3.h (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/rev3/rules.mk (100%)
 rename keyboards/{clueboard_66 => clueboard/66}/rules.mk (95%)
 rename keyboards/{cluecard => clueboard/card}/cluecard.c (100%)
 rename keyboards/{cluecard => clueboard/card}/cluecard.h (100%)
 rename keyboards/{cluecard => clueboard/card}/config.h (100%)
 rename keyboards/{cluecard => clueboard/card}/keymaps/default/config.h (100%)
 rename keyboards/{cluecard => clueboard/card}/keymaps/default/keymap.c (100%)
 create mode 100644 keyboards/clueboard/card/keymaps/default/readme.md
 rename keyboards/{cluecard => clueboard/card}/keymaps/default/rules.mk (100%)
 rename keyboards/{cluecard => clueboard/card}/keymaps/rgb_effects/config.h (100%)
 rename keyboards/{cluecard => clueboard/card}/keymaps/rgb_effects/keymap.c (100%)
 rename keyboards/{cluecard => clueboard/card}/keymaps/rgb_effects/readme.md (53%)
 rename keyboards/{cluecard => clueboard/card}/keymaps/rgb_effects/rules.mk (100%)
 rename keyboards/{cluecard => clueboard/card}/readme.md (93%)
 rename keyboards/{cluecard => clueboard/card}/rules.mk (100%)
 create mode 100644 keyboards/clueboard/readme.md
 delete mode 100644 keyboards/cluecard/keymaps/default/readme.md

diff --git a/keyboards/clueboard_17/clueboard_17.c b/keyboards/clueboard/17/clueboard_17.c
similarity index 100%
rename from keyboards/clueboard_17/clueboard_17.c
rename to keyboards/clueboard/17/clueboard_17.c
diff --git a/keyboards/clueboard_17/clueboard_17.h b/keyboards/clueboard/17/clueboard_17.h
similarity index 100%
rename from keyboards/clueboard_17/clueboard_17.h
rename to keyboards/clueboard/17/clueboard_17.h
diff --git a/keyboards/clueboard_17/config.h b/keyboards/clueboard/17/config.h
similarity index 100%
rename from keyboards/clueboard_17/config.h
rename to keyboards/clueboard/17/config.h
diff --git a/keyboards/clueboard_17/keymaps/default/keymap.c b/keyboards/clueboard/17/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/clueboard_17/keymaps/default/keymap.c
rename to keyboards/clueboard/17/keymaps/default/keymap.c
diff --git a/keyboards/clueboard_17/readme.md b/keyboards/clueboard/17/readme.md
similarity index 59%
rename from keyboards/clueboard_17/readme.md
rename to keyboards/clueboard/17/readme.md
index f3590fdbb5..877adc7842 100644
--- a/keyboards/clueboard_17/readme.md
+++ b/keyboards/clueboard/17/readme.md
@@ -1,15 +1,16 @@
-# Cluepad
+# Clueboard 17% (Formerly Cluepad)
 
-![Cluepad](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/5842fbdce3df28eae5ec557e/5844fb2cb8a79bbdfd63bad1/1498501250178/IMGP3931.jpg?format=750w)
+![Clueboard 17%](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/5842fbdce3df28eae5ec557e/5844fb2cb8a79bbdfd63bad1/1498501250178/IMGP3931.jpg?format=750w)
 
 A basic 17 key numpad PCB.
 
 * Keyboard Maintainer: [Zach White](https://github.com/skullydazed)
-* Hardware Supported: Cluepad PCB 1.0
+* Hardware Supported:
+  * Cluepad PCB 1.0
 * Hardware Availability: [clueboard.co](https://clueboard.co/)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make clueboard_17:default
+    make clueboard/17: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.
diff --git a/keyboards/clueboard_17/rules.mk b/keyboards/clueboard/17/rules.mk
similarity index 100%
rename from keyboards/clueboard_17/rules.mk
rename to keyboards/clueboard/17/rules.mk
diff --git a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.c b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c
similarity index 100%
rename from keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.c
rename to keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.c
diff --git a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.h b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h
similarity index 100%
rename from keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.h
rename to keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.h
diff --git a/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.mk b/keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.mk
similarity index 100%
rename from keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.mk
rename to keyboards/clueboard/60/boards/GENERIC_STM32_F303XC/board.mk
diff --git a/keyboards/clueboard_60/bootloader_defs.h b/keyboards/clueboard/60/bootloader_defs.h
similarity index 100%
rename from keyboards/clueboard_60/bootloader_defs.h
rename to keyboards/clueboard/60/bootloader_defs.h
diff --git a/keyboards/clueboard_60/chconf.h b/keyboards/clueboard/60/chconf.h
similarity index 100%
rename from keyboards/clueboard_60/chconf.h
rename to keyboards/clueboard/60/chconf.h
diff --git a/keyboards/clueboard_60/clueboard_60.c b/keyboards/clueboard/60/clueboard_60.c
similarity index 100%
rename from keyboards/clueboard_60/clueboard_60.c
rename to keyboards/clueboard/60/clueboard_60.c
diff --git a/keyboards/clueboard_60/clueboard_60.h b/keyboards/clueboard/60/clueboard_60.h
similarity index 100%
rename from keyboards/clueboard_60/clueboard_60.h
rename to keyboards/clueboard/60/clueboard_60.h
diff --git a/keyboards/clueboard_60/config.h b/keyboards/clueboard/60/config.h
similarity index 100%
rename from keyboards/clueboard_60/config.h
rename to keyboards/clueboard/60/config.h
diff --git a/keyboards/clueboard_60/halconf.h b/keyboards/clueboard/60/halconf.h
similarity index 100%
rename from keyboards/clueboard_60/halconf.h
rename to keyboards/clueboard/60/halconf.h
diff --git a/keyboards/clueboard_60/keymaps/default/keymap.c b/keyboards/clueboard/60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/clueboard_60/keymaps/default/keymap.c
rename to keyboards/clueboard/60/keymaps/default/keymap.c
diff --git a/keyboards/clueboard_60/keymaps/default/readme.md b/keyboards/clueboard/60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/clueboard_60/keymaps/default/readme.md
rename to keyboards/clueboard/60/keymaps/default/readme.md
diff --git a/keyboards/clueboard_60/keymaps/default_aek/keymap.c b/keyboards/clueboard/60/keymaps/default_aek/keymap.c
similarity index 100%
rename from keyboards/clueboard_60/keymaps/default_aek/keymap.c
rename to keyboards/clueboard/60/keymaps/default_aek/keymap.c
diff --git a/keyboards/clueboard_60/keymaps/default_aek/readme.md b/keyboards/clueboard/60/keymaps/default_aek/readme.md
similarity index 100%
rename from keyboards/clueboard_60/keymaps/default_aek/readme.md
rename to keyboards/clueboard/60/keymaps/default_aek/readme.md
diff --git a/keyboards/clueboard_60/led.c b/keyboards/clueboard/60/led.c
similarity index 100%
rename from keyboards/clueboard_60/led.c
rename to keyboards/clueboard/60/led.c
diff --git a/keyboards/clueboard_60/matrix.c b/keyboards/clueboard/60/matrix.c
similarity index 100%
rename from keyboards/clueboard_60/matrix.c
rename to keyboards/clueboard/60/matrix.c
diff --git a/keyboards/clueboard_60/mcuconf.h b/keyboards/clueboard/60/mcuconf.h
similarity index 100%
rename from keyboards/clueboard_60/mcuconf.h
rename to keyboards/clueboard/60/mcuconf.h
diff --git a/keyboards/clueboard_60/readme.md b/keyboards/clueboard/60/readme.md
similarity index 92%
rename from keyboards/clueboard_60/readme.md
rename to keyboards/clueboard/60/readme.md
index 7221c82039..b81d70d0c3 100644
--- a/keyboards/clueboard_60/readme.md
+++ b/keyboards/clueboard/60/readme.md
@@ -9,6 +9,6 @@ A fully customizable 60% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make clueboard_60:default:dfu-util
+    make clueboard/60: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.
diff --git a/keyboards/clueboard_60/rules.mk b/keyboards/clueboard/60/rules.mk
similarity index 100%
rename from keyboards/clueboard_60/rules.mk
rename to keyboards/clueboard/60/rules.mk
diff --git a/keyboards/clueboard_66/clueboard_66.c b/keyboards/clueboard/66/clueboard_66.c
similarity index 100%
rename from keyboards/clueboard_66/clueboard_66.c
rename to keyboards/clueboard/66/clueboard_66.c
diff --git a/keyboards/clueboard_66/clueboard_66.h b/keyboards/clueboard/66/clueboard_66.h
similarity index 100%
rename from keyboards/clueboard_66/clueboard_66.h
rename to keyboards/clueboard/66/clueboard_66.h
diff --git a/keyboards/clueboard_66/config.h b/keyboards/clueboard/66/config.h
similarity index 96%
rename from keyboards/clueboard_66/config.h
rename to keyboards/clueboard/66/config.h
index eaf3e073fb..dff5c96d0f 100644
--- a/keyboards/clueboard_66/config.h
+++ b/keyboards/clueboard/66/config.h
@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef CLUEBOARD_66_CONFIG_H
+#define CLUEBOARD_66_CONFIG_H
 
 #include "config_common.h"
 
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/Makefile b/keyboards/clueboard/66/keymaps/bloodlvst/Makefile
similarity index 100%
rename from keyboards/clueboard_66/keymaps/bloodlvst/Makefile
rename to keyboards/clueboard/66/keymaps/bloodlvst/Makefile
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/config.h b/keyboards/clueboard/66/keymaps/bloodlvst/config.h
similarity index 100%
rename from keyboards/clueboard_66/keymaps/bloodlvst/config.h
rename to keyboards/clueboard/66/keymaps/bloodlvst/config.h
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/keymap.c b/keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/bloodlvst/keymap.c
rename to keyboards/clueboard/66/keymaps/bloodlvst/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/readme.md b/keyboards/clueboard/66/keymaps/bloodlvst/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/bloodlvst/readme.md
rename to keyboards/clueboard/66/keymaps/bloodlvst/readme.md
diff --git a/keyboards/clueboard_66/keymaps/bloodlvst/rules.mk b/keyboards/clueboard/66/keymaps/bloodlvst/rules.mk
similarity index 100%
rename from keyboards/clueboard_66/keymaps/bloodlvst/rules.mk
rename to keyboards/clueboard/66/keymaps/bloodlvst/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/caps_fn/keymap.c b/keyboards/clueboard/66/keymaps/caps_fn/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/caps_fn/keymap.c
rename to keyboards/clueboard/66/keymaps/caps_fn/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/caps_fn/readme.md b/keyboards/clueboard/66/keymaps/caps_fn/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/caps_fn/readme.md
rename to keyboards/clueboard/66/keymaps/caps_fn/readme.md
diff --git a/keyboards/clueboard_66/keymaps/colemak/keymap.c b/keyboards/clueboard/66/keymaps/colemak/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/colemak/keymap.c
rename to keyboards/clueboard/66/keymaps/colemak/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/default/keymap.c b/keyboards/clueboard/66/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/default/keymap.c
rename to keyboards/clueboard/66/keymaps/default/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/default/readme.md b/keyboards/clueboard/66/keymaps/default/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/default/readme.md
rename to keyboards/clueboard/66/keymaps/default/readme.md
diff --git a/keyboards/clueboard_66/keymaps/jokrik/keymap.c b/keyboards/clueboard/66/keymaps/jokrik/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/jokrik/keymap.c
rename to keyboards/clueboard/66/keymaps/jokrik/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/jokrik/readme.md b/keyboards/clueboard/66/keymaps/jokrik/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/jokrik/readme.md
rename to keyboards/clueboard/66/keymaps/jokrik/readme.md
diff --git a/keyboards/clueboard_66/keymaps/mac_optimized/keymap.c b/keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/mac_optimized/keymap.c
rename to keyboards/clueboard/66/keymaps/mac_optimized/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/mac_optimized/readme.md b/keyboards/clueboard/66/keymaps/mac_optimized/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/mac_optimized/readme.md
rename to keyboards/clueboard/66/keymaps/mac_optimized/readme.md
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/Makefile b/keyboards/clueboard/66/keymaps/magicmonty/Makefile
similarity index 100%
rename from keyboards/clueboard_66/keymaps/magicmonty/Makefile
rename to keyboards/clueboard/66/keymaps/magicmonty/Makefile
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/config.h b/keyboards/clueboard/66/keymaps/magicmonty/config.h
similarity index 100%
rename from keyboards/clueboard_66/keymaps/magicmonty/config.h
rename to keyboards/clueboard/66/keymaps/magicmonty/config.h
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/keymap.c b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/magicmonty/keymap.c
rename to keyboards/clueboard/66/keymaps/magicmonty/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/readme.md b/keyboards/clueboard/66/keymaps/magicmonty/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/magicmonty/readme.md
rename to keyboards/clueboard/66/keymaps/magicmonty/readme.md
diff --git a/keyboards/clueboard_66/keymaps/magicmonty/rules.mk b/keyboards/clueboard/66/keymaps/magicmonty/rules.mk
similarity index 100%
rename from keyboards/clueboard_66/keymaps/magicmonty/rules.mk
rename to keyboards/clueboard/66/keymaps/magicmonty/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/maximised/keymap.c b/keyboards/clueboard/66/keymaps/maximised/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/maximised/keymap.c
rename to keyboards/clueboard/66/keymaps/maximised/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/maximised/readme.md b/keyboards/clueboard/66/keymaps/maximised/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/maximised/readme.md
rename to keyboards/clueboard/66/keymaps/maximised/readme.md
diff --git a/keyboards/clueboard_66/keymaps/mouse_keys/Makefile b/keyboards/clueboard/66/keymaps/mouse_keys/Makefile
similarity index 100%
rename from keyboards/clueboard_66/keymaps/mouse_keys/Makefile
rename to keyboards/clueboard/66/keymaps/mouse_keys/Makefile
diff --git a/keyboards/clueboard_66/keymaps/mouse_keys/keymap.c b/keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/mouse_keys/keymap.c
rename to keyboards/clueboard/66/keymaps/mouse_keys/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/mouse_keys/readme.md b/keyboards/clueboard/66/keymaps/mouse_keys/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/mouse_keys/readme.md
rename to keyboards/clueboard/66/keymaps/mouse_keys/readme.md
diff --git a/keyboards/clueboard_66/keymaps/mouse_keys/rules.mk b/keyboards/clueboard/66/keymaps/mouse_keys/rules.mk
similarity index 100%
rename from keyboards/clueboard_66/keymaps/mouse_keys/rules.mk
rename to keyboards/clueboard/66/keymaps/mouse_keys/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/serubin/Makefile b/keyboards/clueboard/66/keymaps/serubin/Makefile
similarity index 100%
rename from keyboards/clueboard_66/keymaps/serubin/Makefile
rename to keyboards/clueboard/66/keymaps/serubin/Makefile
diff --git a/keyboards/clueboard_66/keymaps/serubin/keymap.c b/keyboards/clueboard/66/keymaps/serubin/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/serubin/keymap.c
rename to keyboards/clueboard/66/keymaps/serubin/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/serubin/readme.md b/keyboards/clueboard/66/keymaps/serubin/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/serubin/readme.md
rename to keyboards/clueboard/66/keymaps/serubin/readme.md
diff --git a/keyboards/clueboard_66/keymaps/serubin/rules.mk b/keyboards/clueboard/66/keymaps/serubin/rules.mk
similarity index 100%
rename from keyboards/clueboard_66/keymaps/serubin/rules.mk
rename to keyboards/clueboard/66/keymaps/serubin/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/shift_fn/keymap.c b/keyboards/clueboard/66/keymaps/shift_fn/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/shift_fn/keymap.c
rename to keyboards/clueboard/66/keymaps/shift_fn/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/shift_fn/readme.md b/keyboards/clueboard/66/keymaps/shift_fn/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/shift_fn/readme.md
rename to keyboards/clueboard/66/keymaps/shift_fn/readme.md
diff --git a/keyboards/clueboard_66/keymaps/skully/keymap.c b/keyboards/clueboard/66/keymaps/skully/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/skully/keymap.c
rename to keyboards/clueboard/66/keymaps/skully/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/skully/readme.md b/keyboards/clueboard/66/keymaps/skully/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/skully/readme.md
rename to keyboards/clueboard/66/keymaps/skully/readme.md
diff --git a/keyboards/clueboard_66/keymaps/smt/keymap.c b/keyboards/clueboard/66/keymaps/smt/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/smt/keymap.c
rename to keyboards/clueboard/66/keymaps/smt/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/smt/readme.md b/keyboards/clueboard/66/keymaps/smt/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/smt/readme.md
rename to keyboards/clueboard/66/keymaps/smt/readme.md
diff --git a/keyboards/clueboard_66/keymaps/tetris/Makefile b/keyboards/clueboard/66/keymaps/tetris/Makefile
similarity index 100%
rename from keyboards/clueboard_66/keymaps/tetris/Makefile
rename to keyboards/clueboard/66/keymaps/tetris/Makefile
diff --git a/keyboards/clueboard_66/keymaps/tetris/keymap.c b/keyboards/clueboard/66/keymaps/tetris/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/tetris/keymap.c
rename to keyboards/clueboard/66/keymaps/tetris/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/tetris/readme.md b/keyboards/clueboard/66/keymaps/tetris/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/tetris/readme.md
rename to keyboards/clueboard/66/keymaps/tetris/readme.md
diff --git a/keyboards/clueboard_66/keymaps/tetris/rules.mk b/keyboards/clueboard/66/keymaps/tetris/rules.mk
similarity index 100%
rename from keyboards/clueboard_66/keymaps/tetris/rules.mk
rename to keyboards/clueboard/66/keymaps/tetris/rules.mk
diff --git a/keyboards/clueboard_66/keymaps/tetris/tetris_text.c b/keyboards/clueboard/66/keymaps/tetris/tetris_text.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/tetris/tetris_text.c
rename to keyboards/clueboard/66/keymaps/tetris/tetris_text.c
diff --git a/keyboards/clueboard_66/keymaps/tetris/tetris_text.h b/keyboards/clueboard/66/keymaps/tetris/tetris_text.h
similarity index 100%
rename from keyboards/clueboard_66/keymaps/tetris/tetris_text.h
rename to keyboards/clueboard/66/keymaps/tetris/tetris_text.h
diff --git a/keyboards/clueboard_66/keymaps/unix_optimized/keymap.c b/keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/unix_optimized/keymap.c
rename to keyboards/clueboard/66/keymaps/unix_optimized/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/unix_optimized/readme.md b/keyboards/clueboard/66/keymaps/unix_optimized/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/unix_optimized/readme.md
rename to keyboards/clueboard/66/keymaps/unix_optimized/readme.md
diff --git a/keyboards/clueboard_66/keymaps/win_optimized/keymap.c b/keyboards/clueboard/66/keymaps/win_optimized/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/win_optimized/keymap.c
rename to keyboards/clueboard/66/keymaps/win_optimized/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/win_optimized/readme.md b/keyboards/clueboard/66/keymaps/win_optimized/readme.md
similarity index 100%
rename from keyboards/clueboard_66/keymaps/win_optimized/readme.md
rename to keyboards/clueboard/66/keymaps/win_optimized/readme.md
diff --git a/keyboards/clueboard_66/keymaps/xyverz/Makefile b/keyboards/clueboard/66/keymaps/xyverz/Makefile
similarity index 100%
rename from keyboards/clueboard_66/keymaps/xyverz/Makefile
rename to keyboards/clueboard/66/keymaps/xyverz/Makefile
diff --git a/keyboards/clueboard_66/keymaps/xyverz/keymap.c b/keyboards/clueboard/66/keymaps/xyverz/keymap.c
similarity index 100%
rename from keyboards/clueboard_66/keymaps/xyverz/keymap.c
rename to keyboards/clueboard/66/keymaps/xyverz/keymap.c
diff --git a/keyboards/clueboard_66/keymaps/xyverz/rules.mk b/keyboards/clueboard/66/keymaps/xyverz/rules.mk
similarity index 100%
rename from keyboards/clueboard_66/keymaps/xyverz/rules.mk
rename to keyboards/clueboard/66/keymaps/xyverz/rules.mk
diff --git a/keyboards/clueboard_66/readme.md b/keyboards/clueboard/66/readme.md
similarity index 95%
rename from keyboards/clueboard_66/readme.md
rename to keyboards/clueboard/66/readme.md
index c2423096ec..ad14ae9d69 100644
--- a/keyboards/clueboard_66/readme.md
+++ b/keyboards/clueboard/66/readme.md
@@ -13,6 +13,6 @@ A fully customizable 66% keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make clueboard/rev3:default
+    make clueboard/66: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.
diff --git a/keyboards/clueboard_66/rev1/config.h b/keyboards/clueboard/66/rev1/config.h
similarity index 91%
rename from keyboards/clueboard_66/rev1/config.h
rename to keyboards/clueboard/66/rev1/config.h
index 519e4d3ecb..210718d560 100644
--- a/keyboards/clueboard_66/rev1/config.h
+++ b/keyboards/clueboard/66/rev1/config.h
@@ -1,5 +1,5 @@
-#ifndef REV2_CONFIG_H
-#define REV2_CONFIG_H
+#ifndef CLUEBOARD_66_REV1_CONFIG_H
+#define CLUEBOARD_66_REV1_CONFIG_H
 
 #include "config_common.h"
 
@@ -33,4 +33,4 @@
 #define RGBLIGHT_VAL_STEP 17
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/clueboard_66/rev1/rev1.c b/keyboards/clueboard/66/rev1/rev1.c
similarity index 100%
rename from keyboards/clueboard_66/rev1/rev1.c
rename to keyboards/clueboard/66/rev1/rev1.c
diff --git a/keyboards/clueboard_66/rev1/rev1.h b/keyboards/clueboard/66/rev1/rev1.h
similarity index 100%
rename from keyboards/clueboard_66/rev1/rev1.h
rename to keyboards/clueboard/66/rev1/rev1.h
diff --git a/keyboards/clueboard_66/rev1/rules.mk b/keyboards/clueboard/66/rev1/rules.mk
similarity index 100%
rename from keyboards/clueboard_66/rev1/rules.mk
rename to keyboards/clueboard/66/rev1/rules.mk
diff --git a/keyboards/clueboard_66/rev2/config.h b/keyboards/clueboard/66/rev2/config.h
similarity index 94%
rename from keyboards/clueboard_66/rev2/config.h
rename to keyboards/clueboard/66/rev2/config.h
index 3c96f79870..6ab2b1127d 100644
--- a/keyboards/clueboard_66/rev2/config.h
+++ b/keyboards/clueboard/66/rev2/config.h
@@ -1,5 +1,5 @@
-#ifndef REV2_CONFIG_H
-#define REV2_CONFIG_H
+#ifndef CLUEBOARD_66_REV2_CONFIG_H
+#define CLUEBOARD_66_REV2_CONFIG_H
 
 #include "config_common.h"
 
diff --git a/keyboards/clueboard_66/rev2/rev2.c b/keyboards/clueboard/66/rev2/rev2.c
similarity index 100%
rename from keyboards/clueboard_66/rev2/rev2.c
rename to keyboards/clueboard/66/rev2/rev2.c
diff --git a/keyboards/clueboard_66/rev2/rev2.h b/keyboards/clueboard/66/rev2/rev2.h
similarity index 100%
rename from keyboards/clueboard_66/rev2/rev2.h
rename to keyboards/clueboard/66/rev2/rev2.h
diff --git a/keyboards/clueboard_66/rev2/rules.mk b/keyboards/clueboard/66/rev2/rules.mk
similarity index 100%
rename from keyboards/clueboard_66/rev2/rules.mk
rename to keyboards/clueboard/66/rev2/rules.mk
diff --git a/keyboards/clueboard_66/rev3/config.h b/keyboards/clueboard/66/rev3/config.h
similarity index 94%
rename from keyboards/clueboard_66/rev3/config.h
rename to keyboards/clueboard/66/rev3/config.h
index 513dc11696..218736a889 100644
--- a/keyboards/clueboard_66/rev3/config.h
+++ b/keyboards/clueboard/66/rev3/config.h
@@ -1,5 +1,5 @@
-#ifndef REV3_CONFIG_H
-#define REV3_CONFIG_H
+#ifndef CLUEBOARD_66_REV3_CONFIG_H
+#define CLUEBOARD_66_REV3_CONFIG_H
 
 #include "config_common.h"
 
diff --git a/keyboards/clueboard_66/rev3/rev3.c b/keyboards/clueboard/66/rev3/rev3.c
similarity index 100%
rename from keyboards/clueboard_66/rev3/rev3.c
rename to keyboards/clueboard/66/rev3/rev3.c
diff --git a/keyboards/clueboard_66/rev3/rev3.h b/keyboards/clueboard/66/rev3/rev3.h
similarity index 100%
rename from keyboards/clueboard_66/rev3/rev3.h
rename to keyboards/clueboard/66/rev3/rev3.h
diff --git a/keyboards/clueboard_66/rev3/rules.mk b/keyboards/clueboard/66/rev3/rules.mk
similarity index 100%
rename from keyboards/clueboard_66/rev3/rules.mk
rename to keyboards/clueboard/66/rev3/rules.mk
diff --git a/keyboards/clueboard_66/rules.mk b/keyboards/clueboard/66/rules.mk
similarity index 95%
rename from keyboards/clueboard_66/rules.mk
rename to keyboards/clueboard/66/rules.mk
index abab3bd5b7..d5d8ea0d20 100644
--- a/keyboards/clueboard_66/rules.mk
+++ b/keyboards/clueboard/66/rules.mk
@@ -1,3 +1,4 @@
+DEFAULT_FOLDER = clueboard/66/rev2
 MCU = atmega32u4
 F_CPU = 16000000
 ARCH = AVR8
@@ -19,5 +20,3 @@ RGBLIGHT_ENABLE = yes  # Enable keyboard underlight functionality
 MIDI_ENABLE = no 		# MIDI controls
 UNICODE_ENABLE = no 		# Unicode
 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-
-DEFAULT_FOLDER = clueboard_66/rev2
diff --git a/keyboards/cluecard/cluecard.c b/keyboards/clueboard/card/cluecard.c
similarity index 100%
rename from keyboards/cluecard/cluecard.c
rename to keyboards/clueboard/card/cluecard.c
diff --git a/keyboards/cluecard/cluecard.h b/keyboards/clueboard/card/cluecard.h
similarity index 100%
rename from keyboards/cluecard/cluecard.h
rename to keyboards/clueboard/card/cluecard.h
diff --git a/keyboards/cluecard/config.h b/keyboards/clueboard/card/config.h
similarity index 100%
rename from keyboards/cluecard/config.h
rename to keyboards/clueboard/card/config.h
diff --git a/keyboards/cluecard/keymaps/default/config.h b/keyboards/clueboard/card/keymaps/default/config.h
similarity index 100%
rename from keyboards/cluecard/keymaps/default/config.h
rename to keyboards/clueboard/card/keymaps/default/config.h
diff --git a/keyboards/cluecard/keymaps/default/keymap.c b/keyboards/clueboard/card/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/cluecard/keymaps/default/keymap.c
rename to keyboards/clueboard/card/keymaps/default/keymap.c
diff --git a/keyboards/clueboard/card/keymaps/default/readme.md b/keyboards/clueboard/card/keymaps/default/readme.md
new file mode 100644
index 0000000000..53ba902536
--- /dev/null
+++ b/keyboards/clueboard/card/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# The default keymap for cluecard
+
+Note that this keymap has audio enabled, so the RGB mode button does not go through the different effects.  So the LEDs will still show a static light, that is configurable with the hue, staturation and brightness buttons. You can of course also turn them on and off with the on/off button.
diff --git a/keyboards/cluecard/keymaps/default/rules.mk b/keyboards/clueboard/card/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/cluecard/keymaps/default/rules.mk
rename to keyboards/clueboard/card/keymaps/default/rules.mk
diff --git a/keyboards/cluecard/keymaps/rgb_effects/config.h b/keyboards/clueboard/card/keymaps/rgb_effects/config.h
similarity index 100%
rename from keyboards/cluecard/keymaps/rgb_effects/config.h
rename to keyboards/clueboard/card/keymaps/rgb_effects/config.h
diff --git a/keyboards/cluecard/keymaps/rgb_effects/keymap.c b/keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
similarity index 100%
rename from keyboards/cluecard/keymaps/rgb_effects/keymap.c
rename to keyboards/clueboard/card/keymaps/rgb_effects/keymap.c
diff --git a/keyboards/cluecard/keymaps/rgb_effects/readme.md b/keyboards/clueboard/card/keymaps/rgb_effects/readme.md
similarity index 53%
rename from keyboards/cluecard/keymaps/rgb_effects/readme.md
rename to keyboards/clueboard/card/keymaps/rgb_effects/readme.md
index 949cac394e..f99dcebf0c 100644
--- a/keyboards/cluecard/keymaps/rgb_effects/readme.md
+++ b/keyboards/clueboard/card/keymaps/rgb_effects/readme.md
@@ -1,7 +1,5 @@
 # RGB effect test keymap for cluecard
 
-This keymap is made for testing the RGB effects. Audio is disabled and the mode buttons goes through each
-effect. If you run HID-listen you will be able to see which effect is active. For a list of effects, check
-the `rgblight.c` file.
+This keymap is made for testing the RGB effects. Audio is disabled and the mode buttons goes through each effect. If you run HID-listen you will be able to see which effect is active. For a list of effects, check the `rgblight.c` file.
 
 The hue, saturation and brightness buttons will work depending on which effect is active.
diff --git a/keyboards/cluecard/keymaps/rgb_effects/rules.mk b/keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
similarity index 100%
rename from keyboards/cluecard/keymaps/rgb_effects/rules.mk
rename to keyboards/clueboard/card/keymaps/rgb_effects/rules.mk
diff --git a/keyboards/cluecard/readme.md b/keyboards/clueboard/card/readme.md
similarity index 93%
rename from keyboards/cluecard/readme.md
rename to keyboards/clueboard/card/readme.md
index 589eb57f37..27089d465b 100644
--- a/keyboards/cluecard/readme.md
+++ b/keyboards/clueboard/card/readme.md
@@ -8,6 +8,6 @@ A simple QMK dev kit.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make cluecard:default
+    make clueboard/card: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.
diff --git a/keyboards/cluecard/rules.mk b/keyboards/clueboard/card/rules.mk
similarity index 100%
rename from keyboards/cluecard/rules.mk
rename to keyboards/clueboard/card/rules.mk
diff --git a/keyboards/clueboard/readme.md b/keyboards/clueboard/readme.md
new file mode 100644
index 0000000000..5dfa1e3537
--- /dev/null
+++ b/keyboards/clueboard/readme.md
@@ -0,0 +1,13 @@
+# Clueboard
+
+![Clueboard Logo](https://static1.squarespace.com/static/55c13bdee4b099be5dcb82eb/t/59c9703318b27d1ab34f40df/1508257572555/)
+
+Clueboard makes fully customizable custom keyboards in a variety of formfactors. Inside this directory you'll find support for the entire line of Clueboard products.
+
+* Maintainer: [Zach White](https://github.com/skullydazed)
+* Hardware Supported:
+  * [`17`](17/): Clueboard "Cluepad" PCB
+  * [`60`](60/): Clueboard 60% PCB
+  * [`66`](66/): Clueboard 66% PCB
+  * [`card`](card/): Special Cluecard PCB
+* Hardware Availability: [clueboard.co](https://clueboard.co/)
diff --git a/keyboards/cluecard/keymaps/default/readme.md b/keyboards/cluecard/keymaps/default/readme.md
deleted file mode 100644
index fa4e8ccad4..0000000000
--- a/keyboards/cluecard/keymaps/default/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The default keymap for cluecard
-
-Note that this keymap has audio enabled, so the RGB mode button does not go through the different effects. 
-So the LEDs will still show a static light, that is configurable with the hue, staturation and brightness
-buttons. You can of course also turn them on and off with the on/off button.