qmk · drashna · Feb 1, 2022 · Jan 29, 2022
diff --git a/keyboards/ergodash/.noci → keyboards/omkbd/ergodash/.noci b/keyboards/ergodash/.noci → keyboards/omkbd/ergodash/.noci
diff --git a/keyboards/ergodash/config.h → keyboards/omkbd/ergodash/config.h b/keyboards/ergodash/config.h → keyboards/omkbd/ergodash/config.h
diff --git a/keyboards/ergodash/ergodash.c → keyboards/omkbd/ergodash/ergodash.c b/keyboards/ergodash/ergodash.c → keyboards/omkbd/ergodash/ergodash.c
diff --git a/keyboards/ergodash/ergodash.h → keyboards/omkbd/ergodash/ergodash.h b/keyboards/ergodash/ergodash.h → keyboards/omkbd/ergodash/ergodash.h
@@ -2,10 +2,10 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_ergodash_rev1
+#ifdef KEYBOARD_omkbd_ergodash_rev1
     #include "rev1.h"
 #endif // #ifdef KEYBOARD_ergodash_rev1
 
-#ifdef KEYBOARD_ergodash_mini
+#ifdef KEYBOARD_omkbd_ergodash_mini
     #include "mini.h"
 #endif
diff --git a/keyboards/ergodash/mini/.noci → keyboards/omkbd/ergodash/mini/.noci b/keyboards/ergodash/mini/.noci → keyboards/omkbd/ergodash/mini/.noci
diff --git a/keyboards/ergodash/mini/config.h → keyboards/omkbd/ergodash/mini/config.h b/keyboards/ergodash/mini/config.h → keyboards/omkbd/ergodash/mini/config.h
diff --git a/keyboards/ergodash/mini/info.json → keyboards/omkbd/ergodash/mini/info.json b/keyboards/ergodash/mini/info.json → keyboards/omkbd/ergodash/mini/info.json
diff --git a/...ds/ergodash/mini/keymaps/default/config.h → ...bd/ergodash/mini/keymaps/default/config.h b/...ds/ergodash/mini/keymaps/default/config.h → ...bd/ergodash/mini/keymaps/default/config.h
diff --git a/...ds/ergodash/mini/keymaps/default/keymap.c → ...bd/ergodash/mini/keymaps/default/keymap.c b/...ds/ergodash/mini/keymaps/default/keymap.c → ...bd/ergodash/mini/keymaps/default/keymap.c
diff --git a/...ds/ergodash/mini/keymaps/default/rules.mk → ...bd/ergodash/mini/keymaps/default/rules.mk b/...ds/ergodash/mini/keymaps/default/rules.mk → ...bd/ergodash/mini/keymaps/default/rules.mk
diff --git a/...h/mini/keymaps/toyoshimahidenori/config.h → ...h/mini/keymaps/toyoshimahidenori/config.h b/...h/mini/keymaps/toyoshimahidenori/config.h → ...h/mini/keymaps/toyoshimahidenori/config.h
diff --git a/...h/mini/keymaps/toyoshimahidenori/keymap.c → ...h/mini/keymaps/toyoshimahidenori/keymap.c b/...h/mini/keymaps/toyoshimahidenori/keymap.c → ...h/mini/keymaps/toyoshimahidenori/keymap.c
diff --git a/.../mini/keymaps/toyoshimahidenori/readme.md → .../mini/keymaps/toyoshimahidenori/readme.md b/.../mini/keymaps/toyoshimahidenori/readme.md → .../mini/keymaps/toyoshimahidenori/readme.md
diff --git a/...h/mini/keymaps/toyoshimahidenori/rules.mk → ...h/mini/keymaps/toyoshimahidenori/rules.mk b/...h/mini/keymaps/toyoshimahidenori/rules.mk → ...h/mini/keymaps/toyoshimahidenori/rules.mk
diff --git a/...rgodash/mini/keymaps/yoshimaru46/config.h → ...rgodash/mini/keymaps/yoshimaru46/config.h b/...rgodash/mini/keymaps/yoshimaru46/config.h → ...rgodash/mini/keymaps/yoshimaru46/config.h
diff --git a/...rgodash/mini/keymaps/yoshimaru46/keymap.c → ...rgodash/mini/keymaps/yoshimaru46/keymap.c b/...rgodash/mini/keymaps/yoshimaru46/keymap.c → ...rgodash/mini/keymaps/yoshimaru46/keymap.c
diff --git a/...godash/mini/keymaps/yoshimaru46/readme.md → ...godash/mini/keymaps/yoshimaru46/readme.md b/...godash/mini/keymaps/yoshimaru46/readme.md → ...godash/mini/keymaps/yoshimaru46/readme.md
diff --git a/...rgodash/mini/keymaps/yoshimaru46/rules.mk → ...rgodash/mini/keymaps/yoshimaru46/rules.mk b/...rgodash/mini/keymaps/yoshimaru46/rules.mk → ...rgodash/mini/keymaps/yoshimaru46/rules.mk
diff --git a/keyboards/ergodash/mini/mini.c → keyboards/omkbd/ergodash/mini/mini.c b/keyboards/ergodash/mini/mini.c → keyboards/omkbd/ergodash/mini/mini.c
diff --git a/keyboards/ergodash/mini/mini.h → keyboards/omkbd/ergodash/mini/mini.h b/keyboards/ergodash/mini/mini.h → keyboards/omkbd/ergodash/mini/mini.h
diff --git a/keyboards/ergodash/mini/readme.md → keyboards/omkbd/ergodash/mini/readme.md b/keyboards/ergodash/mini/readme.md → keyboards/omkbd/ergodash/mini/readme.md
@@ -9,7 +9,7 @@ Hardware Availability: Order your own [yourself](https://github.com/omkbd/ErgoDa
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergodash/mini:default
+    make omkbd/ergodash/mini:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 

diff --git a/keyboards/ergodash/mini/rules.mk → keyboards/omkbd/ergodash/mini/rules.mk b/keyboards/ergodash/mini/rules.mk → keyboards/omkbd/ergodash/mini/rules.mk
diff --git a/keyboards/ergodash/readme.md → keyboards/omkbd/ergodash/readme.md b/keyboards/ergodash/readme.md → keyboards/omkbd/ergodash/readme.md
@@ -9,12 +9,12 @@ Hardware Availability: Order your own [yourself](https://github.com/omkbd/ErgoDa
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergodash/rev1:default
+    make omkbd/ergodash/rev1:default
 
 See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
 Install Example: (for pro micro)
-    `make ergodash/rev1:default:avrdude`
+    `make omkbd/ergodash/rev1:default:avrdude`
 
 Note:  
   "rev1" is for PCB ver 1.0,1.1,1.2  

diff --git a/keyboards/ergodash/rev1/.noci → keyboards/omkbd/ergodash/rev1/.noci b/keyboards/ergodash/rev1/.noci → keyboards/omkbd/ergodash/rev1/.noci
diff --git a/keyboards/ergodash/rev1/config.h → keyboards/omkbd/ergodash/rev1/config.h b/keyboards/ergodash/rev1/config.h → keyboards/omkbd/ergodash/rev1/config.h
diff --git a/keyboards/ergodash/rev1/info.json → keyboards/omkbd/ergodash/rev1/info.json b/keyboards/ergodash/rev1/info.json → keyboards/omkbd/ergodash/rev1/info.json
diff --git a/...ds/ergodash/rev1/keymaps/333fred/config.h → ...bd/ergodash/rev1/keymaps/333fred/config.h b/...ds/ergodash/rev1/keymaps/333fred/config.h → ...bd/ergodash/rev1/keymaps/333fred/config.h
diff --git a/...ds/ergodash/rev1/keymaps/333fred/keymap.c → ...bd/ergodash/rev1/keymaps/333fred/keymap.c b/...ds/ergodash/rev1/keymaps/333fred/keymap.c → ...bd/ergodash/rev1/keymaps/333fred/keymap.c
diff --git a/...ds/ergodash/rev1/keymaps/333fred/rules.mk → ...bd/ergodash/rev1/keymaps/333fred/rules.mk b/...ds/ergodash/rev1/keymaps/333fred/rules.mk → ...bd/ergodash/rev1/keymaps/333fred/rules.mk
diff --git a/...ds/ergodash/rev1/keymaps/default/config.h → ...bd/ergodash/rev1/keymaps/default/config.h b/...ds/ergodash/rev1/keymaps/default/config.h → ...bd/ergodash/rev1/keymaps/default/config.h
diff --git a/...ds/ergodash/rev1/keymaps/default/keymap.c → ...bd/ergodash/rev1/keymaps/default/keymap.c b/...ds/ergodash/rev1/keymaps/default/keymap.c → ...bd/ergodash/rev1/keymaps/default/keymap.c
diff --git a/...ds/ergodash/rev1/keymaps/default/rules.mk → ...bd/ergodash/rev1/keymaps/default/rules.mk b/...ds/ergodash/rev1/keymaps/default/rules.mk → ...bd/ergodash/rev1/keymaps/default/rules.mk
diff --git a/...sh/rev1/keymaps/greenshadowmaker/config.h → ...sh/rev1/keymaps/greenshadowmaker/config.h b/...sh/rev1/keymaps/greenshadowmaker/config.h → ...sh/rev1/keymaps/greenshadowmaker/config.h
diff --git a/...enshadowmaker/keyboard-layout-editor.json → ...enshadowmaker/keyboard-layout-editor.json b/...enshadowmaker/keyboard-layout-editor.json → ...enshadowmaker/keyboard-layout-editor.json
diff --git a/...sh/rev1/keymaps/greenshadowmaker/keymap.c → ...sh/rev1/keymaps/greenshadowmaker/keymap.c b/...sh/rev1/keymaps/greenshadowmaker/keymap.c → ...sh/rev1/keymaps/greenshadowmaker/keymap.c
diff --git a/...sh/rev1/keymaps/greenshadowmaker/rules.mk → ...sh/rev1/keymaps/greenshadowmaker/rules.mk b/...sh/rev1/keymaps/greenshadowmaker/rules.mk → ...sh/rev1/keymaps/greenshadowmaker/rules.mk
diff --git a/...rgodash/rev1/keymaps/ifohancroft/config.h → ...rgodash/rev1/keymaps/ifohancroft/config.h b/...rgodash/rev1/keymaps/ifohancroft/config.h → ...rgodash/rev1/keymaps/ifohancroft/config.h
diff --git a/...rgodash/rev1/keymaps/ifohancroft/keymap.c → ...rgodash/rev1/keymaps/ifohancroft/keymap.c b/...rgodash/rev1/keymaps/ifohancroft/keymap.c → ...rgodash/rev1/keymaps/ifohancroft/keymap.c
diff --git a/...godash/rev1/keymaps/ifohancroft/readme.md → ...godash/rev1/keymaps/ifohancroft/readme.md b/...godash/rev1/keymaps/ifohancroft/readme.md → ...godash/rev1/keymaps/ifohancroft/readme.md
diff --git a/...rgodash/rev1/keymaps/ifohancroft/rules.mk → ...rgodash/rev1/keymaps/ifohancroft/rules.mk b/...rgodash/rev1/keymaps/ifohancroft/rules.mk → ...rgodash/rev1/keymaps/ifohancroft/rules.mk
diff --git a/...ds/ergodash/rev1/keymaps/m47ch4n/config.h → ...bd/ergodash/rev1/keymaps/m47ch4n/config.h b/...ds/ergodash/rev1/keymaps/m47ch4n/config.h → ...bd/ergodash/rev1/keymaps/m47ch4n/config.h
diff --git a/...ds/ergodash/rev1/keymaps/m47ch4n/keymap.c → ...bd/ergodash/rev1/keymaps/m47ch4n/keymap.c b/...ds/ergodash/rev1/keymaps/m47ch4n/keymap.c → ...bd/ergodash/rev1/keymaps/m47ch4n/keymap.c
diff --git a/...rev1/keymaps/m47ch4n/m47ch4ns_keymap.json → ...rev1/keymaps/m47ch4n/m47ch4ns_keymap.json b/...rev1/keymaps/m47ch4n/m47ch4ns_keymap.json → ...rev1/keymaps/m47ch4n/m47ch4ns_keymap.json
diff --git a/...s/ergodash/rev1/keymaps/m47ch4n/readme.md → ...d/ergodash/rev1/keymaps/m47ch4n/readme.md b/...s/ergodash/rev1/keymaps/m47ch4n/readme.md → ...d/ergodash/rev1/keymaps/m47ch4n/readme.md
diff --git a/...ds/ergodash/rev1/keymaps/m47ch4n/rules.mk → ...bd/ergodash/rev1/keymaps/m47ch4n/rules.mk b/...ds/ergodash/rev1/keymaps/m47ch4n/rules.mk → ...bd/ergodash/rev1/keymaps/m47ch4n/rules.mk
diff --git a/...godash/rev1/keymaps/nopunin10did/config.h → ...godash/rev1/keymaps/nopunin10did/config.h b/...godash/rev1/keymaps/nopunin10did/config.h → ...godash/rev1/keymaps/nopunin10did/config.h
diff --git a/...godash/rev1/keymaps/nopunin10did/keymap.c → ...godash/rev1/keymaps/nopunin10did/keymap.c b/...godash/rev1/keymaps/nopunin10did/keymap.c → ...godash/rev1/keymaps/nopunin10did/keymap.c
diff --git a/...ash/rev1/keymaps/nopunin10did/layers.json → ...ash/rev1/keymaps/nopunin10did/layers.json b/...ash/rev1/keymaps/nopunin10did/layers.json → ...ash/rev1/keymaps/nopunin10did/layers.json
diff --git a/...odash/rev1/keymaps/nopunin10did/readme.md → ...odash/rev1/keymaps/nopunin10did/readme.md b/...odash/rev1/keymaps/nopunin10did/readme.md → ...odash/rev1/keymaps/nopunin10did/readme.md
diff --git a/...godash/rev1/keymaps/nopunin10did/rules.mk → ...godash/rev1/keymaps/nopunin10did/rules.mk b/...godash/rev1/keymaps/nopunin10did/rules.mk → ...godash/rev1/keymaps/nopunin10did/rules.mk
diff --git a/...rgodash/rev1/keymaps/shadowprogr/config.h → ...rgodash/rev1/keymaps/shadowprogr/config.h b/...rgodash/rev1/keymaps/shadowprogr/config.h → ...rgodash/rev1/keymaps/shadowprogr/config.h
diff --git a/...rgodash/rev1/keymaps/shadowprogr/keymap.c → ...rgodash/rev1/keymaps/shadowprogr/keymap.c b/...rgodash/rev1/keymaps/shadowprogr/keymap.c → ...rgodash/rev1/keymaps/shadowprogr/keymap.c
diff --git a/...godash/rev1/keymaps/shadowprogr/readme.md → ...godash/rev1/keymaps/shadowprogr/readme.md b/...godash/rev1/keymaps/shadowprogr/readme.md → ...godash/rev1/keymaps/shadowprogr/readme.md
diff --git a/...rgodash/rev1/keymaps/shadowprogr/rules.mk → ...rgodash/rev1/keymaps/shadowprogr/rules.mk b/...rgodash/rev1/keymaps/shadowprogr/rules.mk → ...rgodash/rev1/keymaps/shadowprogr/rules.mk
diff --git a/...ds/ergodash/rev1/keymaps/tw1t611/config.h → ...bd/ergodash/rev1/keymaps/tw1t611/config.h b/...ds/ergodash/rev1/keymaps/tw1t611/config.h → ...bd/ergodash/rev1/keymaps/tw1t611/config.h
diff --git a/...ds/ergodash/rev1/keymaps/tw1t611/keymap.c → ...bd/ergodash/rev1/keymaps/tw1t611/keymap.c b/...ds/ergodash/rev1/keymaps/tw1t611/keymap.c → ...bd/ergodash/rev1/keymaps/tw1t611/keymap.c
diff --git a/...s/ergodash/rev1/keymaps/tw1t611/readme.md → ...d/ergodash/rev1/keymaps/tw1t611/readme.md b/...s/ergodash/rev1/keymaps/tw1t611/readme.md → ...d/ergodash/rev1/keymaps/tw1t611/readme.md
diff --git a/...ds/ergodash/rev1/keymaps/tw1t611/rules.mk → ...bd/ergodash/rev1/keymaps/tw1t611/rules.mk b/...ds/ergodash/rev1/keymaps/tw1t611/rules.mk → ...bd/ergodash/rev1/keymaps/tw1t611/rules.mk
diff --git a/...v1/keymaps/yet-another-developer/config.h → ...v1/keymaps/yet-another-developer/config.h b/...v1/keymaps/yet-another-developer/config.h → ...v1/keymaps/yet-another-developer/config.h
diff --git a/...v1/keymaps/yet-another-developer/keymap.c → ...v1/keymaps/yet-another-developer/keymap.c b/...v1/keymaps/yet-another-developer/keymap.c → ...v1/keymaps/yet-another-developer/keymap.c
diff --git a/...v1/keymaps/yet-another-developer/rules.mk → ...v1/keymaps/yet-another-developer/rules.mk b/...v1/keymaps/yet-another-developer/rules.mk → ...v1/keymaps/yet-another-developer/rules.mk
diff --git a/keyboards/ergodash/rev1/rev1.c → keyboards/omkbd/ergodash/rev1/rev1.c b/keyboards/ergodash/rev1/rev1.c → keyboards/omkbd/ergodash/rev1/rev1.c
diff --git a/keyboards/ergodash/rev1/rev1.h → keyboards/omkbd/ergodash/rev1/rev1.h b/keyboards/ergodash/rev1/rev1.h → keyboards/omkbd/ergodash/rev1/rev1.h
diff --git a/keyboards/ergodash/rev1/rules.mk → keyboards/omkbd/ergodash/rev1/rules.mk b/keyboards/ergodash/rev1/rules.mk → keyboards/omkbd/ergodash/rev1/rules.mk
diff --git a/keyboards/ergodash/rules.mk → keyboards/omkbd/ergodash/rules.mk b/keyboards/ergodash/rules.mk → keyboards/omkbd/ergodash/rules.mk
@@ -19,4 +19,4 @@ RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 
 SPLIT_KEYBOARD = yes       # Enables split keyboard support
 
-DEFAULT_FOLDER = ergodash/rev1
+DEFAULT_FOLDER = omkbd/ergodash/rev1
diff --git a/keyboards/runner3680/3x6/.noci → keyboards/omkbd/runner3680/3x6/.noci b/keyboards/runner3680/3x6/.noci → keyboards/omkbd/runner3680/3x6/.noci
diff --git a/keyboards/runner3680/3x6/3x6.c → keyboards/omkbd/runner3680/3x6/3x6.c b/keyboards/runner3680/3x6/3x6.c → keyboards/omkbd/runner3680/3x6/3x6.c
diff --git a/keyboards/runner3680/3x6/3x6.h → keyboards/omkbd/runner3680/3x6/3x6.h b/keyboards/runner3680/3x6/3x6.h → keyboards/omkbd/runner3680/3x6/3x6.h
diff --git a/keyboards/runner3680/3x6/config.h → keyboards/omkbd/runner3680/3x6/config.h b/keyboards/runner3680/3x6/config.h → keyboards/omkbd/runner3680/3x6/config.h
diff --git a/keyboards/runner3680/3x6/info.json → keyboards/omkbd/runner3680/3x6/info.json b/keyboards/runner3680/3x6/info.json → keyboards/omkbd/runner3680/3x6/info.json
diff --git a/...s/runner3680/3x6/keymaps/default/config.h → ...d/runner3680/3x6/keymaps/default/config.h b/...s/runner3680/3x6/keymaps/default/config.h → ...d/runner3680/3x6/keymaps/default/config.h
diff --git a/...s/runner3680/3x6/keymaps/default/keymap.c → ...d/runner3680/3x6/keymaps/default/keymap.c b/...s/runner3680/3x6/keymaps/default/keymap.c → ...d/runner3680/3x6/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/3x6/rules.mk → keyboards/omkbd/runner3680/3x6/rules.mk b/keyboards/runner3680/3x6/rules.mk → keyboards/omkbd/runner3680/3x6/rules.mk
diff --git a/keyboards/runner3680/3x7/.noci → keyboards/omkbd/runner3680/3x7/.noci b/keyboards/runner3680/3x7/.noci → keyboards/omkbd/runner3680/3x7/.noci
diff --git a/keyboards/runner3680/3x7/3x7.c → keyboards/omkbd/runner3680/3x7/3x7.c b/keyboards/runner3680/3x7/3x7.c → keyboards/omkbd/runner3680/3x7/3x7.c
diff --git a/keyboards/runner3680/3x7/3x7.h → keyboards/omkbd/runner3680/3x7/3x7.h b/keyboards/runner3680/3x7/3x7.h → keyboards/omkbd/runner3680/3x7/3x7.h
diff --git a/keyboards/runner3680/3x7/config.h → keyboards/omkbd/runner3680/3x7/config.h b/keyboards/runner3680/3x7/config.h → keyboards/omkbd/runner3680/3x7/config.h
diff --git a/keyboards/runner3680/3x7/info.json → keyboards/omkbd/runner3680/3x7/info.json b/keyboards/runner3680/3x7/info.json → keyboards/omkbd/runner3680/3x7/info.json
diff --git a/...s/runner3680/3x7/keymaps/default/config.h → ...d/runner3680/3x7/keymaps/default/config.h b/...s/runner3680/3x7/keymaps/default/config.h → ...d/runner3680/3x7/keymaps/default/config.h
diff --git a/...s/runner3680/3x7/keymaps/default/keymap.c → ...d/runner3680/3x7/keymaps/default/keymap.c b/...s/runner3680/3x7/keymaps/default/keymap.c → ...d/runner3680/3x7/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/3x7/rules.mk → keyboards/omkbd/runner3680/3x7/rules.mk b/keyboards/runner3680/3x7/rules.mk → keyboards/omkbd/runner3680/3x7/rules.mk
diff --git a/keyboards/runner3680/3x8/.noci → keyboards/omkbd/runner3680/3x8/.noci b/keyboards/runner3680/3x8/.noci → keyboards/omkbd/runner3680/3x8/.noci
diff --git a/keyboards/runner3680/3x8/3x8.c → keyboards/omkbd/runner3680/3x8/3x8.c b/keyboards/runner3680/3x8/3x8.c → keyboards/omkbd/runner3680/3x8/3x8.c
diff --git a/keyboards/runner3680/3x8/3x8.h → keyboards/omkbd/runner3680/3x8/3x8.h b/keyboards/runner3680/3x8/3x8.h → keyboards/omkbd/runner3680/3x8/3x8.h
diff --git a/keyboards/runner3680/3x8/config.h → keyboards/omkbd/runner3680/3x8/config.h b/keyboards/runner3680/3x8/config.h → keyboards/omkbd/runner3680/3x8/config.h
diff --git a/keyboards/runner3680/3x8/info.json → keyboards/omkbd/runner3680/3x8/info.json b/keyboards/runner3680/3x8/info.json → keyboards/omkbd/runner3680/3x8/info.json
diff --git a/...s/runner3680/3x8/keymaps/default/config.h → ...d/runner3680/3x8/keymaps/default/config.h b/...s/runner3680/3x8/keymaps/default/config.h → ...d/runner3680/3x8/keymaps/default/config.h
diff --git a/...s/runner3680/3x8/keymaps/default/keymap.c → ...d/runner3680/3x8/keymaps/default/keymap.c b/...s/runner3680/3x8/keymaps/default/keymap.c → ...d/runner3680/3x8/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/3x8/rules.mk → keyboards/omkbd/runner3680/3x8/rules.mk b/keyboards/runner3680/3x8/rules.mk → keyboards/omkbd/runner3680/3x8/rules.mk
diff --git a/keyboards/runner3680/4x6/.noci → keyboards/omkbd/runner3680/4x6/.noci b/keyboards/runner3680/4x6/.noci → keyboards/omkbd/runner3680/4x6/.noci
diff --git a/keyboards/runner3680/4x6/4x6.c → keyboards/omkbd/runner3680/4x6/4x6.c b/keyboards/runner3680/4x6/4x6.c → keyboards/omkbd/runner3680/4x6/4x6.c
diff --git a/keyboards/runner3680/4x6/4x6.h → keyboards/omkbd/runner3680/4x6/4x6.h b/keyboards/runner3680/4x6/4x6.h → keyboards/omkbd/runner3680/4x6/4x6.h
diff --git a/keyboards/runner3680/4x6/config.h → keyboards/omkbd/runner3680/4x6/config.h b/keyboards/runner3680/4x6/config.h → keyboards/omkbd/runner3680/4x6/config.h
diff --git a/keyboards/runner3680/4x6/info.json → keyboards/omkbd/runner3680/4x6/info.json b/keyboards/runner3680/4x6/info.json → keyboards/omkbd/runner3680/4x6/info.json
diff --git a/...s/runner3680/4x6/keymaps/default/config.h → ...d/runner3680/4x6/keymaps/default/config.h b/...s/runner3680/4x6/keymaps/default/config.h → ...d/runner3680/4x6/keymaps/default/config.h
diff --git a/...s/runner3680/4x6/keymaps/default/keymap.c → ...d/runner3680/4x6/keymaps/default/keymap.c b/...s/runner3680/4x6/keymaps/default/keymap.c → ...d/runner3680/4x6/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/4x6/rules.mk → keyboards/omkbd/runner3680/4x6/rules.mk b/keyboards/runner3680/4x6/rules.mk → keyboards/omkbd/runner3680/4x6/rules.mk
diff --git a/keyboards/runner3680/4x7/.noci → keyboards/omkbd/runner3680/4x7/.noci b/keyboards/runner3680/4x7/.noci → keyboards/omkbd/runner3680/4x7/.noci
diff --git a/keyboards/runner3680/4x7/4x7.c → keyboards/omkbd/runner3680/4x7/4x7.c b/keyboards/runner3680/4x7/4x7.c → keyboards/omkbd/runner3680/4x7/4x7.c
diff --git a/keyboards/runner3680/4x7/4x7.h → keyboards/omkbd/runner3680/4x7/4x7.h b/keyboards/runner3680/4x7/4x7.h → keyboards/omkbd/runner3680/4x7/4x7.h
diff --git a/keyboards/runner3680/4x7/config.h → keyboards/omkbd/runner3680/4x7/config.h b/keyboards/runner3680/4x7/config.h → keyboards/omkbd/runner3680/4x7/config.h
diff --git a/keyboards/runner3680/4x7/info.json → keyboards/omkbd/runner3680/4x7/info.json b/keyboards/runner3680/4x7/info.json → keyboards/omkbd/runner3680/4x7/info.json
diff --git a/...s/runner3680/4x7/keymaps/default/config.h → ...d/runner3680/4x7/keymaps/default/config.h b/...s/runner3680/4x7/keymaps/default/config.h → ...d/runner3680/4x7/keymaps/default/config.h
diff --git a/...s/runner3680/4x7/keymaps/default/keymap.c → ...d/runner3680/4x7/keymaps/default/keymap.c b/...s/runner3680/4x7/keymaps/default/keymap.c → ...d/runner3680/4x7/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/4x7/rules.mk → keyboards/omkbd/runner3680/4x7/rules.mk b/keyboards/runner3680/4x7/rules.mk → keyboards/omkbd/runner3680/4x7/rules.mk
diff --git a/keyboards/runner3680/4x8/.noci → keyboards/omkbd/runner3680/4x8/.noci b/keyboards/runner3680/4x8/.noci → keyboards/omkbd/runner3680/4x8/.noci
diff --git a/keyboards/runner3680/4x8/4x8.c → keyboards/omkbd/runner3680/4x8/4x8.c b/keyboards/runner3680/4x8/4x8.c → keyboards/omkbd/runner3680/4x8/4x8.c
diff --git a/keyboards/runner3680/4x8/4x8.h → keyboards/omkbd/runner3680/4x8/4x8.h b/keyboards/runner3680/4x8/4x8.h → keyboards/omkbd/runner3680/4x8/4x8.h
diff --git a/keyboards/runner3680/4x8/config.h → keyboards/omkbd/runner3680/4x8/config.h b/keyboards/runner3680/4x8/config.h → keyboards/omkbd/runner3680/4x8/config.h
diff --git a/keyboards/runner3680/4x8/info.json → keyboards/omkbd/runner3680/4x8/info.json b/keyboards/runner3680/4x8/info.json → keyboards/omkbd/runner3680/4x8/info.json
diff --git a/...s/runner3680/4x8/keymaps/default/config.h → ...d/runner3680/4x8/keymaps/default/config.h b/...s/runner3680/4x8/keymaps/default/config.h → ...d/runner3680/4x8/keymaps/default/config.h
diff --git a/...s/runner3680/4x8/keymaps/default/keymap.c → ...d/runner3680/4x8/keymaps/default/keymap.c b/...s/runner3680/4x8/keymaps/default/keymap.c → ...d/runner3680/4x8/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/4x8/rules.mk → keyboards/omkbd/runner3680/4x8/rules.mk b/keyboards/runner3680/4x8/rules.mk → keyboards/omkbd/runner3680/4x8/rules.mk
diff --git a/keyboards/runner3680/5x6/.noci → keyboards/omkbd/runner3680/5x6/.noci b/keyboards/runner3680/5x6/.noci → keyboards/omkbd/runner3680/5x6/.noci
diff --git a/keyboards/runner3680/5x6/5x6.c → keyboards/omkbd/runner3680/5x6/5x6.c b/keyboards/runner3680/5x6/5x6.c → keyboards/omkbd/runner3680/5x6/5x6.c
diff --git a/keyboards/runner3680/5x6/5x6.h → keyboards/omkbd/runner3680/5x6/5x6.h b/keyboards/runner3680/5x6/5x6.h → keyboards/omkbd/runner3680/5x6/5x6.h
diff --git a/keyboards/runner3680/5x6/config.h → keyboards/omkbd/runner3680/5x6/config.h b/keyboards/runner3680/5x6/config.h → keyboards/omkbd/runner3680/5x6/config.h
diff --git a/keyboards/runner3680/5x6/info.json → keyboards/omkbd/runner3680/5x6/info.json b/keyboards/runner3680/5x6/info.json → keyboards/omkbd/runner3680/5x6/info.json
diff --git a/...s/runner3680/5x6/keymaps/default/config.h → ...d/runner3680/5x6/keymaps/default/config.h b/...s/runner3680/5x6/keymaps/default/config.h → ...d/runner3680/5x6/keymaps/default/config.h
diff --git a/...s/runner3680/5x6/keymaps/default/keymap.c → ...d/runner3680/5x6/keymaps/default/keymap.c b/...s/runner3680/5x6/keymaps/default/keymap.c → ...d/runner3680/5x6/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/5x6/rules.mk → keyboards/omkbd/runner3680/5x6/rules.mk b/keyboards/runner3680/5x6/rules.mk → keyboards/omkbd/runner3680/5x6/rules.mk
diff --git a/keyboards/runner3680/5x6_5x8/.noci → keyboards/omkbd/runner3680/5x6_5x8/.noci b/keyboards/runner3680/5x6_5x8/.noci → keyboards/omkbd/runner3680/5x6_5x8/.noci
diff --git a/keyboards/runner3680/5x6_5x8/5x6_5x8.c → keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c b/keyboards/runner3680/5x6_5x8/5x6_5x8.c → keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c
diff --git a/keyboards/runner3680/5x6_5x8/5x6_5x8.h → keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/runner3680/5x6_5x8/5x6_5x8.h → keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h
diff --git a/keyboards/runner3680/5x6_5x8/config.h → keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/runner3680/5x6_5x8/config.h → keyboards/omkbd/runner3680/5x6_5x8/config.h
diff --git a/keyboards/runner3680/5x6_5x8/info.json → keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/runner3680/5x6_5x8/info.json → keyboards/omkbd/runner3680/5x6_5x8/info.json
diff --git a/...nner3680/5x6_5x8/keymaps/default/config.h → ...nner3680/5x6_5x8/keymaps/default/config.h b/...nner3680/5x6_5x8/keymaps/default/config.h → ...nner3680/5x6_5x8/keymaps/default/config.h
diff --git a/...nner3680/5x6_5x8/keymaps/default/keymap.c → ...nner3680/5x6_5x8/keymaps/default/keymap.c b/...nner3680/5x6_5x8/keymaps/default/keymap.c → ...nner3680/5x6_5x8/keymaps/default/keymap.c
diff --git a/...ner3680/5x6_5x8/keymaps/derekhsu/config.h → ...ner3680/5x6_5x8/keymaps/derekhsu/config.h b/...ner3680/5x6_5x8/keymaps/derekhsu/config.h → ...ner3680/5x6_5x8/keymaps/derekhsu/config.h
diff --git a/...ner3680/5x6_5x8/keymaps/derekhsu/keymap.c → ...ner3680/5x6_5x8/keymaps/derekhsu/keymap.c b/...ner3680/5x6_5x8/keymaps/derekhsu/keymap.c → ...ner3680/5x6_5x8/keymaps/derekhsu/keymap.c
diff --git a/...ner3680/5x6_5x8/keymaps/derekhsu/rules.mk → ...ner3680/5x6_5x8/keymaps/derekhsu/rules.mk b/...ner3680/5x6_5x8/keymaps/derekhsu/rules.mk → ...ner3680/5x6_5x8/keymaps/derekhsu/rules.mk
diff --git a/...s/runner3680/5x6_5x8/keymaps/jis/config.h → ...d/runner3680/5x6_5x8/keymaps/jis/config.h b/...s/runner3680/5x6_5x8/keymaps/jis/config.h → ...d/runner3680/5x6_5x8/keymaps/jis/config.h
diff --git a/...s/runner3680/5x6_5x8/keymaps/jis/keymap.c → ...d/runner3680/5x6_5x8/keymaps/jis/keymap.c b/...s/runner3680/5x6_5x8/keymaps/jis/keymap.c → ...d/runner3680/5x6_5x8/keymaps/jis/keymap.c
diff --git a/...s/runner3680/5x6_5x8/keymaps/via/config.h → ...d/runner3680/5x6_5x8/keymaps/via/config.h b/...s/runner3680/5x6_5x8/keymaps/via/config.h → ...d/runner3680/5x6_5x8/keymaps/via/config.h
diff --git a/...s/runner3680/5x6_5x8/keymaps/via/keymap.c → ...d/runner3680/5x6_5x8/keymaps/via/keymap.c b/...s/runner3680/5x6_5x8/keymaps/via/keymap.c → ...d/runner3680/5x6_5x8/keymaps/via/keymap.c
diff --git a/...s/runner3680/5x6_5x8/keymaps/via/rules.mk → ...d/runner3680/5x6_5x8/keymaps/via/rules.mk b/...s/runner3680/5x6_5x8/keymaps/via/rules.mk → ...d/runner3680/5x6_5x8/keymaps/via/rules.mk
diff --git a/keyboards/runner3680/5x6_5x8/rules.mk → keyboards/omkbd/runner3680/5x6_5x8/rules.mk b/keyboards/runner3680/5x6_5x8/rules.mk → keyboards/omkbd/runner3680/5x6_5x8/rules.mk
diff --git a/keyboards/runner3680/5x7/.noci → keyboards/omkbd/runner3680/5x7/.noci b/keyboards/runner3680/5x7/.noci → keyboards/omkbd/runner3680/5x7/.noci
diff --git a/keyboards/runner3680/5x7/5x7.c → keyboards/omkbd/runner3680/5x7/5x7.c b/keyboards/runner3680/5x7/5x7.c → keyboards/omkbd/runner3680/5x7/5x7.c
diff --git a/keyboards/runner3680/5x7/5x7.h → keyboards/omkbd/runner3680/5x7/5x7.h b/keyboards/runner3680/5x7/5x7.h → keyboards/omkbd/runner3680/5x7/5x7.h
diff --git a/keyboards/runner3680/5x7/config.h → keyboards/omkbd/runner3680/5x7/config.h b/keyboards/runner3680/5x7/config.h → keyboards/omkbd/runner3680/5x7/config.h
diff --git a/keyboards/runner3680/5x7/info.json → keyboards/omkbd/runner3680/5x7/info.json b/keyboards/runner3680/5x7/info.json → keyboards/omkbd/runner3680/5x7/info.json
diff --git a/...s/runner3680/5x7/keymaps/default/config.h → ...d/runner3680/5x7/keymaps/default/config.h b/...s/runner3680/5x7/keymaps/default/config.h → ...d/runner3680/5x7/keymaps/default/config.h
diff --git a/...s/runner3680/5x7/keymaps/default/keymap.c → ...d/runner3680/5x7/keymaps/default/keymap.c b/...s/runner3680/5x7/keymaps/default/keymap.c → ...d/runner3680/5x7/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/5x7/rules.mk → keyboards/omkbd/runner3680/5x7/rules.mk b/keyboards/runner3680/5x7/rules.mk → keyboards/omkbd/runner3680/5x7/rules.mk
diff --git a/keyboards/runner3680/5x8/.noci → keyboards/omkbd/runner3680/5x8/.noci b/keyboards/runner3680/5x8/.noci → keyboards/omkbd/runner3680/5x8/.noci
diff --git a/keyboards/runner3680/5x8/5x8.c → keyboards/omkbd/runner3680/5x8/5x8.c b/keyboards/runner3680/5x8/5x8.c → keyboards/omkbd/runner3680/5x8/5x8.c
diff --git a/keyboards/runner3680/5x8/5x8.h → keyboards/omkbd/runner3680/5x8/5x8.h b/keyboards/runner3680/5x8/5x8.h → keyboards/omkbd/runner3680/5x8/5x8.h
diff --git a/keyboards/runner3680/5x8/config.h → keyboards/omkbd/runner3680/5x8/config.h b/keyboards/runner3680/5x8/config.h → keyboards/omkbd/runner3680/5x8/config.h
diff --git a/keyboards/runner3680/5x8/info.json → keyboards/omkbd/runner3680/5x8/info.json b/keyboards/runner3680/5x8/info.json → keyboards/omkbd/runner3680/5x8/info.json
diff --git a/...oards/runner3680/5x8/keymaps/JIS/config.h → ...omkbd/runner3680/5x8/keymaps/JIS/config.h b/...oards/runner3680/5x8/keymaps/JIS/config.h → ...omkbd/runner3680/5x8/keymaps/JIS/config.h
diff --git a/...oards/runner3680/5x8/keymaps/JIS/keymap.c → ...omkbd/runner3680/5x8/keymaps/JIS/keymap.c b/...oards/runner3680/5x8/keymaps/JIS/keymap.c → ...omkbd/runner3680/5x8/keymaps/JIS/keymap.c
diff --git a/...s/runner3680/5x8/keymaps/default/config.h → ...d/runner3680/5x8/keymaps/default/config.h b/...s/runner3680/5x8/keymaps/default/config.h → ...d/runner3680/5x8/keymaps/default/config.h
diff --git a/...s/runner3680/5x8/keymaps/default/keymap.c → ...d/runner3680/5x8/keymaps/default/keymap.c b/...s/runner3680/5x8/keymaps/default/keymap.c → ...d/runner3680/5x8/keymaps/default/keymap.c
diff --git a/keyboards/runner3680/5x8/rules.mk → keyboards/omkbd/runner3680/5x8/rules.mk b/keyboards/runner3680/5x8/rules.mk → keyboards/omkbd/runner3680/5x8/rules.mk
diff --git a/keyboards/runner3680/config.h → keyboards/omkbd/runner3680/config.h b/keyboards/runner3680/config.h → keyboards/omkbd/runner3680/config.h
diff --git a/keyboards/runner3680/readme.md → keyboards/omkbd/runner3680/readme.md b/keyboards/runner3680/readme.md → keyboards/omkbd/runner3680/readme.md
@@ -10,6 +10,6 @@ Hardware Availability: Order your own [yourself](https://github.com/omkbd/Runner
 
 Make example for this keyboard (after setting up your build environment):
 
-    make runner3680/5x8:default
+    make omkbd/runner3680/5x8:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/runner3680/rules.mk → keyboards/omkbd/runner3680/rules.mk b/keyboards/runner3680/rules.mk → keyboards/omkbd/runner3680/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no           # Audio output
 
 SPLIT_KEYBOARD = yes       # Enables split keyboard support
 
-DEFAULT_FOLDER = runner3680/5x8
+DEFAULT_FOLDER = omkbd/runner3680/5x8
diff --git a/keyboards/runner3680/runner3680.c → keyboards/omkbd/runner3680/runner3680.c b/keyboards/runner3680/runner3680.c → keyboards/omkbd/runner3680/runner3680.c
diff --git a/keyboards/omkbd/runner3680/runner3680.h b/keyboards/omkbd/runner3680/runner3680.h
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "quantum.h"
+
+#ifdef KEYBOARD_omkbd_runner3680_5x8
+  #include "5x8.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_5x7
+  #include "5x7.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_5x6
+  #include "5x6.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_5x6_5x8
+  #include "5x6_5x8.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_4x8
+  #include "4x8.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_4x7
+  #include "4x7.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_4x6
+  #include "4x6.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_3x8
+  #include "3x8.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_3x7
+  #include "3x7.h"
+#endif
+
+#ifdef KEYBOARD_omkbd_runner3680_3x6
+  #include "3x6.h"
+#endif
diff --git a/keyboards/runner3680/runner3680.h b/keyboards/runner3680/runner3680.h