114 files changed, 4005 insertions, 103 deletions

diff --git a/keyboards/clueboard/clueboard.c b/keyboards/clueboard/clueboard.c
deleted file mode 100644
index 3435202ba1..0000000000
--- a/keyboards/clueboard/clueboard.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "clueboard.h"
diff --git a/keyboards/clueboard_17/Makefile b/keyboards/clueboard_17/Makefile
new file mode 100644
index 0000000000..4e2a6f00fd
--- /dev/null
+++ b/keyboards/clueboard_17/Makefile
@@ -0,0 +1,3 @@
+ifndef MAKEFILE_INCLUDED
+	include ../../Makefile
+endif
\ No newline at end of file
diff --git a/keyboards/cluepad/cluepad.c b/keyboards/clueboard_17/clueboard_17.c
index 1867b617fd..04cc812178 100644
--- a/keyboards/cluepad/cluepad.c
+++ b/keyboards/clueboard_17/clueboard_17.c
@@ -1,4 +1,4 @@
-#include "cluepad.h"
+#include "clueboard_17.h"
 
 int pwm_level;
 
diff --git a/keyboards/cluepad/cluepad.h b/keyboards/clueboard_17/clueboard_17.h
index 5e4a5999e2..5e4a5999e2 100644
--- a/keyboards/cluepad/cluepad.h
+++ b/keyboards/clueboard_17/clueboard_17.h
diff --git a/keyboards/cluepad/config.h b/keyboards/clueboard_17/config.h
index bd64dfd27d..bd64dfd27d 100644
--- a/keyboards/cluepad/config.h
+++ b/keyboards/clueboard_17/config.h
diff --git a/keyboards/cluepad/keymaps/default/keymap.c b/keyboards/clueboard_17/keymaps/default/keymap.c
index 66827fe48b..7a0d518515 100644
--- a/keyboards/cluepad/keymaps/default/keymap.c
+++ b/keyboards/clueboard_17/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "cluepad.h"
+#include "clueboard_17.h"
 
 #include "backlight.h"
 
diff --git a/keyboards/cluepad/readme.md b/keyboards/clueboard_17/readme.md
index f79d6b5594..f79d6b5594 100644
--- a/keyboards/cluepad/readme.md
+++ b/keyboards/clueboard_17/readme.md
diff --git a/keyboards/cluepad/rules.mk b/keyboards/clueboard_17/rules.mk
index 264aba044d..264aba044d 100644
--- a/keyboards/cluepad/rules.mk
+++ b/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
new file mode 100644
index 0000000000..897f20a887
--- /dev/null
+++ b/keyboards/clueboard_60/boards/GENERIC_STM32_F303XC/board.c
@@ -0,0 +1,124 @@
+/*
+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific l