diff --git a/keyboards/pancake/feather/readme.md b/keyboards/pancake/feather/readme.md
deleted file mode 100644
index 8b137891791f..000000000000
--- a/keyboards/pancake/feather/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/pancake/keymaps/default/readme.md b/keyboards/pancake/keymaps/default/readme.md
deleted file mode 100644
index 8b137891791f..000000000000
--- a/keyboards/pancake/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/pancake/promicro/readme.md b/keyboards/pancake/promicro/readme.md
deleted file mode 100644
index 8b137891791f..000000000000
--- a/keyboards/pancake/promicro/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/2_milk/2_milk.c b/keyboards/spaceman/2_milk/2_milk.c
similarity index 100%
rename from keyboards/2_milk/2_milk.c
rename to keyboards/spaceman/2_milk/2_milk.c
diff --git a/keyboards/2_milk/2_milk.h b/keyboards/spaceman/2_milk/2_milk.h
similarity index 100%
rename from keyboards/2_milk/2_milk.h
rename to keyboards/spaceman/2_milk/2_milk.h
diff --git a/keyboards/2_milk/config.h b/keyboards/spaceman/2_milk/config.h
similarity index 97%
rename from keyboards/2_milk/config.h
rename to keyboards/spaceman/2_milk/config.h
index e9a104117b19..49211535d02a 100644
--- a/keyboards/2_milk/config.h
+++ b/keyboards/spaceman/2_milk/config.h
@@ -20,7 +20,7 @@
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0xB195
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    rionlion100
+#define MANUFACTURER    Spaceman
 #define PRODUCT         2% Milk
 #define DESCRIPTION     A milk themed 2% Keyboard
 
diff --git a/keyboards/2_milk/info.json b/keyboards/spaceman/2_milk/info.json
similarity index 84%
rename from keyboards/2_milk/info.json
rename to keyboards/spaceman/2_milk/info.json
index 6dc4eeaf8bfb..6c2bd78b2823 100644
--- a/keyboards/2_milk/info.json
+++ b/keyboards/spaceman/2_milk/info.json
@@ -2,7 +2,7 @@
   "keyboard_name": "2% Milk",
   "keyboard_folder": "2_milk",
   "url": "",
-  "maintainer": "rionlion100 (Spaceman)",
+  "maintainer": "Spaceman",
   "width": 1,
   "height": 2,
   "layouts": {
diff --git a/keyboards/2_milk/keymaps/binary/keymap.c b/keyboards/spaceman/2_milk/keymaps/binary/keymap.c
similarity index 100%
rename from keyboards/2_milk/keymaps/binary/keymap.c
rename to keyboards/spaceman/2_milk/keymaps/binary/keymap.c
diff --git a/keyboards/2_milk/keymaps/binary/readme.md b/keyboards/spaceman/2_milk/keymaps/binary/readme.md
similarity index 100%
rename from keyboards/2_milk/keymaps/binary/readme.md
rename to keyboards/spaceman/2_milk/keymaps/binary/readme.md
diff --git a/keyboards/2_milk/keymaps/copypasta/keymap.c b/keyboards/spaceman/2_milk/keymaps/copypasta/keymap.c
similarity index 100%
rename from keyboards/2_milk/keymaps/copypasta/keymap.c
rename to keyboards/spaceman/2_milk/keymaps/copypasta/keymap.c
diff --git a/keyboards/2_milk/keymaps/copypasta/readme.md b/keyboards/spaceman/2_milk/keymaps/copypasta/readme.md
similarity index 100%
rename from keyboards/2_milk/keymaps/copypasta/readme.md
rename to keyboards/spaceman/2_milk/keymaps/copypasta/readme.md
diff --git a/keyboards/2_milk/keymaps/default/keymap.c b/keyboards/spaceman/2_milk/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/2_milk/keymaps/default/keymap.c
rename to keyboards/spaceman/2_milk/keymaps/default/keymap.c
diff --git a/keyboards/2_milk/keymaps/default/readme.md b/keyboards/spaceman/2_milk/keymaps/default/readme.md
similarity index 100%
rename from keyboards/2_milk/keymaps/default/readme.md
rename to keyboards/spaceman/2_milk/keymaps/default/readme.md
diff --git a/keyboards/2_milk/keymaps/emoji/config.h b/keyboards/spaceman/2_milk/keymaps/emoji/config.h
similarity index 100%
rename from keyboards/2_milk/keymaps/emoji/config.h
rename to keyboards/spaceman/2_milk/keymaps/emoji/config.h
diff --git a/keyboards/2_milk/keymaps/emoji/keymap.c b/keyboards/spaceman/2_milk/keymaps/emoji/keymap.c
similarity index 100%
rename from keyboards/2_milk/keymaps/emoji/keymap.c
rename to keyboards/spaceman/2_milk/keymaps/emoji/keymap.c
diff --git a/keyboards/2_milk/keymaps/emoji/readme.md b/keyboards/spaceman/2_milk/keymaps/emoji/readme.md
similarity index 100%
rename from keyboards/2_milk/keymaps/emoji/readme.md
rename to keyboards/spaceman/2_milk/keymaps/emoji/readme.md
diff --git a/keyboards/2_milk/keymaps/emoji/rules.mk b/keyboards/spaceman/2_milk/keymaps/emoji/rules.mk
similarity index 100%
rename from keyboards/2_milk/keymaps/emoji/rules.mk
rename to keyboards/spaceman/2_milk/keymaps/emoji/rules.mk
diff --git a/keyboards/2_milk/keymaps/excessbread/keymap.c b/keyboards/spaceman/2_milk/keymaps/excessbread/keymap.c
similarity index 100%
rename from keyboards/2_milk/keymaps/excessbread/keymap.c
rename to keyboards/spaceman/2_milk/keymaps/excessbread/keymap.c
diff --git a/keyboards/2_milk/keymaps/excessbread/readme.md b/keyboards/spaceman/2_milk/keymaps/excessbread/readme.md
similarity index 100%
rename from keyboards/2_milk/keymaps/excessbread/readme.md
rename to keyboards/spaceman/2_milk/keymaps/excessbread/readme.md
diff --git a/keyboards/2_milk/keymaps/mikethetiger/keymap.c b/keyboards/spaceman/2_milk/keymaps/mikethetiger/keymap.c
similarity index 100%
rename from keyboards/2_milk/keymaps/mikethetiger/keymap.c
rename to keyboards/spaceman/2_milk/keymaps/mikethetiger/keymap.c
diff --git a/keyboards/2_milk/keymaps/mikethetiger/readme.md b/keyboards/spaceman/2_milk/keymaps/mikethetiger/readme.md
similarity index 100%
rename from keyboards/2_milk/keymaps/mikethetiger/readme.md
rename to keyboards/spaceman/2_milk/keymaps/mikethetiger/readme.md
diff --git a/keyboards/2_milk/keymaps/mikethetiger/rules.mk b/keyboards/spaceman/2_milk/keymaps/mikethetiger/rules.mk
similarity index 100%
rename from keyboards/2_milk/keymaps/mikethetiger/rules.mk
rename to keyboards/spaceman/2_milk/keymaps/mikethetiger/rules.mk
diff --git a/keyboards/2_milk/keymaps/mouse/keymap.c b/keyboards/spaceman/2_milk/keymaps/mouse/keymap.c
similarity index 100%
rename from keyboards/2_milk/keymaps/mouse/keymap.c
rename to keyboards/spaceman/2_milk/keymaps/mouse/keymap.c
diff --git a/keyboards/2_milk/keymaps/mouse/readme.md b/keyboards/spaceman/2_milk/keymaps/mouse/readme.md
similarity index 100%
rename from keyboards/2_milk/keymaps/mouse/readme.md
rename to keyboards/spaceman/2_milk/keymaps/mouse/readme.md
diff --git a/keyboards/2_milk/readme.md b/keyboards/spaceman/2_milk/readme.md
similarity index 70%
rename from keyboards/2_milk/readme.md
rename to keyboards/spaceman/2_milk/readme.md
index f3a85458cedd..6745aa65c8e4 100644
--- a/keyboards/2_milk/readme.md
+++ b/keyboards/spaceman/2_milk/readme.md
@@ -4,12 +4,12 @@
 
 A 2% Meme board themed around a milk carton
 
-Keyboard Maintainer: Spaceman AKA:[Rionlion100](https://github.com/rionlion100)  
-Hardware Availability: [Open Source](https://github.com/Rionlion100/Spaceboards/tree/master/Keyboards/2%25%20Milk)
+Keyboard Maintainer: [Spaceman](https://github.com/Spaceman)
+Hardware Availability: [Open Source](https://github.com/Spaceman/Spaceboards/tree/master/Keyboards/2%25%20Milk)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 2_milk:default
+    make spaceman/2_milk: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/2_milk/rules.mk b/keyboards/spaceman/2_milk/rules.mk
similarity index 100%
rename from keyboards/2_milk/rules.mk
rename to keyboards/spaceman/2_milk/rules.mk
diff --git a/keyboards/pancake/config.h b/keyboards/spaceman/pancake/config.h
similarity index 100%
rename from keyboards/pancake/config.h
rename to keyboards/spaceman/pancake/config.h
diff --git a/keyboards/pancake/feather/config.h b/keyboards/spaceman/pancake/feather/config.h
similarity index 100%
rename from keyboards/pancake/feather/config.h
rename to keyboards/spaceman/pancake/feather/config.h
diff --git a/keyboards/pancake/feather/rules.mk b/keyboards/spaceman/pancake/feather/rules.mk
similarity index 100%
rename from keyboards/pancake/feather/rules.mk
rename to keyboards/spaceman/pancake/feather/rules.mk
diff --git a/keyboards/pancake/info.json b/keyboards/spaceman/pancake/info.json
similarity index 98%
rename from keyboards/pancake/info.json
rename to keyboards/spaceman/pancake/info.json
index 6d2b2a9bb407..9a21f09e18bf 100644
--- a/keyboards/pancake/info.json
+++ b/keyboards/spaceman/pancake/info.json
@@ -2,7 +2,7 @@
   "keyboard_name": "Pancake",
   "keyboard_folder": "Pancake",
   "url": "",
-  "maintainer": "rionlion100 (Spaceman)",
+  "maintainer": "Spaceman",
   "width": 12,
   "height": 4,
   "layouts": {
diff --git a/keyboards/pancake/keymaps/default/keymap.c b/keyboards/spaceman/pancake/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pancake/keymaps/default/keymap.c
rename to keyboards/spaceman/pancake/keymaps/default/keymap.c
diff --git a/keyboards/spaceman/pancake/keymaps/default/readme.md b/keyboards/spaceman/pancake/keymaps/default/readme.md
new file mode 100644
index 000000000000..7eb8cc6d8d69
--- /dev/null
+++ b/keyboards/spaceman/pancake/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default keymap for Pancake
+
+designed by: Spaceman
diff --git a/keyboards/pancake/pancake.c b/keyboards/spaceman/pancake/pancake.c
similarity index 100%
rename from keyboards/pancake/pancake.c
rename to keyboards/spaceman/pancake/pancake.c
diff --git a/keyboards/pancake/pancake.h b/keyboards/spaceman/pancake/pancake.h
similarity index 100%
rename from keyboards/pancake/pancake.h
rename to keyboards/spaceman/pancake/pancake.h
diff --git a/keyboards/pancake/promicro/config.h b/keyboards/spaceman/pancake/promicro/config.h
similarity index 100%
rename from keyboards/pancake/promicro/config.h
rename to keyboards/spaceman/pancake/promicro/config.h
diff --git a/keyboards/pancake/promicro/rules.mk b/keyboards/spaceman/pancake/promicro/rules.mk
similarity index 100%
rename from keyboards/pancake/promicro/rules.mk
rename to keyboards/spaceman/pancake/promicro/rules.mk
diff --git a/keyboards/pancake/readme.md b/keyboards/spaceman/pancake/readme.md
similarity index 82%
rename from keyboards/pancake/readme.md
rename to keyboards/spaceman/pancake/readme.md
index 3e3125f4d7a7..34cf6382bcb4 100644
--- a/keyboards/pancake/readme.md
+++ b/keyboards/spaceman/pancake/readme.md
@@ -2,11 +2,11 @@
 
 Ortho 40% Ortho Keyboard with an option for the adafruit feather
 
-Keyboard Maintainer: Spaceman AKA:[Rionlion100](https://github.com/rionlion100)  
+Keyboard Maintainer: [Spaceman](https://github.com/Spaceman)
 Hardware Availability: [GB](https://geekhack.org/index.php?topic=101371.0)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make pancake:default
+    make spaceman/pancake: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).