6 files changed, 7 insertions, 13 deletions
diff --git a/keyboards/viterbi/config.h b/keyboards/viterbi/config.h
index 55500df79..863722d7d 100644
--- a/keyboards/viterbi/config.h
+++ b/keyboards/viterbi/config.h
@@ -20,8 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#ifdef SUBPROJECT_rev1
-    #include "rev1/config.h"
-#endif
-
 #endif  // CONFIG_H
diff --git a/keyboards/viterbi/readme.md b/keyboards/viterbi/readme.md
index bc8451ba3..13f3e6056 100644
--- a/keyboards/viterbi/readme.md
+++ b/keyboards/viterbi/readme.md
@@ -9,12 +9,12 @@ Hardware Availability: [Keebio](https://keeb.io)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make viterbi-rev1-default
+    make viterbi/rev1:default
 
 
 Example of flashing this keyboard:
 
-    make viterbi-rev1-default-avrdude
+    make viterbi/rev1: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/viterbi/rev1/config.h b/keyboards/viterbi/rev1/config.h
index d48075198..68ca5f362 100644
--- a/keyboards/viterbi/rev1/config.h
+++ b/keyboards/viterbi/rev1/config.h
@@ -18,7 +18,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       0xCEEB
diff --git a/keyboards/viterbi/rev1/rules.mk b/keyboards/viterbi/rev1/rules.mk
index 80a942d06..f84561674 100644
--- a/keyboards/viterbi/rev1/rules.mk
+++ b/keyboards/viterbi/rev1/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
-	include ../../../Makefile
-endif
+BACKLIGHT_ENABLE = no
+\ No newline at end of file
diff --git a/keyboards/viterbi/rules.mk b/keyboards/viterbi/rules.mk
index 3f40ff2f8..8a1b94013 100644
--- a/keyboards/viterbi/rules.mk
+++ b/keyboards/viterbi/rules.mk
@@ -73,3 +73,5 @@ USE_I2C = yes
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
+
+DEFAULT_FOLDER = viterbi/rev1
+\ No newline at end of file
diff --git a/keyboards/viterbi/viterbi.h b/keyboards/viterbi/viterbi.h
index d3d0f64eb..347423910 100644
--- a/keyboards/viterbi/viterbi.h
+++ b/keyboards/viterbi/viterbi.h
@@ -1,7 +1,7 @@
 #ifndef VITERBI_H
 #define VITERBI_H
 
-#ifdef SUBPROJECT_rev1
+#ifdef KEYBOARD_viterbi_rev1
     #include "rev1.h"
 #endif