diff --git a/keyboards/eggman/config.h b/keyboards/qpockets/eggman/config.h
similarity index 100%
rename from keyboards/eggman/config.h
rename to keyboards/qpockets/eggman/config.h
diff --git a/keyboards/eggman/eggman.c b/keyboards/qpockets/eggman/eggman.c
similarity index 100%
rename from keyboards/eggman/eggman.c
rename to keyboards/qpockets/eggman/eggman.c
diff --git a/keyboards/eggman/eggman.h b/keyboards/qpockets/eggman/eggman.h
similarity index 100%
rename from keyboards/eggman/eggman.h
rename to keyboards/qpockets/eggman/eggman.h
diff --git a/keyboards/eggman/info.json b/keyboards/qpockets/eggman/info.json
similarity index 100%
rename from keyboards/eggman/info.json
rename to keyboards/qpockets/eggman/info.json
diff --git a/keyboards/eggman/keymaps/default/config.h b/keyboards/qpockets/eggman/keymaps/default/config.h
similarity index 100%
rename from keyboards/eggman/keymaps/default/config.h
rename to keyboards/qpockets/eggman/keymaps/default/config.h
diff --git a/keyboards/eggman/keymaps/default/keymap.c b/keyboards/qpockets/eggman/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/eggman/keymaps/default/keymap.c
rename to keyboards/qpockets/eggman/keymaps/default/keymap.c
diff --git a/keyboards/eggman/keymaps/default/rules.mk b/keyboards/qpockets/eggman/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/eggman/keymaps/default/rules.mk
rename to keyboards/qpockets/eggman/keymaps/default/rules.mk
diff --git a/keyboards/eggman/readme.md b/keyboards/qpockets/eggman/readme.md
similarity index 88%
rename from keyboards/eggman/readme.md
rename to keyboards/qpockets/eggman/readme.md
index 156b4086fa..e0066fbe1f 100644
--- a/keyboards/eggman/readme.md
+++ b/keyboards/qpockets/eggman/readme.md
@@ -9,10 +9,10 @@ i am he and you are me
 
 Make example for this keyboard (after setting up your build environment):
 
-    make eggman:default
+    make qpockets/eggman:default
 
 Flashing example for this keyboard:
 
-    make eggman:default:flash
+    make qpockets/eggman:default:flash
 
 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/eggman/rules.mk b/keyboards/qpockets/eggman/rules.mk
similarity index 100%
rename from keyboards/eggman/rules.mk
rename to keyboards/qpockets/eggman/rules.mk
diff --git a/keyboards/space_space/readme.md b/keyboards/qpockets/space_space/readme.md
similarity index 88%
rename from keyboards/space_space/readme.md
rename to keyboards/qpockets/space_space/readme.md
index 08fa640f22..c84a583267 100644
--- a/keyboards/space_space/readme.md
+++ b/keyboards/qpockets/space_space/readme.md
@@ -9,10 +9,10 @@ Give your space some space
 
 Make example for this keyboard (after setting up your build environment):
 
-    make space_space/rev2:default
+    make qpockets/space_space/rev2:default
 
 Flashing example for this keyboard:
 
-    make space_space/rev2:default:flash
+    make qpockets/space_space/rev2:default:flash
 
 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/space_space/rev1/config.h b/keyboards/qpockets/space_space/rev1/config.h
similarity index 100%
rename from keyboards/space_space/rev1/config.h
rename to keyboards/qpockets/space_space/rev1/config.h
diff --git a/keyboards/space_space/rev1/info.json b/keyboards/qpockets/space_space/rev1/info.json
similarity index 100%
rename from keyboards/space_space/rev1/info.json
rename to keyboards/qpockets/space_space/rev1/info.json
diff --git a/keyboards/space_space/rev1/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/big_space/config.h
rename to keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
diff --git a/keyboards/space_space/rev1/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/big_space/keymap.c
rename to keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
diff --git a/keyboards/space_space/rev1/keymaps/big_space/rules.mk b/keyboards/qpockets/space_space/rev1/keymaps/big_space/rules.mk
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/big_space/rules.mk
rename to keyboards/qpockets/space_space/rev1/keymaps/big_space/rules.mk
diff --git a/keyboards/space_space/rev1/keymaps/default/config.h b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/default/config.h
rename to keyboards/qpockets/space_space/rev1/keymaps/default/config.h
diff --git a/keyboards/space_space/rev1/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/default/keymap.c
rename to keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
diff --git a/keyboards/space_space/rev1/keymaps/default/rules.mk b/keyboards/qpockets/space_space/rev1/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/default/rules.mk
rename to keyboards/qpockets/space_space/rev1/keymaps/default/rules.mk
diff --git a/keyboards/space_space/rev1/keymaps/readme.md b/keyboards/qpockets/space_space/rev1/keymaps/readme.md
similarity index 100%
rename from keyboards/space_space/rev1/keymaps/readme.md
rename to keyboards/qpockets/space_space/rev1/keymaps/readme.md
diff --git a/keyboards/space_space/rev1/readme.md b/keyboards/qpockets/space_space/rev1/readme.md
similarity index 100%
rename from keyboards/space_space/rev1/readme.md
rename to keyboards/qpockets/space_space/rev1/readme.md
diff --git a/keyboards/space_space/rev1/rev1.c b/keyboards/qpockets/space_space/rev1/rev1.c
similarity index 100%
rename from keyboards/space_space/rev1/rev1.c
rename to keyboards/qpockets/space_space/rev1/rev1.c
diff --git a/keyboards/space_space/rev1/rev1.h b/keyboards/qpockets/space_space/rev1/rev1.h
similarity index 100%
rename from keyboards/space_space/rev1/rev1.h
rename to keyboards/qpockets/space_space/rev1/rev1.h
diff --git a/keyboards/space_space/rev1/rules.mk b/keyboards/qpockets/space_space/rev1/rules.mk
similarity index 100%
rename from keyboards/space_space/rev1/rules.mk
rename to keyboards/qpockets/space_space/rev1/rules.mk
diff --git a/keyboards/space_space/rev2/config.h b/keyboards/qpockets/space_space/rev2/config.h
similarity index 100%
rename from keyboards/space_space/rev2/config.h
rename to keyboards/qpockets/space_space/rev2/config.h
diff --git a/keyboards/space_space/rev2/info.json b/keyboards/qpockets/space_space/rev2/info.json
similarity index 100%
rename from keyboards/space_space/rev2/info.json
rename to keyboards/qpockets/space_space/rev2/info.json
diff --git a/keyboards/space_space/rev2/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/big_space/config.h
rename to keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
diff --git a/keyboards/space_space/rev2/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/big_space/keymap.c
rename to keyboards/qpockets/space_space/rev2/keymaps/big_space/keymap.c
diff --git a/keyboards/space_space/rev2/keymaps/big_space/rules.mk b/keyboards/qpockets/space_space/rev2/keymaps/big_space/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/big_space/rules.mk
rename to keyboards/qpockets/space_space/rev2/keymaps/big_space/rules.mk
diff --git a/keyboards/space_space/rev2/keymaps/default/config.h b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/default/config.h
rename to keyboards/qpockets/space_space/rev2/keymaps/default/config.h
diff --git a/keyboards/space_space/rev2/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/default/keymap.c
rename to keyboards/qpockets/space_space/rev2/keymaps/default/keymap.c
diff --git a/keyboards/space_space/rev2/keymaps/default/rules.mk b/keyboards/qpockets/space_space/rev2/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/default/rules.mk
rename to keyboards/qpockets/space_space/rev2/keymaps/default/rules.mk
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/config.h b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/qpockets/config.h
rename to keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/keymap.c b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/qpockets/keymap.c
rename to keyboards/qpockets/space_space/rev2/keymaps/qpockets/keymap.c
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/rules.mk b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/keymaps/qpockets/rules.mk
rename to keyboards/qpockets/space_space/rev2/keymaps/qpockets/rules.mk
diff --git a/keyboards/space_space/rev2/readme.md b/keyboards/qpockets/space_space/rev2/readme.md
similarity index 100%
rename from keyboards/space_space/rev2/readme.md
rename to keyboards/qpockets/space_space/rev2/readme.md
diff --git a/keyboards/space_space/rev2/rev2.c b/keyboards/qpockets/space_space/rev2/rev2.c
similarity index 100%
rename from keyboards/space_space/rev2/rev2.c
rename to keyboards/qpockets/space_space/rev2/rev2.c
diff --git a/keyboards/space_space/rev2/rev2.h b/keyboards/qpockets/space_space/rev2/rev2.h
similarity index 100%
rename from keyboards/space_space/rev2/rev2.h
rename to keyboards/qpockets/space_space/rev2/rev2.h
diff --git a/keyboards/space_space/rev2/rules.mk b/keyboards/qpockets/space_space/rev2/rules.mk
similarity index 100%
rename from keyboards/space_space/rev2/rules.mk
rename to keyboards/qpockets/space_space/rev2/rules.mk
diff --git a/keyboards/qpockets/space_space/rules.mk b/keyboards/qpockets/space_space/rules.mk
new file mode 100644
index 0000000000..0ffe2efbf2
--- /dev/null
+++ b/keyboards/qpockets/space_space/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = qpockets/space_space/rev2
diff --git a/keyboards/wanten/config.h b/keyboards/qpockets/wanten/config.h
similarity index 100%
rename from keyboards/wanten/config.h
rename to keyboards/qpockets/wanten/config.h
diff --git a/keyboards/wanten/info.json b/keyboards/qpockets/wanten/info.json
similarity index 100%
rename from keyboards/wanten/info.json
rename to keyboards/qpockets/wanten/info.json
diff --git a/keyboards/wanten/keymaps/2u_bars/config.h b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
similarity index 100%
rename from keyboards/wanten/keymaps/2u_bars/config.h
rename to keyboards/qpockets/wanten/keymaps/2u_bars/config.h
diff --git a/keyboards/wanten/keymaps/2u_bars/keymap.c b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
similarity index 100%
rename from keyboards/wanten/keymaps/2u_bars/keymap.c
rename to keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
diff --git a/keyboards/wanten/keymaps/2u_bars/rules.mk b/keyboards/qpockets/wanten/keymaps/2u_bars/rules.mk
similarity index 100%
rename from keyboards/wanten/keymaps/2u_bars/rules.mk
rename to keyboards/qpockets/wanten/keymaps/2u_bars/rules.mk
diff --git a/keyboards/wanten/keymaps/625_bar/config.h b/keyboards/qpockets/wanten/keymaps/625_bar/config.h
similarity index 100%
rename from keyboards/wanten/keymaps/625_bar/config.h
rename to keyboards/qpockets/wanten/keymaps/625_bar/config.h
diff --git a/keyboards/wanten/keymaps/625_bar/keymap.c b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
similarity index 100%
rename from keyboards/wanten/keymaps/625_bar/keymap.c
rename to keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
diff --git a/keyboards/wanten/keymaps/625_bar/rules.mk b/keyboards/qpockets/wanten/keymaps/625_bar/rules.mk
similarity index 100%
rename from keyboards/wanten/keymaps/625_bar/rules.mk
rename to keyboards/qpockets/wanten/keymaps/625_bar/rules.mk
diff --git a/keyboards/wanten/keymaps/default/config.h b/keyboards/qpockets/wanten/keymaps/default/config.h
similarity index 100%
rename from keyboards/wanten/keymaps/default/config.h
rename to keyboards/qpockets/wanten/keymaps/default/config.h
diff --git a/keyboards/wanten/keymaps/default/keymap.c b/keyboards/qpockets/wanten/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/wanten/keymaps/default/keymap.c
rename to keyboards/qpockets/wanten/keymaps/default/keymap.c
diff --git a/keyboards/wanten/keymaps/default/readme.md b/keyboards/qpockets/wanten/keymaps/default/readme.md
similarity index 100%
rename from keyboards/wanten/keymaps/default/readme.md
rename to keyboards/qpockets/wanten/keymaps/default/readme.md
diff --git a/keyboards/wanten/keymaps/default/rules.mk b/keyboards/qpockets/wanten/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/wanten/keymaps/default/rules.mk
rename to keyboards/qpockets/wanten/keymaps/default/rules.mk
diff --git a/keyboards/wanten/readme.md b/keyboards/qpockets/wanten/readme.md
similarity index 93%
rename from keyboards/wanten/readme.md
rename to keyboards/qpockets/wanten/readme.md
index 90dd1ae132..243e949f34 100644
--- a/keyboards/wanten/readme.md
+++ b/keyboards/qpockets/wanten/readme.md
@@ -10,11 +10,11 @@ an ortho drop in PCB for Van cases
 
 Make example for this keyboard (after setting up your build environment):
 
-    make wanten:default
+    make qpockets/wanten:default
 
 Flashing example for this keyboard:
 
-    make wanten:default:flash
+    make qpockets/wanten:default:flash
 
 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/wanten/rules.mk b/keyboards/qpockets/wanten/rules.mk
similarity index 100%
rename from keyboards/wanten/rules.mk
rename to keyboards/qpockets/wanten/rules.mk
diff --git a/keyboards/wanten/wanten.c b/keyboards/qpockets/wanten/wanten.c
similarity index 100%
rename from keyboards/wanten/wanten.c
rename to keyboards/qpockets/wanten/wanten.c
diff --git a/keyboards/wanten/wanten.h b/keyboards/qpockets/wanten/wanten.h
similarity index 100%
rename from keyboards/wanten/wanten.h
rename to keyboards/qpockets/wanten/wanten.h
diff --git a/keyboards/space_space/rules.mk b/keyboards/space_space/rules.mk
deleted file mode 100644
index 2ca04be440..0000000000
--- a/keyboards/space_space/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = space_space/rev2