[Keyboard] move g heavy industry boards into /gboards (#16040)

Co-authored-by: zvecr <git@zvecr.com>

89 files changed, 22 insertions, 22 deletions

diff --git a/keyboards/butterstick/butterstick.c b/keyboards/gboards/butterstick/butterstick.c
index 3bcbcbe8b4..3bcbcbe8b4 100644
--- a/keyboards/butterstick/butterstick.c
+++ b/keyboards/gboards/butterstick/butterstick.c
diff --git a/keyboards/butterstick/butterstick.h b/keyboards/gboards/butterstick/butterstick.h
index f97488c3f5..f97488c3f5 100644
--- a/keyboards/butterstick/butterstick.h
+++ b/keyboards/gboards/butterstick/butterstick.h
diff --git a/keyboards/butterstick/config.h b/keyboards/gboards/butterstick/config.h
index 69632cd4f7..69632cd4f7 100644
--- a/keyboards/butterstick/config.h
+++ b/keyboards/gboards/butterstick/config.h
diff --git a/keyboards/butterstick/info.json b/keyboards/gboards/butterstick/info.json
index 6bfd58e594..6bfd58e594 100644
--- a/keyboards/butterstick/info.json
+++ b/keyboards/gboards/butterstick/info.json
diff --git a/keyboards/butterstick/keymaps/default/keymap.c b/keyboards/gboards/butterstick/keymaps/default/keymap.c
index 749e9ba071..749e9ba071 100644
--- a/keyboards/butterstick/keymaps/default/keymap.c
+++ b/keyboards/gboards/butterstick/keymaps/default/keymap.c
diff --git a/keyboards/butterstick/keymaps/dennytom/README.md b/keyboards/gboards/butterstick/keymaps/dennytom/README.md
index a75bcc7506..a75bcc7506 100644
--- a/keyboards/butterstick/keymaps/dennytom/README.md
+++ b/keyboards/gboards/butterstick/keymaps/dennytom/README.md
diff --git a/keyboards/butterstick/keymaps/dennytom/keymap.c b/keyboards/gboards/butterstick/keymaps/dennytom/keymap.c
index bfe0aa2153..bfe0aa2153 100644
--- a/keyboards/butterstick/keymaps/dennytom/keymap.c
+++ b/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
index 16f02ca529..16f02ca529 100644
--- a/keyboards/butterstick/keymaps/dennytom/keymap_def.json
+++ b/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
index 1155f72c04..1155f72c04 100644
--- a/keyboards/butterstick/keymaps/dennytom/rules.mk
+++ b/keyboards/gboards/butterstick/keymaps/dennytom/rules.mk
diff --git a/keyboards/butterstick/readme.md b/keyboards/gboards/butterstick/readme.md
index 8bae8ba5a0..37e9375d88 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
index 4229aa7eec..4229aa7eec 100644
--- a/keyboards/butterstick/rules.mk
+++ b/keyboards/gboards/butterstick/rules.mk
diff --git a/keyboards/butterstick/sten.c b/keyboards/gboards/butterstick/sten.c
index 197abaf92f..197abaf92f 100644
--- a/keyboards/butterstick/sten.c
+++ b/keyboards/gboards/butterstick/sten.c
diff --git a/keyboards/butterstick/sten.h b/keyboards/gboards/butterstick/sten.h
index 0d5c58df21..0d5c58df21 100644
--- a/keyboards/butterstick/sten.h
+++ b/keyboards/gboards/butterstick/sten.h
diff --git a/keyboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index d415e77dc6..d415e77dc6 100644
--- a/keyboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
diff --git a/keyboards/ergotaco/ergotaco.c b/keyboards/gboards/ergotaco/ergotaco.c
index ecab74b3a2..ecab74b3a2 100644
--- a/keyboards/ergotaco/ergotaco.c
+++ b/keyboards/gboards/ergotaco/ergotaco.c
diff --git a/keyboards/ergotaco/ergotaco.h b/keyboards/gboards/ergotaco/ergotaco.h
index 5a0cd5e8fb..5a0cd5e8fb 100644
--- a/keyboards/ergotaco/ergotaco.h
+++ b/keyboards/gboards/ergotaco/ergotaco.h
diff --git a/keyboards/ergotaco/info.json b/keyboards/gboards/ergotaco/info.json
index e7794e6ee3..e7794e6ee3 100644
--- a/keyboards/ergotaco/info.json
+++ b/keyboards/gboards/ergotaco/info.json
diff --git a/keyboards/ergotaco/keymaps/default/keymap.c b/keyboards/gboards/ergotaco/keymaps/default/keymap.c
index 8de5ea6371..8de5ea6371 100644
--- a/keyboards/ergotaco/keymaps/default/keymap.c
+++ b/keyboards/gboards/ergotaco/keymaps/default/keymap.c
diff --git a/keyboards/ergotaco/keymaps/default/readme.md b/keyboards/gboards/ergotaco/keymaps/default/readme.md
index 653f3774ea..d9c7c1601f 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
index 870d047dc9..870d047dc9 100644
--- a/keyboards/ergotaco/keymaps/default/rules.mk
+++ b/keyboards/gboards/ergotaco/keymaps/default/rules.mk
diff --git a/keyboards/ergotaco/matrix.c b/keyboards/gboards/ergotaco/matrix.c
index 16300a7e4f..16300a7e4f 100644
--- a/keyboards/ergotaco/matrix.c
+++ b/keyboards/gboards/ergotaco/matrix.c
diff --git a/keyboards/ergotaco/post_rules.mk b/keyboards/gboards/ergotaco/post_rules.mk
index 0db3171b33..0db3171b33 100644
--- a/keyboards/ergotaco/post_rules.mk
+++ b/keyboards/gboards/ergotaco/post_rules.mk
diff --git a/keyboards/ergotaco/readme.md b/keyboards/gboards/ergotaco/readme.md
index 40077e2a8d..dc9db3bb64 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
index db236477b0..db236477b0 100644
--- a/keyboards/ergotaco/rules.mk
+++ b/keyboards/gboards/ergotaco/rules.mk
diff --git a/keyboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index 5cd2f1620e..5cd2f1620e 100644
--- a/keyboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
diff --git a/keyboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
index 8866886ce7..8866886ce7 100644
--- a/keyboards/georgi/georgi.c
+++ b/keyboards/gboards/georgi/georgi.c
diff --git a/keyboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h
index e5a52c585d..e5a52c585d 100644
--- a/keyboards/georgi/georgi.h
+++ b/keyboards/gboards/georgi/georgi.h
diff --git a/keyboards/georgi/info.json b/keyboards/gboards/georgi/info.json
index 89d2cd883f..89d2cd883f 100644
--- a/keyboards/georgi/info.json
+++ b/keyboards/gboards/georgi/info.json
diff --git a/keyboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
index 29b35f6abd..29b35f6abd 100644
--- a/keyboards/georgi/keymaps/colemak-dh/keymap.c
+++ b/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
index f9da34b024..f9da34b024 100644
--- a/keyboards/georgi/keymaps/colemak-dh/readme.md
+++ b/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
index 07394aef48..07394aef48 100644
--- a/keyboards/georgi/keymaps/colemak-dh/rules.mk
+++ b/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
index 09243f2a24..09243f2a24 100644
--- a/keyboards/georgi/keymaps/default-flipped/keymap.c
+++ b/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
index f9da34b024..f9da34b024 100644
--- a/keyboards/georgi/keymaps/default-flipped/readme.md
+++ b/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
index 90d8057c32..90d8057c32 100644
--- a/keyboards/georgi/keymaps/default-flipped/rules.mk
+++ b/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
index 93c551af27..93c551af27 100644
--- a/keyboards/georgi/keymaps/default/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/default/keymap.c
diff --git a/keyboards/georgi/keymaps/default/readme.md b/keyboards/gboards/georgi/keymaps/default/readme.md
index f9da34b024..f9da34b024 100644
--- a/keyboards/georgi/keymaps/default/readme.md
+++ b/keyboards/gboards/georgi/keymaps/default/readme.md
diff --git a/keyboards/georgi/keymaps/default/rules.mk b/keyboards/gboards/georgi/keymaps/default/rules.mk
index 7bd3d7aa20..7bd3d7aa20 100644
--- a/keyboards/georgi/keymaps/default/rules.mk
+++ b/keyboards/gboards/georgi/keymaps/default/rules.mk
diff --git a/keyboards/georgi/keymaps/dennytom/README.md b/keyboards/gboards/georgi/keymaps/dennytom/README.md
index 14bc1d2045..14bc1d2045 100644
--- a/keyboards/georgi/keymaps/dennytom/README.md
+++ b/keyboards/gboards/georgi/keymaps/dennytom/README.md
diff --git a/keyboards/georgi/keymaps/dennytom/keymap.c b/keyboards/gboards/georgi/keymaps/dennytom/keymap.c
index 2e01917745..2e01917745 100644
--- a/keyboards/georgi/keymaps/dennytom/keymap.c
+++ b/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
index 232ccafadf..232ccafadf 100644
--- a/keyboards/georgi/keymaps/dennytom/keymap_def.json
+++ b/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
index 1155f72c04..1155f72c04 100644
--- a/keyboards/georgi/keymaps/dennytom/rules.mk
+++ b/keyboards/gboards/georgi/keymaps/dennytom/rules.mk
diff --git a/keyboards/georgi/keymaps/minimal/keymap.c b/keyboards/gboards/georgi/keymaps/minimal/keymap.c
index e9294c5cc8..e9294c5cc8 100644
--- a/keyboards/georgi/keymaps/minimal/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/minimal/keymap.c
diff --git a/keyboards/georgi/keymaps/minimal/readme.md b/keyboards/gboards/georgi/keymaps/minimal/readme.md
index f9da34b024..f9da34b024 100644
--- a/keyboards/georgi/keymaps/minimal/readme.md
+++ b/keyboards/gboards/georgi/keymaps/minimal/readme.md
diff --git a/keyboards/georgi/keymaps/minimal/rules.mk b/keyboards/gboards/georgi/keymaps/minimal/rules.mk
index cdbbbc280e..cdbbbc280e 100644
--- a/keyboards/georgi/keymaps/minimal/rules.mk
+++ b/keyboards/gboards/georgi/keymaps/minimal/rules.mk
diff --git a/keyboards/georgi/keymaps/norman/keymap.c b/keyboards/gboards/georgi/keymaps/norman/keymap.c
index 4591aab22f..4591aab22f 100644
--- a/keyboards/georgi/keymaps/norman/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/norman/keymap.c
diff --git a/keyboards/georgi/keymaps/norman/readme.md b/keyboards/gboards/georgi/keymaps/norman/readme.md
index f9da34b024..f9da34b024 100644
--- a/keyboards/georgi/keymaps/norman/readme.md
+++ b/keyboards/gboards/georgi/keymaps/norman/readme.md
diff --git a/keyboards/georgi/keymaps/norman/rules.mk b/keyboards/gboards/georgi/keymaps/norman/rules.mk
index bb97bef281..bb97bef281 100644
--- a/keyboards/georgi/keymaps/norman/rules.mk
+++ b/keyboards/gboards/georgi/keymaps/norman/rules.mk
diff --git a/keyboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
index 7d635ad8d7..7d635ad8d7 100644
--- a/keyboards/georgi/matrix.c
+++ b/keyboards/gboards/georgi/matrix.c
diff --git a/keyboards/georgi/readme.md b/keyboards/gboards/georgi/readme.md
index 247219b934..2ba259ab7e 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
index a884d8b3b9..a884d8b3b9 100644
--- a/keyboards/georgi/rules.mk
+++ b/keyboards/gboards/georgi/rules.mk
diff --git a/keyboards/georgi/sten.c b/keyboards/gboards/georgi/sten.c
index c7469b6394..c7469b6394 100644
--- a/keyboards/georgi/sten.c
+++ b/keyboards/gboards/georgi/sten.c
diff --git a/keyboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
index 320c49514c..320c49514c 100644
--- a/keyboards/georgi/sten.h
+++ b/keyboards/gboards/georgi/sten.h
diff --git a/keyboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index 9d56c0e24f..9d56c0e24f 100644
--- a/keyboards/gergo/config.h
+++ b/keyboards/gboards/gergo/config.h
diff --git a/keyboards/gergo/gergo.c b/keyboards/gboards/gergo/gergo.c
index ba359f8145..ba359f8145 100644
--- a/keyboards/gergo/gergo.c
+++ b/keyboards/gboards/gergo/gergo.c
diff --git a/keyboards/gergo/gergo.h b/keyboards/gboards/gergo/gergo.h
index 5174542661..5174542661 100644
--- a/keyboards/gergo/gergo.h
+++ b/keyboards/gboards/gergo/gergo.h
diff --git a/keyboards/gergo/info.json b/keyboards/gboards/gergo/info.json
index be52e49046..be52e49046 100644
--- a/keyboards/gergo/info.json
+++ b/keyboards/gboards/gergo/info.json
diff --git a/keyboards/gergo/keymaps/abstractkb/config.h b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
index bc7b9f7845..bc7b9f7845 100644
--- a/keyboards/gergo/keymaps/abstractkb/config.h
+++ b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
diff --git a/keyboards/gergo/keymaps/abstractkb/keymap.c b/keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
index 6ee37f8175..6ee37f8175 100644
--- a/keyboards/gergo/keymaps/abstractkb/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/abstractkb/keymap.c
diff --git a/keyboards/gergo/keymaps/abstractkb/readme.md b/keyboards/gboards/gergo/keymaps/abstractkb/readme.md
index 0b07136e89..863b21e8e2 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
index 4b4e56c4a0..4b4e56c4a0 100644
--- a/keyboards/gergo/keymaps/abstractkb/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/abstractkb/rules.mk
diff --git a/keyboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
index b2e79114f2..b2e79114f2 100644
--- a/keyboards/gergo/keymaps/colemak/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
diff --git a/keyboards/gergo/keymaps/colemak/readme.md b/keyboards/gboards/gergo/keymaps/colemak/readme.md
index 1c1cc7bdea..5cfe3b8306 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
index 3b81fdfa1b..3b81fdfa1b 100644
--- a/keyboards/gergo/keymaps/colemak/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/colemak/rules.mk
diff --git a/keyboards/gergo/keymaps/default/config.h b/keyboards/gboards/gergo/keymaps/default/config.h
index 6393d46f14..6393d46f14 100644
--- a/keyboards/gergo/keymaps/default/config.h
+++ b/keyboards/gboards/gergo/keymaps/default/config.h
diff --git a/keyboards/gergo/keymaps/default/keymap.c b/keyboards/gboards/gergo/keymaps/default/keymap.c
index 8e26223f17..8e26223f17 100644
--- a/keyboards/gergo/keymaps/default/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/default/keymap.c
diff --git a/keyboards/gergo/keymaps/default/readme.md b/keyboards/gboards/gergo/keymaps/default/readme.md
index 471a20fbdf..8e49b2f5b0 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
index bc2b3cf43b..bc2b3cf43b 100644
--- a/keyboards/gergo/keymaps/default/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/default/rules.mk
diff --git a/keyboards/gergo/keymaps/drashna/keymap.c b/keyboards/gboards/gergo/keymaps/drashna/keymap.c
index 01d52ed162..01d52ed162 100644
--- a/keyboards/gergo/keymaps/drashna/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/drashna/keymap.c
diff --git a/keyboards/gergo/keymaps/drashna/rules.mk b/keyboards/gboards/gergo/keymaps/drashna/rules.mk
index ec81d11e9c..ec81d11e9c 100644
--- a/keyboards/gergo/keymaps/drashna/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/drashna/rules.mk
diff --git a/keyboards/gergo/keymaps/germ/config.h b/keyboards/gboards/gergo/keymaps/germ/config.h
index 6393d46f14..6393d46f14 100644
--- a/keyboards/gergo/keymaps/germ/config.h
+++ b/keyboards/gboards/gergo/keymaps/germ/config.h
diff --git a/keyboards/gergo/keymaps/germ/keymap.c b/keyboards/gboards/gergo/keymaps/germ/keymap.c
index 8e26223f17..8e26223f17 100644
--- a/keyboards/gergo/keymaps/germ/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/germ/keymap.c
diff --git a/keyboards/gergo/keymaps/germ/readme.md b/keyboards/gboards/gergo/keymaps/germ/readme.md
index 471a20fbdf..8e49b2f5b0 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
index 0fd941bb53..0fd941bb53 100644
--- a/keyboards/gergo/keymaps/germ/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/germ/rules.mk
diff --git a/keyboards/gergo/keymaps/gotham/config.h b/keyboards/gboards/gergo/keymaps/gotham/config.h
index 6393d46f14..6393d46f14 100644
--- a/keyboards/gergo/keymaps/gotham/config.h
+++ b/keyboards/gboards/gergo/keymaps/gotham/config.h
diff --git a/keyboards/gergo/keymaps/gotham/keymap.c b/keyboards/gboards/gergo/keymaps/gotham/keymap.c
index ff6df266f2..ff6df266f2 100644
--- a/keyboards/gergo/keymaps/gotham/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/gotham/keymap.c
diff --git a/keyboards/gergo/keymaps/gotham/readme.md b/keyboards/gboards/gergo/keymaps/gotham/readme.md
index 2b1c5ab1da..2b1c5ab1da 100644
--- a/keyboards/gergo/keymaps/gotham/readme.md
+++ b/keyboards/gboards/gergo/keymaps/gotham/readme.md
diff --git a/keyboards/gergo/keymaps/gotham/rules.mk b/keyboards/gboards/gergo/keymaps/gotham/rules.mk
index bc2b3cf43b..bc2b3cf43b 100644
--- a/keyboards/gergo/keymaps/gotham/rules.mk
+++ b/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
index 2bfb5befb3..2bfb5befb3 100644
--- a/keyboards/gergo/keymaps/manna-harbour_miryoku/config.h
+++ b/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
index 7c5717a0fe..7c5717a0fe 100644
--- a/keyboards/gergo/keymaps/manna-harbour_miryoku/keymap.c
+++ b/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 0000000000..af960a1eed
--- /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
index 687f1a6a92..687f1a6a92 100644
--- a/keyboards/gergo/keymaps/oled/glcdfont.c
+++ b/keyboards/gboards/gergo/keymaps/oled/glcdfont.c
diff --git a/keyboards/gergo/keymaps/oled/keymap.c b/keyboards/gboards/gergo/keymaps/oled/keymap.c
index ab374b9332..ab374b9332 100644
--- a/keyboards/gergo/keymaps/oled/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/oled/keymap.c
diff --git a/keyboards/gergo/keymaps/oled/readme.md b/keyboards/gboards/gergo/keymaps/oled/readme.md
index 471a20fbdf..8e49b2f5b0 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
index 7880416719..7880416719 100644
--- a/keyboards/gergo/keymaps/oled/rules.mk
+++ b/keyboards/gboards/gergo/keymaps/oled/rules.mk
diff --git a/keyboards/gergo/matrix.c b/keyboards/gboards/gergo/matrix.c
index 443e97132b..443e97132b 100644
--- a/keyboards/gergo/matrix.c
+++ b/keyboards/gboards/gergo/matrix.c
diff --git a/keyboards/gergo/readme.md b/keyboards/gboards/gergo/readme.md
index 3436090b27..b2558e6715 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
index 0f877e2d4b..0f877e2d4b 100644
--- a/keyboards/gergo/rules.mk
+++ b/keyboards/gboards/gergo/rules.mk
diff --git a/keyboards/gboards/readme.md b/keyboards/gboards/readme.md
index 743bacbcc1..384b568d89 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 b186080681..0000000000
--- 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"