13 files changed, 13 insertions, 34 deletions
diff --git a/keyboards/clueboard_66/Makefile b/keyboards/clueboard_66/Makefile
deleted file mode 100644
index b9bada8f8..000000000
--- a/keyboards/clueboard_66/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBPROJECT_DEFAULT = rev2
-
-ifndef MAKEFILE_INCLUDED
-	include ../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/clueboard_66/clueboard_66.h b/keyboards/clueboard_66/clueboard_66.h
index 295a596d5..c8989983d 100644
--- a/keyboards/clueboard_66/clueboard_66.h
+++ b/keyboards/clueboard_66/clueboard_66.h
@@ -1,16 +1,16 @@
 #ifndef CLUEBOARD_H
 #define CLUEBOARD_H
 
-#ifdef SUBPROJECT_rev1
+#include "quantum.h"
+
+#ifdef KEYBOARD_clueboard_66_rev1
     #include "rev1.h"
 #endif
-#ifdef SUBPROJECT_rev2
+#ifdef KEYBOARD_clueboard_66_rev2
     #include "rev2.h"
 #endif
-#ifdef SUBPROJECT_rev3
+#ifdef KEYBOARD_clueboard_66_rev3
     #include "rev3.h"
 #endif
 
-#include "quantum.h"
-
 #endif
diff --git a/keyboards/clueboard_66/config.h b/keyboards/clueboard_66/config.h
index 0d4e6a874..eaf3e073f 100644
--- a/keyboards/clueboard_66/config.h
+++ b/keyboards/clueboard_66/config.h
@@ -60,15 +60,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
-
-#ifdef SUBPROJECT_rev1
-    #include "rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev3
-    #include "rev3/config.h"
-#endif
-
 #endif
diff --git a/keyboards/clueboard_66/readme.md b/keyboards/clueboard_66/readme.md
index 13859bc24..c2423096e 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/rev3: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/Makefile b/keyboards/clueboard_66/rev1/Makefile
deleted file mode 100644
index 191c6bb66..000000000
--- a/keyboards/clueboard_66/rev1/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifndef MAKEFILE_INCLUDED
-	include ../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/clueboard_66/rev1/config.h b/keyboards/clueboard_66/rev1/config.h
index f40876ffb..519e4d3ec 100644
--- a/keyboards/clueboard_66/rev1/config.h
+++ b/keyboards/clueboard_66/rev1/config.h
@@ -1,7 +1,7 @@
 #ifndef REV2_CONFIG_H
 #define REV2_CONFIG_H
 
-#include "../config.h"
+#include "config_common.h"
 
 #define PRODUCT_ID      0x2301
 #define DEVICE_VER      0x0003
diff --git a/keyboards/clueboard_66/rev2/Makefile b/keyboards/clueboard_66/rev2/Makefile
deleted file mode 100644
index 191c6bb66..000000000
--- a/keyboards/clueboard_66/rev2/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-ifndef MAKEFILE_INCLUDED
-	include ../../../Makefile
-endif
-\ No newline at end of file
diff --git a/keyboards/clueboard_66/rev2/config.h b/keyboards/clueboard_66/rev2/config.h
index bc34fc07b..3c22c5b4a 100644
--- a/keyboards/clueboard_66/rev2/config.h
+++ b/keyboards/clueboard_66/rev2/config.h
@@ -1,7 +1,7 @@
 #ifndef REV2_CONFIG_H
 #define REV2_CONFIG_H
 
-#include "../config.h"
+#include "config_common.h"
 
 #define PRODUCT_ID      0x2320
 #define DEVICE_VER      0x0001
diff --git a/keyboards/clueboard_66/rev2/rev2.h b/keyboards/clueboard_66/rev2/rev2.h
index 75015ec02..da7ce500f 100644
--- a/keyboards/clueboard_66/rev2/rev2.h
+++ b/keyboards/clueboard_66/rev2/rev2.h
@@ -1,7 +1,7 @@
 #ifndef REV2_H
 #define REV2_H
 
-#include "../clueboard_66.h"
+#include "clueboard_66.h"
 
 /* Clueboard matrix layout
  * ,-----------------------------------------------------------.  ,---.
diff --git a/keyboards/clueboard_66/rev3/config.h b/keyboards/clueboard_66/rev3/config.h
index cd12db22e..5e645c78f 100644
--- a/keyboards/clueboard_66/rev3/config.h
+++ b/keyboards/clueboard_66/rev3/config.h
@@ -1,7 +1,7 @@
 #ifndef REV3_CONFIG_H
 #define REV3_CONFIG_H
 
-#include "../config.h"
+#include "config_common.h"
 
 #define PRODUCT_ID      0x2370
 #define DEVICE_VER      0x0001
diff --git a/keyboards/clueboard_66/rev3/rev3.h b/keyboards/clueboard_66/rev3/rev3.h
index fd6f98344..7fd243c80 100644
--- a/keyboards/clueboard_66/rev3/rev3.h
+++ b/keyboards/clueboard_66/rev3/rev3.h
@@ -1,7 +1,7 @@
 #ifndef REV3_H
 #define REV3_H
 
-#include "../clueboard_66.h"
+#include "clueboard_66.h"
 
 /* Clueboard matrix layout
  * ,-----------------------------------------------------------.  ,---.
diff --git a/keyboards/clueboard_66/rules.mk b/keyboards/clueboard_66/rules.mk
index afbb531a2..abab3bd5b 100644
--- a/keyboards/clueboard_66/rules.mk
+++ b/keyboards/clueboard_66/rules.mk
@@ -19,3 +19,5 @@ 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/clueboard_66/subproject.mk b/keyboards/clueboard_66/subproject.mk
deleted file mode 100644
index 7c9b39598..000000000
--- a/keyboards/clueboard_66/subproject.mk
+++ /dev/null
@@ -1 +0,0 @@
-SUBPROJECT_DEFAULT = rev2