18 files changed, 5 insertions, 16 deletions
diff --git a/keyboards/eagle_viper/info.json b/keyboards/duck/eagle_viper/info.json
index f20babdbcf..f20babdbcf 100644
--- a/keyboards/eagle_viper/info.json
+++ b/keyboards/duck/eagle_viper/info.json
diff --git a/keyboards/eagle_viper/readme.md b/keyboards/duck/eagle_viper/readme.md
index 48f4a4be33..ded0fa72e9 100644
--- a/keyboards/eagle_viper/readme.md
+++ b/keyboards/duck/eagle_viper/readme.md
@@ -8,5 +8,5 @@ Newest version is the [Eagle/Viper V2](http://duck0113.tistory.com/127)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make eagle_viper/v2:default
+    make duck/eagle_viper/v2:default
 
diff --git a/keyboards/duck/eagle_viper/rules.mk b/keyboards/duck/eagle_viper/rules.mk
new file mode 100644
index 0000000000..263767d064
--- /dev/null
+++ b/keyboards/duck/eagle_viper/rules.mk
@@ -0,0 +1,3 @@
+DEFAULT_FOLDER = duck/eagle_viper/v2
+
+LAYOUTS = 60_ansi
+\ No newline at end of file
diff --git a/keyboards/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index f04b4a0fd3..f04b4a0fd3 100644
--- a/keyboards/eagle_viper/v2/config.h
+++ b/keyboards/duck/eagle_viper/v2/config.h
diff --git a/keyboards/eagle_viper/v2/indicator_leds.c b/keyboards/duck/eagle_viper/v2/indicator_leds.c
index 03a93197da..03a93197da 100644
--- a/keyboards/eagle_viper/v2/indicator_leds.c
+++ b/keyboards/duck/eagle_viper/v2/indicator_leds.c
diff --git a/keyboards/eagle_viper/v2/indicator_leds.h b/keyboards/duck/eagle_viper/v2/indicator_leds.h
index c174fa404d..c174fa404d 100644
--- a/keyboards/eagle_viper/v2/indicator_leds.h
+++ b/keyboards/duck/eagle_viper/v2/indicator_leds.h
diff --git a/keyboards/eagle_viper/v2/keymaps/default/keymap.c b/keyboards/duck/eagle_viper/v2/keymaps/default/keymap.c
index 332db66e64..332db66e64 100644
--- a/keyboards/eagle_viper/v2/keymaps/default/keymap.c
+++ b/keyboards/duck/eagle_viper/v2/keymaps/default/keymap.c
diff --git a/keyboards/eagle_viper/v2/keymaps/default/readme.md b/keyboards/duck/eagle_viper/v2/keymaps/default/readme.md
index 834ff7cd3a..834ff7cd3a 100644
--- a/keyboards/eagle_viper/v2/keymaps/default/readme.md
+++ b/keyboards/duck/eagle_viper/v2/keymaps/default/readme.md
diff --git a/keyboards/eagle_viper/v2/keymaps/profanum429/keymap.c b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
index a0163ad6aa..a0163ad6aa 100644
--- a/keyboards/eagle_viper/v2/keymaps/profanum429/keymap.c
+++ b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/keymap.c
diff --git a/keyboards/eagle_viper/v2/keymaps/profanum429/readme.md b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/readme.md
index 0f993559ea..0f993559ea 100644
--- a/keyboards/eagle_viper/v2/keymaps/profanum429/readme.md
+++ b/keyboards/duck/eagle_viper/v2/keymaps/profanum429/readme.md
diff --git a/keyboards/eagle_viper/v2/matrix.c b/keyboards/duck/eagle_viper/v2/matrix.c
index 7003a7ae00..7003a7ae00 100644
--- a/keyboards/eagle_viper/v2/matrix.c
+++ b/keyboards/duck/eagle_viper/v2/matrix.c
diff --git a/keyboards/eagle_viper/v2/readme.md b/keyboards/duck/eagle_viper/v2/readme.md
index b613b63b90..b613b63b90 100644
--- a/keyboards/eagle_viper/v2/readme.md
+++ b/keyboards/duck/eagle_viper/v2/readme.md
diff --git a/keyboards/eagle_viper/v2/rules.mk b/keyboards/duck/eagle_viper/v2/rules.mk
index 64d839fcbd..64d839fcbd 100644
--- a/keyboards/eagle_viper/v2/rules.mk
+++ b/keyboards/duck/eagle_viper/v2/rules.mk
diff --git a/keyboards/eagle_viper/v2/v2.c b/keyboards/duck/eagle_viper/v2/v2.c
index a60acb9784..a60acb9784 100644
--- a/keyboards/eagle_viper/v2/v2.c
+++ b/keyboards/duck/eagle_viper/v2/v2.c
diff --git a/keyboards/eagle_viper/v2/v2.h b/keyboards/duck/eagle_viper/v2/v2.h
index 583966b906..d149471ba3 100644
--- a/keyboards/eagle_viper/v2/v2.h
+++ b/keyboards/duck/eagle_viper/v2/v2.h
@@ -16,7 +16,7 @@
 #ifndef V2_H
 #define V2_H
 
-#include "../eagle_viper.h"
+#include "quantum.h"
 
 #define ___ KC_NO
 
diff --git a/keyboards/eagle_viper/eagle_viper.c b/keyboards/eagle_viper/eagle_viper.c
deleted file mode 100644
index c2d44c4e7e..0000000000
--- a/keyboards/eagle_viper/eagle_viper.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "eagle_viper.h"
diff --git a/keyboards/eagle_viper/eagle_viper.h b/keyboards/eagle_viper/eagle_viper.h
deleted file mode 100644
index fc34e7dde8..0000000000
--- a/keyboards/eagle_viper/eagle_viper.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef EAGLE_VIPER_H
-#define EAGLE_VIPER_H
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_eagle_viper_v2
-    #include "v2.h"
-#endif
-
-#endif
diff --git a/keyboards/eagle_viper/rules.mk b/keyboards/eagle_viper/rules.mk
deleted file mode 100644
index ad8bd5ca14..0000000000
--- a/keyboards/eagle_viper/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-DEFAULT_FOLDER = eagle_viper/v2
-
-LAYOUTS = 60_ansi
-\ No newline at end of file