diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 059a5acd38f..f2c382c9237 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -951,6 +951,12 @@
     "launchpad/rev1": {
         "target": "maple_computing/launchpad/rev1"
     },
+    "lefty": {
+        "target": "smoll/lefty/rev2"
+    },
+    "lefty/rev1": {
+        "target": "smoll/lefty/rev1"
+    },
     "lck75": {
         "target": "lyso1/lck75"
     },
@@ -1104,6 +1110,9 @@
     "pursuit40": {
         "target": "checkerboards/pursuit40"
     },
+    "pw88": {
+        "target": "smoll/pw88"
+    },
     "qaz": {
         "target": "tominabox1/qaz"
     },
diff --git a/keyboards/lefty/config.h b/keyboards/smoll/lefty/config.h
similarity index 100%
rename from keyboards/lefty/config.h
rename to keyboards/smoll/lefty/config.h
diff --git a/keyboards/lefty/info.json b/keyboards/smoll/lefty/info.json
similarity index 100%
rename from keyboards/lefty/info.json
rename to keyboards/smoll/lefty/info.json
diff --git a/keyboards/lefty/keymaps/default/keymap.c b/keyboards/smoll/lefty/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/lefty/keymaps/default/keymap.c
rename to keyboards/smoll/lefty/keymaps/default/keymap.c
diff --git a/keyboards/lefty/keymaps/via/keymap.c b/keyboards/smoll/lefty/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/lefty/keymaps/via/keymap.c
rename to keyboards/smoll/lefty/keymaps/via/keymap.c
diff --git a/keyboards/lefty/keymaps/via/rules.mk b/keyboards/smoll/lefty/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/lefty/keymaps/via/rules.mk
rename to keyboards/smoll/lefty/keymaps/via/rules.mk
diff --git a/keyboards/lefty/lefty.c b/keyboards/smoll/lefty/lefty.c
similarity index 100%
rename from keyboards/lefty/lefty.c
rename to keyboards/smoll/lefty/lefty.c
diff --git a/keyboards/lefty/readme.md b/keyboards/smoll/lefty/readme.md
similarity index 100%
rename from keyboards/lefty/readme.md
rename to keyboards/smoll/lefty/readme.md
diff --git a/keyboards/lefty/rev1/info.json b/keyboards/smoll/lefty/rev1/info.json
similarity index 100%
rename from keyboards/lefty/rev1/info.json
rename to keyboards/smoll/lefty/rev1/info.json
diff --git a/keyboards/lefty/rev1/rules.mk b/keyboards/smoll/lefty/rev1/rules.mk
similarity index 100%
rename from keyboards/lefty/rev1/rules.mk
rename to keyboards/smoll/lefty/rev1/rules.mk
diff --git a/keyboards/lefty/rev2/info.json b/keyboards/smoll/lefty/rev2/info.json
similarity index 100%
rename from keyboards/lefty/rev2/info.json
rename to keyboards/smoll/lefty/rev2/info.json
diff --git a/keyboards/lefty/rev2/rules.mk b/keyboards/smoll/lefty/rev2/rules.mk
similarity index 100%
rename from keyboards/lefty/rev2/rules.mk
rename to keyboards/smoll/lefty/rev2/rules.mk
diff --git a/keyboards/lefty/rules.mk b/keyboards/smoll/lefty/rules.mk
similarity index 94%
rename from keyboards/lefty/rules.mk
rename to keyboards/smoll/lefty/rules.mk
index bbf738e03bb..d8d08e502c8 100644
--- a/keyboards/lefty/rules.mk
+++ b/keyboards/smoll/lefty/rules.mk
@@ -14,4 +14,4 @@ LTO_ENABLE = yes
 
 OLED_ENABLE = yes
 
-DEFAULT_FOLDER = lefty/rev2
+DEFAULT_FOLDER = smoll/lefty/rev2
diff --git a/keyboards/pw88/config.h b/keyboards/smoll/pw88/config.h
similarity index 100%
rename from keyboards/pw88/config.h
rename to keyboards/smoll/pw88/config.h
diff --git a/keyboards/pw88/info.json b/keyboards/smoll/pw88/info.json
similarity index 100%
rename from keyboards/pw88/info.json
rename to keyboards/smoll/pw88/info.json
diff --git a/keyboards/pw88/keymaps/default/keymap.c b/keyboards/smoll/pw88/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/pw88/keymaps/default/keymap.c
rename to keyboards/smoll/pw88/keymaps/default/keymap.c
diff --git a/keyboards/pw88/keymaps/via/keymap.c b/keyboards/smoll/pw88/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/pw88/keymaps/via/keymap.c
rename to keyboards/smoll/pw88/keymaps/via/keymap.c
diff --git a/keyboards/pw88/keymaps/via/rules.mk b/keyboards/smoll/pw88/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/pw88/keymaps/via/rules.mk
rename to keyboards/smoll/pw88/keymaps/via/rules.mk
diff --git a/keyboards/pw88/readme.md b/keyboards/smoll/pw88/readme.md
similarity index 100%
rename from keyboards/pw88/readme.md
rename to keyboards/smoll/pw88/readme.md
diff --git a/keyboards/pw88/rules.mk b/keyboards/smoll/pw88/rules.mk
similarity index 100%
rename from keyboards/pw88/rules.mk
rename to keyboards/smoll/pw88/rules.mk