diff --git a/keyboards/arch_36/arch_36.c b/keyboards/obosob/arch_36/arch_36.c
similarity index 100%
rename from keyboards/arch_36/arch_36.c
rename to keyboards/obosob/arch_36/arch_36.c
diff --git a/keyboards/arch_36/arch_36.h b/keyboards/obosob/arch_36/arch_36.h
similarity index 100%
rename from keyboards/arch_36/arch_36.h
rename to keyboards/obosob/arch_36/arch_36.h
diff --git a/keyboards/arch_36/config.h b/keyboards/obosob/arch_36/config.h
similarity index 100%
rename from keyboards/arch_36/config.h
rename to keyboards/obosob/arch_36/config.h
diff --git a/keyboards/arch_36/info.json b/keyboards/obosob/arch_36/info.json
similarity index 100%
rename from keyboards/arch_36/info.json
rename to keyboards/obosob/arch_36/info.json
diff --git a/keyboards/arch_36/keymaps/default/keymap.c b/keyboards/obosob/arch_36/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/arch_36/keymaps/default/keymap.c
rename to keyboards/obosob/arch_36/keymaps/default/keymap.c
diff --git a/keyboards/arch_36/keymaps/obosob/config.h b/keyboards/obosob/arch_36/keymaps/obosob/config.h
similarity index 100%
rename from keyboards/arch_36/keymaps/obosob/config.h
rename to keyboards/obosob/arch_36/keymaps/obosob/config.h
diff --git a/keyboards/arch_36/keymaps/obosob/keymap.c b/keyboards/obosob/arch_36/keymaps/obosob/keymap.c
similarity index 100%
rename from keyboards/arch_36/keymaps/obosob/keymap.c
rename to keyboards/obosob/arch_36/keymaps/obosob/keymap.c
diff --git a/keyboards/arch_36/keymaps/obosob/readme.md b/keyboards/obosob/arch_36/keymaps/obosob/readme.md
similarity index 100%
rename from keyboards/arch_36/keymaps/obosob/readme.md
rename to keyboards/obosob/arch_36/keymaps/obosob/readme.md
diff --git a/keyboards/arch_36/keymaps/obosob/rules.mk b/keyboards/obosob/arch_36/keymaps/obosob/rules.mk
similarity index 100%
rename from keyboards/arch_36/keymaps/obosob/rules.mk
rename to keyboards/obosob/arch_36/keymaps/obosob/rules.mk
diff --git a/keyboards/arch_36/readme.md b/keyboards/obosob/arch_36/readme.md
similarity index 88%
rename from keyboards/arch_36/readme.md
rename to keyboards/obosob/arch_36/readme.md
index d0e16434ee..77c07a2a3b 100644
--- a/keyboards/arch_36/readme.md
+++ b/keyboards/obosob/arch_36/readme.md
@@ -7,10 +7,10 @@ An ergonomic 30% split keyboard
 
 Make example for this keyboard (after setting up your build environment):
 
-    make arch_36:default
+    make obosob/arch_36:default
 
 Example of flashing this keyboard:
 
-    make arch_36:default:flash
+    make obosob/arch_36: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/arch_36/rules.mk b/keyboards/obosob/arch_36/rules.mk
similarity index 100%
rename from keyboards/arch_36/rules.mk
rename to keyboards/obosob/arch_36/rules.mk
diff --git a/keyboards/steal_this_keyboard/config.h b/keyboards/obosob/steal_this_keyboard/config.h
similarity index 100%
rename from keyboards/steal_this_keyboard/config.h
rename to keyboards/obosob/steal_this_keyboard/config.h
diff --git a/keyboards/steal_this_keyboard/info.json b/keyboards/obosob/steal_this_keyboard/info.json
similarity index 100%
rename from keyboards/steal_this_keyboard/info.json
rename to keyboards/obosob/steal_this_keyboard/info.json
diff --git a/keyboards/steal_this_keyboard/keymaps/default/config.h b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
similarity index 100%
rename from keyboards/steal_this_keyboard/keymaps/default/config.h
rename to keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
diff --git a/keyboards/steal_this_keyboard/keymaps/default/keymap.c b/keyboards/obosob/steal_this_keyboard/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/steal_this_keyboard/keymaps/default/keymap.c
rename to keyboards/obosob/steal_this_keyboard/keymaps/default/keymap.c
diff --git a/keyboards/steal_this_keyboard/readme.md b/keyboards/obosob/steal_this_keyboard/readme.md
similarity index 93%
rename from keyboards/steal_this_keyboard/readme.md
rename to keyboards/obosob/steal_this_keyboard/readme.md
index 395487f7b3..55384a9234 100644
--- a/keyboards/steal_this_keyboard/readme.md
+++ b/keyboards/obosob/steal_this_keyboard/readme.md
@@ -6,6 +6,6 @@ A split 34 keys column staggered keyboard named and decorated after the System o
 
 Make examples for this keyboard (after setting up your build environment):
 
-    make steal_this_keyboard:default
+    make obosob/steal_this_keyboard: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/steal_this_keyboard/rules.mk b/keyboards/obosob/steal_this_keyboard/rules.mk
similarity index 100%
rename from keyboards/steal_this_keyboard/rules.mk
rename to keyboards/obosob/steal_this_keyboard/rules.mk
diff --git a/keyboards/steal_this_keyboard/steal_this_keyboard.c b/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c
similarity index 100%
rename from keyboards/steal_this_keyboard/steal_this_keyboard.c
rename to keyboards/obosob/steal_this_keyboard/steal_this_keyboard.c
diff --git a/keyboards/steal_this_keyboard/steal_this_keyboard.h b/keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h
similarity index 100%
rename from keyboards/steal_this_keyboard/steal_this_keyboard.h
rename to keyboards/obosob/steal_this_keyboard/steal_this_keyboard.h