diff --git a/keyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c
similarity index 100%
rename from keyboards/1up60hse/1up60hse.c
rename to keyboards/1upkeyboards/1up60hse/1up60hse.c
diff --git a/keyboards/1up60hse/1up60hse.h b/keyboards/1upkeyboards/1up60hse/1up60hse.h
similarity index 100%
rename from keyboards/1up60hse/1up60hse.h
rename to keyboards/1upkeyboards/1up60hse/1up60hse.h
diff --git a/keyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
similarity index 100%
rename from keyboards/1up60hse/config.h
rename to keyboards/1upkeyboards/1up60hse/config.h
diff --git a/keyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
similarity index 100%
rename from keyboards/1up60hse/info.json
rename to keyboards/1upkeyboards/1up60hse/info.json
diff --git a/keyboards/1up60hse/keymaps/default/config.h b/keyboards/1upkeyboards/1up60hse/keymaps/default/config.h
similarity index 100%
rename from keyboards/1up60hse/keymaps/default/config.h
rename to keyboards/1upkeyboards/1up60hse/keymaps/default/config.h
diff --git a/keyboards/1up60hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/1up60hse/keymaps/default/keymap.c
rename to keyboards/1upkeyboards/1up60hse/keymaps/default/keymap.c
diff --git a/keyboards/1up60hse/keymaps/default/readme.md b/keyboards/1upkeyboards/1up60hse/keymaps/default/readme.md
similarity index 100%
rename from keyboards/1up60hse/keymaps/default/readme.md
rename to keyboards/1upkeyboards/1up60hse/keymaps/default/readme.md
diff --git a/keyboards/1up60hse/readme.md b/keyboards/1upkeyboards/1up60hse/readme.md
similarity index 100%
rename from keyboards/1up60hse/readme.md
rename to keyboards/1upkeyboards/1up60hse/readme.md
diff --git a/keyboards/1up60hse/rules.mk b/keyboards/1upkeyboards/1up60hse/rules.mk
similarity index 100%
rename from keyboards/1up60hse/rules.mk
rename to keyboards/1upkeyboards/1up60hse/rules.mk
diff --git a/keyboards/1up60rgb/1up60rgb.c b/keyboards/1upkeyboards/1up60rgb/1up60rgb.c
similarity index 100%
rename from keyboards/1up60rgb/1up60rgb.c
rename to keyboards/1upkeyboards/1up60rgb/1up60rgb.c
diff --git a/keyboards/1up60rgb/1up60rgb.h b/keyboards/1upkeyboards/1up60rgb/1up60rgb.h
similarity index 100%
rename from keyboards/1up60rgb/1up60rgb.h
rename to keyboards/1upkeyboards/1up60rgb/1up60rgb.h
diff --git a/keyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
similarity index 100%
rename from keyboards/1up60rgb/config.h
rename to keyboards/1upkeyboards/1up60rgb/config.h
diff --git a/keyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
similarity index 100%
rename from keyboards/1up60rgb/info.json
rename to keyboards/1upkeyboards/1up60rgb/info.json
diff --git a/keyboards/1up60rgb/keymaps/default/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/1up60rgb/keymaps/default/keymap.c
rename to keyboards/1upkeyboards/1up60rgb/keymaps/default/keymap.c
diff --git a/keyboards/1up60rgb/keymaps/iso/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
similarity index 100%
rename from keyboards/1up60rgb/keymaps/iso/keymap.c
rename to keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
diff --git a/keyboards/1up60rgb/keymaps/raffle/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
similarity index 100%
rename from keyboards/1up60rgb/keymaps/raffle/keymap.c
rename to keyboards/1upkeyboards/1up60rgb/keymaps/raffle/keymap.c
diff --git a/keyboards/1up60rgb/keymaps/raffle/readme.md b/keyboards/1upkeyboards/1up60rgb/keymaps/raffle/readme.md
similarity index 100%
rename from keyboards/1up60rgb/keymaps/raffle/readme.md
rename to keyboards/1upkeyboards/1up60rgb/keymaps/raffle/readme.md
diff --git a/keyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
similarity index 100%
rename from keyboards/1up60rgb/keymaps/tsangan/keymap.c
rename to keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
diff --git a/keyboards/1up60rgb/readme.md b/keyboards/1upkeyboards/1up60rgb/readme.md
similarity index 100%
rename from keyboards/1up60rgb/readme.md
rename to keyboards/1upkeyboards/1up60rgb/readme.md
diff --git a/keyboards/1up60rgb/rules.mk b/keyboards/1upkeyboards/1up60rgb/rules.mk
similarity index 100%
rename from keyboards/1up60rgb/rules.mk
rename to keyboards/1upkeyboards/1up60rgb/rules.mk
diff --git a/keyboards/1upkeyboards/readme.md b/keyboards/1upkeyboards/readme.md
new file mode 100644
index 000000000..4f075d827
--- /dev/null
+++ b/keyboards/1upkeyboards/readme.md
@@ -0,0 +1,5 @@
+# 1UP Keyboards
+
+Website: [1UP Keyboards](https://www.1upkeyboards.com/)  
+Discord: [Server Invite](https://discordapp.com/invite/c6SYn8)  
+YouTube: [skiwithpete](https://www.youtube.com/user/skiwithpete)  
\ No newline at end of file
diff --git a/keyboards/sweet16/config.h b/keyboards/1upkeyboards/sweet16/config.h
similarity index 100%
rename from keyboards/sweet16/config.h
rename to keyboards/1upkeyboards/sweet16/config.h
diff --git a/keyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json
similarity index 100%
rename from keyboards/sweet16/info.json
rename to keyboards/1upkeyboards/sweet16/info.json
diff --git a/keyboards/sweet16/keymaps/default/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/sweet16/keymaps/default/keymap.c
rename to keyboards/1upkeyboards/sweet16/keymaps/default/keymap.c
diff --git a/keyboards/sweet16/keymaps/dlaroe/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
similarity index 100%
rename from keyboards/sweet16/keymaps/dlaroe/keymap.c
rename to keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
diff --git a/keyboards/sweet16/keymaps/dlaroe/readme.md b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/readme.md
similarity index 100%
rename from keyboards/sweet16/keymaps/dlaroe/readme.md
rename to keyboards/1upkeyboards/sweet16/keymaps/dlaroe/readme.md
diff --git a/keyboards/sweet16/readme.md b/keyboards/1upkeyboards/sweet16/readme.md
similarity index 100%
rename from keyboards/sweet16/readme.md
rename to keyboards/1upkeyboards/sweet16/readme.md
diff --git a/keyboards/sweet16/rules.mk b/keyboards/1upkeyboards/sweet16/rules.mk
similarity index 100%
rename from keyboards/sweet16/rules.mk
rename to keyboards/1upkeyboards/sweet16/rules.mk
diff --git a/keyboards/sweet16/sweet16.c b/keyboards/1upkeyboards/sweet16/sweet16.c
similarity index 100%
rename from keyboards/sweet16/sweet16.c
rename to keyboards/1upkeyboards/sweet16/sweet16.c
diff --git a/keyboards/sweet16/sweet16.h b/keyboards/1upkeyboards/sweet16/sweet16.h
similarity index 100%
rename from keyboards/sweet16/sweet16.h
rename to keyboards/1upkeyboards/sweet16/sweet16.h