11 files changed, 15 insertions, 28 deletions
diff --git a/keyboards/orthodox/config.h b/keyboards/orthodox/config.h
index b1a5b9cf9c..821cd7e29f 100644
--- a/keyboards/orthodox/config.h
+++ b/keyboards/orthodox/config.h
@@ -23,9 +23,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define CONFIG_H
 
 #include "config_common.h"
-
-#ifdef SUBPROJECT_rev1
-    #include "rev1/config.h"
-#endif
-
+    
 #endif
diff --git a/keyboards/orthodox/keymaps/default/config.h b/keyboards/orthodox/keymaps/default/config.h
index f24c6db290..c2892b5e0c 100644
--- a/keyboards/orthodox/keymaps/default/config.h
+++ b/keyboards/orthodox/keymaps/default/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include "config_common.h"
 
 /* Use I2C or Serial, not both */
 
diff --git a/keyboards/orthodox/keymaps/default/rules.mk b/keyboards/orthodox/keymaps/default/rules.mk
index 457a3d01d4..e69de29bb2 100644
--- a/keyboards/orthodox/keymaps/default/rules.mk
+++ b/keyboards/orthodox/keymaps/default/rules.mk
@@ -1,3 +0,0 @@
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/orthodox/keymaps/drashna/config.h b/keyboards/orthodox/keymaps/drashna/config.h
index 7cbbf1025a..bcd14a22d1 100644
--- a/keyboards/orthodox/keymaps/drashna/config.h
+++ b/keyboards/orthodox/keymaps/drashna/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include "config_common.h"
 
 /* Use I2C or Serial, not both */
 
diff --git a/keyboards/orthodox/keymaps/drashna/rules.mk b/keyboards/orthodox/keymaps/drashna/rules.mk
index e252a90449..2090afe9a5 100644
--- a/keyboards/orthodox/keymaps/drashna/rules.mk
+++ b/keyboards/orthodox/keymaps/drashna/rules.mk
@@ -1,6 +1,2 @@
 CONSOLE_ENABLE    = yes
-TAP_DANCE_ENABLE  = yes
-
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+TAP_DANCE_ENABLE  = yes
+\ No newline at end of file
diff --git a/keyboards/orthodox/orthodox.h b/keyboards/orthodox/orthodox.h
index b33356e5e5..89707467a6 100644
--- a/keyboards/orthodox/orthodox.h
+++ b/keyboards/orthodox/orthodox.h
@@ -1,7 +1,7 @@
 #ifndef ORTHODOX_H
 #define ORTHODOX_H
 
-#ifdef SUBPROJECT_rev1
+#ifdef KEYBOARD_orthodox_rev1
     #include "rev1.h"
 #endif
 
diff --git a/keyboards/orthodox/readme.md b/keyboards/orthodox/readme.md
index e1fbf94baf..fb591b0070 100644
--- a/keyboards/orthodox/readme.md
+++ b/keyboards/orthodox/readme.md
@@ -34,10 +34,10 @@ For further reading on build- and flashing-procedures for split ortholinear skel
 
 ## First Time Setup
 
-Download or clone the whole firmware and navigate to the keyboards/orthodox directory. Once your dev env is setup, you'll be able to generate the default .hex using:
+Download or clone the whole firmware and navigate to the root directory. Once your dev env is setup, you'll be able to generate the default .hex using:
 
 ```
-$ make rev1-default
+$ make orthodox/rev1:default
 ```
 
 You will see a lot of output and if everything worked correctly you will see the built hex files in your *root qmk_firmware directory* two levels up:
@@ -50,7 +50,7 @@ If you would like to use one of the alternative keymaps, or create your own, cop
 
 
 ```
-$ make rev1-YOUR_KEYMAP_NAME
+$ make orthodox/rev1:YOUR_KEYMAP_NAME
 ```
 
 If everything worked correctly you will see a file:
@@ -96,8 +96,8 @@ the two halves, i.e. if your split keyboard has 3 rows in each half, then
 
 Flashing
 -------
-From the `orthodox` directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing.
-Example: `make rev2-default-avrdude`
+From the root directory run `make PROJECT:KEYMAP:avrdude` for automatic serial port resolution and flashing.
+Example: `make orthodox/rev2:default:avrdude`
 
 
 Choosing which board to plug the USB cable into (choosing Master)
diff --git a/keyboards/orthodox/rev1/config.h b/keyboards/orthodox/rev1/config.h
index 05f043b4c7..26715f4096 100644
--- a/keyboards/orthodox/rev1/config.h
+++ b/keyboards/orthodox/rev1/config.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef REV1_CONFIG_H
 #define REV1_CONFIG_H
 
-#include "../config.h"
+#include "config_common.h"
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
diff --git a/keyboards/orthodox/rev1/rev1.h b/keyboards/orthodox/rev1/rev1.h
index 06282b2349..ceaaaed287 100644
--- a/keyboards/orthodox/rev1/rev1.h
+++ b/keyboards/orthodox/rev1/rev1.h
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef REV1_H
 #define REV1_H
 
-#include "../orthodox.h"
+#include "orthodox.h"
 
 //void promicro_bootloader_jmp(bool program);
 #include "quantum.h"
diff --git a/keyboards/orthodox/rev1/rules.mk b/keyboards/orthodox/rev1/rules.mk
index a0825b4ef6..f845616741 100644
--- a/keyboards/orthodox/rev1/rules.mk
+++ b/keyboards/orthodox/rev1/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
-\ No newline at end of file
+BACKLIGHT_ENABLE = no
+\ No newline at end of file
diff --git a/keyboards/orthodox/rules.mk b/keyboards/orthodox/rules.mk
index 3f40ff2f82..48d6551bc7 100644
--- a/keyboards/orthodox/rules.mk
+++ b/keyboards/orthodox/rules.mk
@@ -73,3 +73,5 @@ USE_I2C = yes
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
+
+DEFAULT_FOLDER = orthodox/rev1