[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.