diff --git a/keyboards/butterstick/butterstick.c b/keyboards/gboards/butterstick/butterstick.c
similarity index 100%
rename from keyboards/butterstick/butterstick.c
rename to keyboards/gboards/butterstick/butterstick.c
diff --git a/keyboards/butterstick/butterstick.h b/keyboards/gboards/butterstick/butterstick.h
similarity index 100%
rename from keyboards/butterstick/butterstick.h
rename to keyboards/gboards/butterstick/butterstick.h
diff --git a/keyboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
similarity index 100%
rename from keyboards/butterstick/config.h
rename to keyboards/gboards/butterstick/config.h
diff --git a/keyboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json
similarity index 100%
rename from keyboards/butterstick/info.json
rename to keyboards/gboards/butterstick/info.json
diff --git a/keyboards/butterstick/keymaps/default/keymap.c b/keyboards/gboards/butterstick/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/butterstick/keymaps/default/keymap.c
rename to keyboards/gboards/butterstick/keymaps/default/keymap.c
diff --git a/keyboards/butterstick/keymaps/dennytom/README.md b/keyboards/gboards/butterstick/keymaps/dennytom/README.md
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/README.md
rename to keyboards/gboards/butterstick/keymaps/dennytom/README.md
diff --git a/keyboards/butterstick/keymaps/dennytom/keymap.c b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/keymap.c
rename to keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
diff --git a/keyboards/butterstick/keymaps/dennytom/keymap_def.json b/keyboards/gboards/butterstick/keymaps/dennytom/keymap_def.json
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/keymap_def.json
rename to keyboards/gboards/butterstick/keymaps/dennytom/keymap_def.json
diff --git a/keyboards/butterstick/keymaps/dennytom/rules.mk b/keyboards/gboards/butterstick/keymaps/dennytom/rules.mk
similarity index 100%
rename from keyboards/butterstick/keymaps/dennytom/rules.mk
rename to keyboards/gboards/butterstick/keymaps/dennytom/rules.mk
diff --git a/keyboards/butterstick/readme.md b/keyboards/gboards/butterstick/readme.md
similarity index 95%
rename from keyboards/butterstick/readme.md
rename to keyboards/gboards/butterstick/readme.md
index 8bae8ba5a05..37e9375d885 100644
--- a/keyboards/butterstick/readme.md
+++ b/keyboards/gboards/butterstick/readme.md
@@ -9,6 +9,6 @@ Hardware Availability: [g Heavy Industries](https://www.gboards.ca/product/butte
 
 Make example for this keyboard (after setting up your build environment):
 
-    make butterstick:default
+    make gboards/butterstick: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/butterstick/rules.mk b/keyboards/gboards/butterstick/rules.mk
similarity index 100%
rename from keyboards/butterstick/rules.mk
rename to keyboards/gboards/butterstick/rules.mk
diff --git a/keyboards/butterstick/sten.c b/keyboards/gboards/butterstick/sten.c
similarity index 100%
rename from keyboards/butterstick/sten.c
rename to keyboards/gboards/butterstick/sten.c
diff --git a/keyboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h
similarity index 100%
rename from keyboards/butterstick/sten.h
rename to keyboards/gboards/butterstick/sten.h
diff --git a/keyboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
similarity index 100%
rename from keyboards/ergotaco/config.h
rename to keyboards/gboards/ergotaco/config.h
diff --git a/keyboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
similarity index 100%
rename from keyboards/ergotaco/ergotaco.c
rename to keyboards/gboards/ergotaco/ergotaco.c
diff --git a/keyboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h
similarity index 100%
rename from keyboards/ergotaco/ergotaco.h
rename to keyboards/gboards/ergotaco/ergotaco.h
diff --git a/keyboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
similarity index 100%
rename from keyboards/ergotaco/info.json
rename to keyboards/gboards/ergotaco/info.json
diff --git a/keyboards/ergotaco/keymaps/default/keymap.c b/keyboards/gboards/ergotaco/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergotaco/keymaps/default/keymap.c
rename to keyboards/gboards/ergotaco/keymaps/default/keymap.c
diff --git a/keyboards/ergotaco/keymaps/default/readme.md b/keyboards/gboards/ergotaco/keymaps/default/readme.md
similarity index 79%
rename from keyboards/ergotaco/keymaps/default/readme.md
rename to keyboards/gboards/ergotaco/keymaps/default/readme.md
index 653f3774eaa..d9c7c1601f5 100644
--- a/keyboards/ergotaco/keymaps/default/readme.md
+++ b/keyboards/gboards/ergotaco/keymaps/default/readme.md
@@ -1,6 +1,6 @@
 This is the default keymap for the ErgoTaco, Make it your own!
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/ergotaco/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/ergotaco/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/ergotaco/keymaps/default/rules.mk b/keyboards/gboards/ergotaco/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/ergotaco/keymaps/default/rules.mk
rename to keyboards/gboards/ergotaco/keymaps/default/rules.mk
diff --git a/keyboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
similarity index 100%
rename from keyboards/ergotaco/matrix.c
rename to keyboards/gboards/ergotaco/matrix.c
diff --git a/keyboards/ergotaco/post_rules.mk b/keyboards/gboards/ergotaco/post_rules.mk
similarity index 100%
rename from keyboards/ergotaco/post_rules.mk
rename to keyboards/gboards/ergotaco/post_rules.mk
diff --git a/keyboards/ergotaco/readme.md b/keyboards/gboards/ergotaco/readme.md
similarity index 91%
rename from keyboards/ergotaco/readme.md
rename to keyboards/gboards/ergotaco/readme.md
index 40077e2a8dc..dc9db3bb64e 100644
--- a/keyboards/ergotaco/readme.md
+++ b/keyboards/gboards/ergotaco/readme.md
@@ -11,13 +11,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
 ## Firmware building
 Clone the QMK Repo and install dfu-programmer, flash with:
 
-    make ergotaco:default:dfu
+    make gboards/ergotaco:default:dfu
 
 And reset your keyboard!
 
 To just test if your build system is sane, try compiling the default keymap using:
    
-    make ergotaco:default
+    make gboards/ergotaco: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/ergotaco/rules.mk b/keyboards/gboards/ergotaco/rules.mk
similarity index 100%
rename from keyboards/ergotaco/rules.mk
rename to keyboards/gboards/ergotaco/rules.mk
diff --git a/keyboards/georgi/config.h b/keyboards/gboards/georgi/config.h
similarity index 100%
rename from keyboards/georgi/config.h
rename to keyboards/gboards/georgi/config.h
diff --git a/keyboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
similarity index 100%
rename from keyboards/georgi/georgi.c
rename to keyboards/gboards/georgi/georgi.c
diff --git a/keyboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h
similarity index 100%
rename from keyboards/georgi/georgi.h
rename to keyboards/gboards/georgi/georgi.h
diff --git a/keyboards/georgi/info.json b/keyboards/gboards/georgi/info.json
similarity index 100%
rename from keyboards/georgi/info.json
rename to keyboards/gboards/georgi/info.json
diff --git a/keyboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/colemak-dh/keymap.c
rename to keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
diff --git a/keyboards/georgi/keymaps/colemak-dh/readme.md b/keyboards/gboards/georgi/keymaps/colemak-dh/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/colemak-dh/readme.md
rename to keyboards/gboards/georgi/keymaps/colemak-dh/readme.md
diff --git a/keyboards/georgi/keymaps/colemak-dh/rules.mk b/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/colemak-dh/rules.mk
rename to keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk
diff --git a/keyboards/georgi/keymaps/default-flipped/keymap.c b/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/default-flipped/keymap.c
rename to keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
diff --git a/keyboards/georgi/keymaps/default-flipped/readme.md b/keyboards/gboards/georgi/keymaps/default-flipped/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/default-flipped/readme.md
rename to keyboards/gboards/georgi/keymaps/default-flipped/readme.md
diff --git a/keyboards/georgi/keymaps/default-flipped/rules.mk b/keyboards/gboards/georgi/keymaps/default-flipped/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/default-flipped/rules.mk
rename to keyboards/gboards/georgi/keymaps/default-flipped/rules.mk
diff --git a/keyboards/georgi/keymaps/default/keymap.c b/keyboards/gboards/georgi/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/default/keymap.c
rename to keyboards/gboards/georgi/keymaps/default/keymap.c
diff --git a/keyboards/georgi/keymaps/default/readme.md b/keyboards/gboards/georgi/keymaps/default/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/default/readme.md
rename to keyboards/gboards/georgi/keymaps/default/readme.md
diff --git a/keyboards/georgi/keymaps/default/rules.mk b/keyboards/gboards/georgi/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/default/rules.mk
rename to keyboards/gboards/georgi/keymaps/default/rules.mk
diff --git a/keyboards/georgi/keymaps/dennytom/README.md b/keyboards/gboards/georgi/keymaps/dennytom/README.md
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/README.md
rename to keyboards/gboards/georgi/keymaps/dennytom/README.md
diff --git a/keyboards/georgi/keymaps/dennytom/keymap.c b/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/keymap.c
rename to keyboards/gboards/georgi/keymaps/dennytom/keymap.c
diff --git a/keyboards/georgi/keymaps/dennytom/keymap_def.json b/keyboards/gboards/georgi/keymaps/dennytom/keymap_def.json
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/keymap_def.json
rename to keyboards/gboards/georgi/keymaps/dennytom/keymap_def.json
diff --git a/keyboards/georgi/keymaps/dennytom/rules.mk b/keyboards/gboards/georgi/keymaps/dennytom/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/dennytom/rules.mk
rename to keyboards/gboards/georgi/keymaps/dennytom/rules.mk
diff --git a/keyboards/georgi/keymaps/minimal/keymap.c b/keyboards/gboards/georgi/keymaps/minimal/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/minimal/keymap.c
rename to keyboards/gboards/georgi/keymaps/minimal/keymap.c
diff --git a/keyboards/georgi/keymaps/minimal/readme.md b/keyboards/gboards/georgi/keymaps/minimal/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/minimal/readme.md
rename to keyboards/gboards/georgi/keymaps/minimal/readme.md
diff --git a/keyboards/georgi/keymaps/minimal/rules.mk b/keyboards/gboards/georgi/keymaps/minimal/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/minimal/rules.mk
rename to keyboards/gboards/georgi/keymaps/minimal/rules.mk
diff --git a/keyboards/georgi/keymaps/norman/keymap.c b/keyboards/gboards/georgi/keymaps/norman/keymap.c
similarity index 100%
rename from keyboards/georgi/keymaps/norman/keymap.c
rename to keyboards/gboards/georgi/keymaps/norman/keymap.c
diff --git a/keyboards/georgi/keymaps/norman/readme.md b/keyboards/gboards/georgi/keymaps/norman/readme.md
similarity index 100%
rename from keyboards/georgi/keymaps/norman/readme.md
rename to keyboards/gboards/georgi/keymaps/norman/readme.md
diff --git a/keyboards/georgi/keymaps/norman/rules.mk b/keyboards/gboards/georgi/keymaps/norman/rules.mk
similarity index 100%
rename from keyboards/georgi/keymaps/norman/rules.mk
rename to keyboards/gboards/georgi/keymaps/norman/rules.mk
diff --git a/keyboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
similarity index 100%
rename from keyboards/georgi/matrix.c
rename to keyboards/gboards/georgi/matrix.c
diff --git a/keyboards/georgi/readme.md b/keyboards/gboards/georgi/readme.md
similarity index 80%
rename from keyboards/georgi/readme.md
rename to keyboards/gboards/georgi/readme.md
index 247219b9345..2ba259ab7ee 100644
--- a/keyboards/georgi/readme.md
+++ b/keyboards/gboards/georgi/readme.md
@@ -13,13 +13,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
 ## Firmware building
 After cloning the QMK repo and installing dfu-programmer build and flash with. Be sure to reset your keyboard!
 
-    make georgi:default:dfu
+    make gboards/georgi:default:dfu
 
 To just test your build with the default keymap
    
-    make georgi:default
+    make gboards/georgi:default
 
-Build options can be enabled/disabled in keyboards/georgi/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
+Build options can be enabled/disabled in keyboards/gboards/georgi/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
 
 ## Documentation
 Is hosted over on [docs.gboards.ca](http://docs.gboards.ca/). Please take a look at the docs for customizing your firmware!
diff --git a/keyboards/georgi/rules.mk b/keyboards/gboards/georgi/rules.mk
similarity index 100%
rename from keyboards/georgi/rules.mk
rename to keyboards/gboards/georgi/rules.mk
diff --git a/keyboards/georgi/sten.c b/keyboards/gboards/georgi/sten.c
similarity index 100%
rename from keyboards/georgi/sten.c
rename to keyboards/gboards/georgi/sten.c
diff --git a/keyboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
similarity index 100%
rename from keyboards/georgi/sten.h
rename to keyboards/gboards/georgi/sten.h
diff --git a/keyboards/gergo/config.h b/keyboards/gboards/gergo/config.h
similarity index 100%
rename from keyboards/gergo/config.h
rename to keyboards/gboards/gergo/config.h
diff --git a/keyboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c
similarity index 100%
rename from keyboards/gergo/gergo.c
rename to keyboards/gboards/gergo/gergo.c
diff --git a/keyboards/gergo/gergo.h b/keyboards/gboards/gergo/gergo.h
similarity index 100%
rename from keyboards/gergo/gergo.h
rename to keyboards/gboards/gergo/gergo.h
diff --git a/keyboards/gergo/info.json b/keyboards/gboards/gergo/info.json
similarity index 100%
rename from keyboards/gergo/info.json
rename to keyboards/gboards/gergo/info.json
diff --git a/keyboards/gergo/keymaps/abstractkb/config.h b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/abstractkb/config.h
rename to keyboards/gboards/gergo/keymaps/abstractkb/config.h
diff --git a/keyboards/gergo/keymaps/abstractkb/keymap.c b/keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/abstractkb/keymap.c
rename to keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
diff --git a/keyboards/gergo/keymaps/abstractkb/readme.md b/keyboards/gboards/gergo/keymaps/abstractkb/readme.md
similarity index 88%
rename from keyboards/gergo/keymaps/abstractkb/readme.md
rename to keyboards/gboards/gergo/keymaps/abstractkb/readme.md
index 0b07136e89a..863b21e8e23 100644
--- a/keyboards/gergo/keymaps/abstractkb/readme.md
+++ b/keyboards/gboards/gergo/keymaps/abstractkb/readme.md
@@ -5,6 +5,6 @@
 This is my personal modification to the stock gergo keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/abstractkb/rules.mk b/keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/abstractkb/rules.mk
rename to keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
diff --git a/keyboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/colemak/keymap.c
rename to keyboards/gboards/gergo/keymaps/colemak/keymap.c
diff --git a/keyboards/gergo/keymaps/colemak/readme.md b/keyboards/gboards/gergo/keymaps/colemak/readme.md
similarity index 92%
rename from keyboards/gergo/keymaps/colemak/readme.md
rename to keyboards/gboards/gergo/keymaps/colemak/readme.md
index 1c1cc7bdea2..5cfe3b83065 100644
--- a/keyboards/gergo/keymaps/colemak/readme.md
+++ b/keyboards/gboards/gergo/keymaps/colemak/readme.md
@@ -11,6 +11,6 @@ You can view this layout over at
 [keyboad-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/f04d6a3b0cd3db91407c51f7ba36aeb3).
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/colemak/rules.mk b/keyboards/gboards/gergo/keymaps/colemak/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/colemak/rules.mk
rename to keyboards/gboards/gergo/keymaps/colemak/rules.mk
diff --git a/keyboards/gergo/keymaps/default/config.h b/keyboards/gboards/gergo/keymaps/default/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/default/config.h
rename to keyboards/gboards/gergo/keymaps/default/config.h
diff --git a/keyboards/gergo/keymaps/default/keymap.c b/keyboards/gboards/gergo/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/default/keymap.c
rename to keyboards/gboards/gergo/keymaps/default/keymap.c
diff --git a/keyboards/gergo/keymaps/default/readme.md b/keyboards/gboards/gergo/keymaps/default/readme.md
similarity index 90%
rename from keyboards/gergo/keymaps/default/readme.md
rename to keyboards/gboards/gergo/keymaps/default/readme.md
index 471a20fbdff..8e49b2f5b06 100644
--- a/keyboards/gergo/keymaps/default/readme.md
+++ b/keyboards/gboards/gergo/keymaps/default/readme.md
@@ -5,6 +5,6 @@
 This is the default keymap for Gergo, it's based heavily off of the naps62 ErgoDox layout and is aimed at a programmer friendly keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/default/rules.mk b/keyboards/gboards/gergo/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/default/rules.mk
rename to keyboards/gboards/gergo/keymaps/default/rules.mk
diff --git a/keyboards/gergo/keymaps/drashna/keymap.c b/keyboards/gboards/gergo/keymaps/drashna/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/drashna/keymap.c
rename to keyboards/gboards/gergo/keymaps/drashna/keymap.c
diff --git a/keyboards/gergo/keymaps/drashna/rules.mk b/keyboards/gboards/gergo/keymaps/drashna/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/drashna/rules.mk
rename to keyboards/gboards/gergo/keymaps/drashna/rules.mk
diff --git a/keyboards/gergo/keymaps/germ/config.h b/keyboards/gboards/gergo/keymaps/germ/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/germ/config.h
rename to keyboards/gboards/gergo/keymaps/germ/config.h
diff --git a/keyboards/gergo/keymaps/germ/keymap.c b/keyboards/gboards/gergo/keymaps/germ/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/germ/keymap.c
rename to keyboards/gboards/gergo/keymaps/germ/keymap.c
diff --git a/keyboards/gergo/keymaps/germ/readme.md b/keyboards/gboards/gergo/keymaps/germ/readme.md
similarity index 90%
rename from keyboards/gergo/keymaps/germ/readme.md
rename to keyboards/gboards/gergo/keymaps/germ/readme.md
index 471a20fbdff..8e49b2f5b06 100644
--- a/keyboards/gergo/keymaps/germ/readme.md
+++ b/keyboards/gboards/gergo/keymaps/germ/readme.md
@@ -5,6 +5,6 @@
 This is the default keymap for Gergo, it's based heavily off of the naps62 ErgoDox layout and is aimed at a programmer friendly keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/germ/rules.mk b/keyboards/gboards/gergo/keymaps/germ/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/germ/rules.mk
rename to keyboards/gboards/gergo/keymaps/germ/rules.mk
diff --git a/keyboards/gergo/keymaps/gotham/config.h b/keyboards/gboards/gergo/keymaps/gotham/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/config.h
rename to keyboards/gboards/gergo/keymaps/gotham/config.h
diff --git a/keyboards/gergo/keymaps/gotham/keymap.c b/keyboards/gboards/gergo/keymaps/gotham/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/keymap.c
rename to keyboards/gboards/gergo/keymaps/gotham/keymap.c
diff --git a/keyboards/gergo/keymaps/gotham/readme.md b/keyboards/gboards/gergo/keymaps/gotham/readme.md
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/readme.md
rename to keyboards/gboards/gergo/keymaps/gotham/readme.md
diff --git a/keyboards/gergo/keymaps/gotham/rules.mk b/keyboards/gboards/gergo/keymaps/gotham/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/gotham/rules.mk
rename to keyboards/gboards/gergo/keymaps/gotham/rules.mk
diff --git a/keyboards/gergo/keymaps/manna-harbour_miryoku/config.h b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h
similarity index 100%
rename from keyboards/gergo/keymaps/manna-harbour_miryoku/config.h
rename to keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/config.h
diff --git a/keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
rename to keyboards/gboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
diff --git a/keyboards/gboards/gergo/keymaps/oled/config.h b/keyboards/gboards/gergo/keymaps/oled/config.h
new file mode 100644
index 00000000000..af960a1eed8
--- /dev/null
+++ b/keyboards/gboards/gergo/keymaps/oled/config.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define IGNORE_MOD_TAP_INTERRUPT
+#define OLED_FONT_H "keyboards/gboards/gergo/keymaps/oled/glcdfont.c"
diff --git a/keyboards/gergo/keymaps/oled/glcdfont.c b/keyboards/gboards/gergo/keymaps/oled/glcdfont.c
similarity index 100%
rename from keyboards/gergo/keymaps/oled/glcdfont.c
rename to keyboards/gboards/gergo/keymaps/oled/glcdfont.c
diff --git a/keyboards/gergo/keymaps/oled/keymap.c b/keyboards/gboards/gergo/keymaps/oled/keymap.c
similarity index 100%
rename from keyboards/gergo/keymaps/oled/keymap.c
rename to keyboards/gboards/gergo/keymaps/oled/keymap.c
diff --git a/keyboards/gergo/keymaps/oled/readme.md b/keyboards/gboards/gergo/keymaps/oled/readme.md
similarity index 90%
rename from keyboards/gergo/keymaps/oled/readme.md
rename to keyboards/gboards/gergo/keymaps/oled/readme.md
index 471a20fbdff..8e49b2f5b06 100644
--- a/keyboards/gergo/keymaps/oled/readme.md
+++ b/keyboards/gboards/gergo/keymaps/oled/readme.md
@@ -5,6 +5,6 @@
 This is the default keymap for Gergo, it's based heavily off of the naps62 ErgoDox layout and is aimed at a programmer friendly keymap.
 
 ## Settings
-To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
+To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gboards/gergo/keymaps/default/rules.mk
 
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
diff --git a/keyboards/gergo/keymaps/oled/rules.mk b/keyboards/gboards/gergo/keymaps/oled/rules.mk
similarity index 100%
rename from keyboards/gergo/keymaps/oled/rules.mk
rename to keyboards/gboards/gergo/keymaps/oled/rules.mk
diff --git a/keyboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
similarity index 100%
rename from keyboards/gergo/matrix.c
rename to keyboards/gboards/gergo/matrix.c
diff --git a/keyboards/gergo/readme.md b/keyboards/gboards/gergo/readme.md
similarity index 77%
rename from keyboards/gergo/readme.md
rename to keyboards/gboards/gergo/readme.md
index 3436090b27e..b2558e6715f 100644
--- a/keyboards/gergo/readme.md
+++ b/keyboards/gboards/gergo/readme.md
@@ -13,13 +13,13 @@ Hardware Availability: [gboards.ca](http://gboards.ca)
 ## Firmware building
 After cloning the QMK repo and installing dfu-programmer build and flash with. Be sure to reset your keyboard!
 
-    make gergo:germ:dfu
+    make gboards/gergo:germ:dfu
 
 To just test your build with the default keymap
    
-    make gergo:germ
+    make gboards/gergo:germ
 
-Gadgets and options can be enabled/disabled in keyboards/gergo/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
+Gadgets and options can be enabled/disabled in keyboards/gboards/gergo/keymaps/default/rules.mk . Copy the default directory and make any changes to your layout, if you think they're worth sharing submit a PR!
 
 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/gergo/rules.mk b/keyboards/gboards/gergo/rules.mk
similarity index 100%
rename from keyboards/gergo/rules.mk
rename to keyboards/gboards/gergo/rules.mk
diff --git a/keyboards/gboards/readme.md b/keyboards/gboards/readme.md
index 743bacbcc15..384b568d895 100644
--- a/keyboards/gboards/readme.md
+++ b/keyboards/gboards/readme.md
@@ -22,11 +22,11 @@ multi-chords! You can browse the available combo lists in combos/
 
 ## Engine
 This is the onboard chording engine for all sorts of fun shenanigans. Be aware that this currently is a bit of a QMK 
-replacement focused on pure chording. Take a look at the configuration in keyboards/ginny for ideas, all these dicts
+replacement focused on pure chording. Take a look at the configuration in keyboards/gboards/ginny for ideas, all these dicts
 are stored over in dicts/
 
 ## Installation
-You will need to add the following bits to your rules.mk, refer to keyboards/ginny for a working example
+You will need to add the following bits to your rules.mk, refer to keyboards/gboards/ginny for a working example
 `VPATH               +=  keyboards/gboards/`
 
 And if you're using the chording engine, this as well.
@@ -35,5 +35,5 @@ And if you're using the chording engine, this as well.
 For combos, add `#include "g/keymap_combos.h"` to keymap.c to compile your combos.def into your keymap
 
 For the chording engine, add `#include "g/keymap_engine.h"` to keymap.c compile your dicts.def into your keymap. If you
-don't have a config_engine.h file for your keyboard, you will need to create it. (Once again, look at keyboards/ginny/
+don't have a config_engine.h file for your keyboard, you will need to create it. (Once again, look at keyboards/gboards/ginny/
 for a example of how to do this.
diff --git a/keyboards/gergo/keymaps/oled/config.h b/keyboards/gergo/keymaps/oled/config.h
deleted file mode 100644
index b1860806813..00000000000
--- a/keyboards/gergo/keymaps/oled/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define IGNORE_MOD_TAP_INTERRUPT
-#define OLED_FONT_H "keyboards/gergo/keymaps/oled/glcdfont.c"