diff --git a/keyboards/7skb/.noci b/keyboards/salicylic_acid3/7skb/.noci
similarity index 100%
rename from keyboards/7skb/.noci
rename to keyboards/salicylic_acid3/7skb/.noci
diff --git a/keyboards/7skb/7skb.c b/keyboards/salicylic_acid3/7skb/7skb.c
similarity index 100%
rename from keyboards/7skb/7skb.c
rename to keyboards/salicylic_acid3/7skb/7skb.c
diff --git a/keyboards/7skb/7skb.h b/keyboards/salicylic_acid3/7skb/7skb.h
similarity index 60%
rename from keyboards/7skb/7skb.h
rename to keyboards/salicylic_acid3/7skb/7skb.h
index 9e23d0ad3c5e..5043a467478b 100644
--- a/keyboards/7skb/7skb.h
+++ b/keyboards/salicylic_acid3/7skb/7skb.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_7skb_rev1
+#ifdef KEYBOARD_salicylic_acid3_7skb_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/7skb/config.h b/keyboards/salicylic_acid3/7skb/config.h
similarity index 100%
rename from keyboards/7skb/config.h
rename to keyboards/salicylic_acid3/7skb/config.h
diff --git a/keyboards/7skb/info.json b/keyboards/salicylic_acid3/7skb/info.json
similarity index 100%
rename from keyboards/7skb/info.json
rename to keyboards/salicylic_acid3/7skb/info.json
diff --git a/keyboards/7skb/keymaps/default/config.h b/keyboards/salicylic_acid3/7skb/keymaps/default/config.h
similarity index 100%
rename from keyboards/7skb/keymaps/default/config.h
rename to keyboards/salicylic_acid3/7skb/keymaps/default/config.h
diff --git a/keyboards/7skb/keymaps/default/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/7skb/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/7skb/keymaps/default/keymap.c
diff --git a/keyboards/7skb/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/7skb/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/7skb/keymaps/salicylic/config.h
diff --git a/keyboards/7skb/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/7skb/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/7skb/keymaps/salicylic/keymap.c
diff --git a/keyboards/7skb/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/7skb/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/7skb/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/7skb/keymaps/salicylic/rules.mk
diff --git a/keyboards/7skb/keymaps/via/keymap.c b/keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/7skb/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/7skb/keymaps/via/keymap.c
diff --git a/keyboards/7skb/keymaps/via/readme.md b/keyboards/salicylic_acid3/7skb/keymaps/via/readme.md
similarity index 100%
rename from keyboards/7skb/keymaps/via/readme.md
rename to keyboards/salicylic_acid3/7skb/keymaps/via/readme.md
diff --git a/keyboards/7skb/keymaps/via/rules.mk b/keyboards/salicylic_acid3/7skb/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/7skb/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/7skb/keymaps/via/rules.mk
diff --git a/keyboards/7skb/readme.md b/keyboards/salicylic_acid3/7skb/readme.md
similarity index 95%
rename from keyboards/7skb/readme.md
rename to keyboards/salicylic_acid3/7skb/readme.md
index 18e4eef3ea80..a3077f068a6f 100644
--- a/keyboards/7skb/readme.md
+++ b/keyboards/salicylic_acid3/7skb/readme.md
@@ -10,7 +10,7 @@ This is 63 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 7skb:default
+    make salicylic_acid3/7skb/rev1: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/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h
similarity index 100%
rename from keyboards/7skb/rev1/config.h
rename to keyboards/salicylic_acid3/7skb/rev1/config.h
diff --git a/keyboards/7skb/rev1/rev1.c b/keyboards/salicylic_acid3/7skb/rev1/rev1.c
similarity index 100%
rename from keyboards/7skb/rev1/rev1.c
rename to keyboards/salicylic_acid3/7skb/rev1/rev1.c
diff --git a/keyboards/7skb/rev1/rev1.h b/keyboards/salicylic_acid3/7skb/rev1/rev1.h
similarity index 100%
rename from keyboards/7skb/rev1/rev1.h
rename to keyboards/salicylic_acid3/7skb/rev1/rev1.h
diff --git a/keyboards/7skb/rev1/rules.mk b/keyboards/salicylic_acid3/7skb/rev1/rules.mk
similarity index 100%
rename from keyboards/7skb/rev1/rules.mk
rename to keyboards/salicylic_acid3/7skb/rev1/rules.mk
diff --git a/keyboards/7skb/rules.mk b/keyboards/salicylic_acid3/7skb/rules.mk
similarity index 100%
rename from keyboards/7skb/rules.mk
rename to keyboards/salicylic_acid3/7skb/rules.mk
diff --git a/keyboards/7splus/7splus.c b/keyboards/salicylic_acid3/7splus/7splus.c
similarity index 100%
rename from keyboards/7splus/7splus.c
rename to keyboards/salicylic_acid3/7splus/7splus.c
diff --git a/keyboards/7splus/7splus.h b/keyboards/salicylic_acid3/7splus/7splus.h
similarity index 100%
rename from keyboards/7splus/7splus.h
rename to keyboards/salicylic_acid3/7splus/7splus.h
diff --git a/keyboards/7splus/config.h b/keyboards/salicylic_acid3/7splus/config.h
similarity index 100%
rename from keyboards/7splus/config.h
rename to keyboards/salicylic_acid3/7splus/config.h
diff --git a/keyboards/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json
similarity index 100%
rename from keyboards/7splus/info.json
rename to keyboards/salicylic_acid3/7splus/info.json
diff --git a/keyboards/7splus/keymaps/default/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/7splus/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/7splus/keymaps/default/keymap.c
diff --git a/keyboards/7splus/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/7splus/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/7splus/keymaps/salicylic/config.h
diff --git a/keyboards/7splus/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/7splus/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/7splus/keymaps/salicylic/keymap.c
diff --git a/keyboards/7splus/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/7splus/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/7splus/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/7splus/keymaps/salicylic/rules.mk
diff --git a/keyboards/7splus/keymaps/via/config.h b/keyboards/salicylic_acid3/7splus/keymaps/via/config.h
similarity index 100%
rename from keyboards/7splus/keymaps/via/config.h
rename to keyboards/salicylic_acid3/7splus/keymaps/via/config.h
diff --git a/keyboards/7splus/keymaps/via/keymap.c b/keyboards/salicylic_acid3/7splus/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/7splus/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/7splus/keymaps/via/keymap.c
diff --git a/keyboards/7splus/keymaps/via/rules.mk b/keyboards/salicylic_acid3/7splus/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/7splus/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/7splus/keymaps/via/rules.mk
diff --git a/keyboards/7splus/readme.md b/keyboards/salicylic_acid3/7splus/readme.md
similarity index 95%
rename from keyboards/7splus/readme.md
rename to keyboards/salicylic_acid3/7splus/readme.md
index a73359524969..ef6820a18835 100644
--- a/keyboards/7splus/readme.md
+++ b/keyboards/salicylic_acid3/7splus/readme.md
@@ -10,7 +10,7 @@ This is 85 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 7splus:default
+    make salicylic_acid3/7splus: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/7splus/rules.mk b/keyboards/salicylic_acid3/7splus/rules.mk
similarity index 100%
rename from keyboards/7splus/rules.mk
rename to keyboards/salicylic_acid3/7splus/rules.mk
diff --git a/keyboards/ajisai74/ajisai74.c b/keyboards/salicylic_acid3/ajisai74/ajisai74.c
similarity index 100%
rename from keyboards/ajisai74/ajisai74.c
rename to keyboards/salicylic_acid3/ajisai74/ajisai74.c
diff --git a/keyboards/ajisai74/ajisai74.h b/keyboards/salicylic_acid3/ajisai74/ajisai74.h
similarity index 100%
rename from keyboards/ajisai74/ajisai74.h
rename to keyboards/salicylic_acid3/ajisai74/ajisai74.h
diff --git a/keyboards/ajisai74/config.h b/keyboards/salicylic_acid3/ajisai74/config.h
similarity index 100%
rename from keyboards/ajisai74/config.h
rename to keyboards/salicylic_acid3/ajisai74/config.h
diff --git a/keyboards/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json
similarity index 100%
rename from keyboards/ajisai74/info.json
rename to keyboards/salicylic_acid3/ajisai74/info.json
diff --git a/keyboards/ajisai74/keymaps/default/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/default/config.h
similarity index 100%
rename from keyboards/ajisai74/keymaps/default/config.h
rename to keyboards/salicylic_acid3/ajisai74/keymaps/default/config.h
diff --git a/keyboards/ajisai74/keymaps/default/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ajisai74/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/ajisai74/keymaps/default/keymap.c
diff --git a/keyboards/ajisai74/keymaps/jis/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/config.h
similarity index 100%
rename from keyboards/ajisai74/keymaps/jis/config.h
rename to keyboards/salicylic_acid3/ajisai74/keymaps/jis/config.h
diff --git a/keyboards/ajisai74/keymaps/jis/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
similarity index 100%
rename from keyboards/ajisai74/keymaps/jis/keymap.c
rename to keyboards/salicylic_acid3/ajisai74/keymaps/jis/keymap.c
diff --git a/keyboards/ajisai74/keymaps/jis/rules.mk b/keyboards/salicylic_acid3/ajisai74/keymaps/jis/rules.mk
similarity index 100%
rename from keyboards/ajisai74/keymaps/jis/rules.mk
rename to keyboards/salicylic_acid3/ajisai74/keymaps/jis/rules.mk
diff --git a/keyboards/ajisai74/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/ajisai74/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/config.h
diff --git a/keyboards/ajisai74/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/ajisai74/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/keymap.c
diff --git a/keyboards/ajisai74/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/ajisai74/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/ajisai74/keymaps/salicylic/rules.mk
diff --git a/keyboards/ajisai74/keymaps/via/config.h b/keyboards/salicylic_acid3/ajisai74/keymaps/via/config.h
similarity index 100%
rename from keyboards/ajisai74/keymaps/via/config.h
rename to keyboards/salicylic_acid3/ajisai74/keymaps/via/config.h
diff --git a/keyboards/ajisai74/keymaps/via/keymap.c b/keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ajisai74/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/ajisai74/keymaps/via/keymap.c
diff --git a/keyboards/ajisai74/keymaps/via/rules.mk b/keyboards/salicylic_acid3/ajisai74/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ajisai74/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/ajisai74/keymaps/via/rules.mk
diff --git a/keyboards/ajisai74/readme.md b/keyboards/salicylic_acid3/ajisai74/readme.md
similarity index 95%
rename from keyboards/ajisai74/readme.md
rename to keyboards/salicylic_acid3/ajisai74/readme.md
index af66ce0fc5b4..e274eb0ac4d7 100644
--- a/keyboards/ajisai74/readme.md
+++ b/keyboards/salicylic_acid3/ajisai74/readme.md
@@ -10,7 +10,7 @@ This is 74 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ajisai74:default
+    make salicylic_acid3/ajisai74: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/ajisai74/rules.mk b/keyboards/salicylic_acid3/ajisai74/rules.mk
similarity index 100%
rename from keyboards/ajisai74/rules.mk
rename to keyboards/salicylic_acid3/ajisai74/rules.mk
diff --git a/keyboards/ergoarrows/config.h b/keyboards/salicylic_acid3/ergoarrows/config.h
similarity index 100%
rename from keyboards/ergoarrows/config.h
rename to keyboards/salicylic_acid3/ergoarrows/config.h
diff --git a/keyboards/ergoarrows/ergoarrows.c b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.c
similarity index 100%
rename from keyboards/ergoarrows/ergoarrows.c
rename to keyboards/salicylic_acid3/ergoarrows/ergoarrows.c
diff --git a/keyboards/ergoarrows/ergoarrows.h b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h
similarity index 100%
rename from keyboards/ergoarrows/ergoarrows.h
rename to keyboards/salicylic_acid3/ergoarrows/ergoarrows.h
diff --git a/keyboards/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json
similarity index 100%
rename from keyboards/ergoarrows/info.json
rename to keyboards/salicylic_acid3/ergoarrows/info.json
diff --git a/keyboards/ergoarrows/keymaps/default/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/config.h
similarity index 100%
rename from keyboards/ergoarrows/keymaps/default/config.h
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/default/config.h
diff --git a/keyboards/ergoarrows/keymaps/default/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/ergoarrows/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/default/keymap.c
diff --git a/keyboards/ergoarrows/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/ergoarrows/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/config.h
diff --git a/keyboards/ergoarrows/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/ergoarrows/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/salicylic/keymap.c
diff --git a/keyboards/ergoarrows/keymaps/via/config.h b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/config.h
similarity index 100%
rename from keyboards/ergoarrows/keymaps/via/config.h
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/via/config.h
diff --git a/keyboards/ergoarrows/keymaps/via/keymap.c b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/ergoarrows/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/via/keymap.c
diff --git a/keyboards/ergoarrows/keymaps/via/rules.mk b/keyboards/salicylic_acid3/ergoarrows/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/ergoarrows/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/ergoarrows/keymaps/via/rules.mk
diff --git a/keyboards/ergoarrows/readme.md b/keyboards/salicylic_acid3/ergoarrows/readme.md
similarity index 95%
rename from keyboards/ergoarrows/readme.md
rename to keyboards/salicylic_acid3/ergoarrows/readme.md
index 00932548d17f..93ad98941535 100644
--- a/keyboards/ergoarrows/readme.md
+++ b/keyboards/salicylic_acid3/ergoarrows/readme.md
@@ -10,7 +10,7 @@ This is 76 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make ergoarrows:default
+    make salicylic_acid3/ergoarrows: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/ergoarrows/rules.mk b/keyboards/salicylic_acid3/ergoarrows/rules.mk
similarity index 100%
rename from keyboards/ergoarrows/rules.mk
rename to keyboards/salicylic_acid3/ergoarrows/rules.mk
diff --git a/keyboards/getta25/.noci b/keyboards/salicylic_acid3/getta25/.noci
similarity index 100%
rename from keyboards/getta25/.noci
rename to keyboards/salicylic_acid3/getta25/.noci
diff --git a/keyboards/getta25/config.h b/keyboards/salicylic_acid3/getta25/config.h
similarity index 100%
rename from keyboards/getta25/config.h
rename to keyboards/salicylic_acid3/getta25/config.h
diff --git a/keyboards/getta25/getta25.c b/keyboards/salicylic_acid3/getta25/getta25.c
similarity index 100%
rename from keyboards/getta25/getta25.c
rename to keyboards/salicylic_acid3/getta25/getta25.c
diff --git a/keyboards/getta25/getta25.h b/keyboards/salicylic_acid3/getta25/getta25.h
similarity index 58%
rename from keyboards/getta25/getta25.h
rename to keyboards/salicylic_acid3/getta25/getta25.h
index ff448201738b..67632bba4d98 100644
--- a/keyboards/getta25/getta25.h
+++ b/keyboards/salicylic_acid3/getta25/getta25.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_getta25_rev1
+#ifdef KEYBOARD_salicylic_acid3_getta25_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/getta25/info.json b/keyboards/salicylic_acid3/getta25/info.json
similarity index 100%
rename from keyboards/getta25/info.json
rename to keyboards/salicylic_acid3/getta25/info.json
diff --git a/keyboards/getta25/keymaps/default/config.h b/keyboards/salicylic_acid3/getta25/keymaps/default/config.h
similarity index 100%
rename from keyboards/getta25/keymaps/default/config.h
rename to keyboards/salicylic_acid3/getta25/keymaps/default/config.h
diff --git a/keyboards/getta25/keymaps/default/keymap.c b/keyboards/salicylic_acid3/getta25/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/getta25/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/getta25/keymaps/default/keymap.c
diff --git a/keyboards/getta25/keymaps/oled/config.h b/keyboards/salicylic_acid3/getta25/keymaps/oled/config.h
similarity index 100%
rename from keyboards/getta25/keymaps/oled/config.h
rename to keyboards/salicylic_acid3/getta25/keymaps/oled/config.h
diff --git a/keyboards/getta25/keymaps/oled/glcdfont.c b/keyboards/salicylic_acid3/getta25/keymaps/oled/glcdfont.c
similarity index 100%
rename from keyboards/getta25/keymaps/oled/glcdfont.c
rename to keyboards/salicylic_acid3/getta25/keymaps/oled/glcdfont.c
diff --git a/keyboards/getta25/keymaps/oled/keymap.c b/keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c
similarity index 100%
rename from keyboards/getta25/keymaps/oled/keymap.c
rename to keyboards/salicylic_acid3/getta25/keymaps/oled/keymap.c
diff --git a/keyboards/getta25/keymaps/oled/rules.mk b/keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
similarity index 100%
rename from keyboards/getta25/keymaps/oled/rules.mk
rename to keyboards/salicylic_acid3/getta25/keymaps/oled/rules.mk
diff --git a/keyboards/getta25/readme.md b/keyboards/salicylic_acid3/getta25/readme.md
similarity index 94%
rename from keyboards/getta25/readme.md
rename to keyboards/salicylic_acid3/getta25/readme.md
index 886e52a2ea11..2f3e9d1f1b3d 100644
--- a/keyboards/getta25/readme.md
+++ b/keyboards/salicylic_acid3/getta25/readme.md
@@ -10,7 +10,7 @@ This is 25 keys tenkeypad.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make getta25:default
+    make salicylic_acid3/getta25/rev1: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/getta25/rev1/config.h b/keyboards/salicylic_acid3/getta25/rev1/config.h
similarity index 100%
rename from keyboards/getta25/rev1/config.h
rename to keyboards/salicylic_acid3/getta25/rev1/config.h
diff --git a/keyboards/getta25/rev1/rev1.c b/keyboards/salicylic_acid3/getta25/rev1/rev1.c
similarity index 100%
rename from keyboards/getta25/rev1/rev1.c
rename to keyboards/salicylic_acid3/getta25/rev1/rev1.c
diff --git a/keyboards/getta25/rev1/rev1.h b/keyboards/salicylic_acid3/getta25/rev1/rev1.h
similarity index 100%
rename from keyboards/getta25/rev1/rev1.h
rename to keyboards/salicylic_acid3/getta25/rev1/rev1.h
diff --git a/keyboards/getta25/rev1/rules.mk b/keyboards/salicylic_acid3/getta25/rev1/rules.mk
similarity index 100%
rename from keyboards/getta25/rev1/rules.mk
rename to keyboards/salicylic_acid3/getta25/rev1/rules.mk
diff --git a/keyboards/getta25/rules.mk b/keyboards/salicylic_acid3/getta25/rules.mk
similarity index 100%
rename from keyboards/getta25/rules.mk
rename to keyboards/salicylic_acid3/getta25/rules.mk
diff --git a/keyboards/jisplit89/.noci b/keyboards/salicylic_acid3/jisplit89/.noci
similarity index 100%
rename from keyboards/jisplit89/.noci
rename to keyboards/salicylic_acid3/jisplit89/.noci
diff --git a/keyboards/jisplit89/config.h b/keyboards/salicylic_acid3/jisplit89/config.h
similarity index 100%
rename from keyboards/jisplit89/config.h
rename to keyboards/salicylic_acid3/jisplit89/config.h
diff --git a/keyboards/jisplit89/info.json b/keyboards/salicylic_acid3/jisplit89/info.json
similarity index 100%
rename from keyboards/jisplit89/info.json
rename to keyboards/salicylic_acid3/jisplit89/info.json
diff --git a/keyboards/jisplit89/jisplit89.c b/keyboards/salicylic_acid3/jisplit89/jisplit89.c
similarity index 100%
rename from keyboards/jisplit89/jisplit89.c
rename to keyboards/salicylic_acid3/jisplit89/jisplit89.c
diff --git a/keyboards/jisplit89/jisplit89.h b/keyboards/salicylic_acid3/jisplit89/jisplit89.h
similarity index 93%
rename from keyboards/jisplit89/jisplit89.h
rename to keyboards/salicylic_acid3/jisplit89/jisplit89.h
index b59b5a66a2bf..8de2326de658 100644
--- a/keyboards/jisplit89/jisplit89.h
+++ b/keyboards/salicylic_acid3/jisplit89/jisplit89.h
@@ -17,6 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#ifdef KEYBOARD_jisplit89_rev1
+#ifdef KEYBOARD_salicylic_acid3_jisplit89_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/jisplit89/keymaps/default/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/jisplit89/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/jisplit89/keymaps/default/keymap.c
diff --git a/keyboards/jisplit89/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/jisplit89/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/config.h
diff --git a/keyboards/jisplit89/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/jisplit89/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/keymap.c
diff --git a/keyboards/jisplit89/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/jisplit89/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/jisplit89/keymaps/salicylic/rules.mk
diff --git a/keyboards/jisplit89/keymaps/via/config.h b/keyboards/salicylic_acid3/jisplit89/keymaps/via/config.h
similarity index 100%
rename from keyboards/jisplit89/keymaps/via/config.h
rename to keyboards/salicylic_acid3/jisplit89/keymaps/via/config.h
diff --git a/keyboards/jisplit89/keymaps/via/keymap.c b/keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/jisplit89/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/jisplit89/keymaps/via/keymap.c
diff --git a/keyboards/jisplit89/keymaps/via/rules.mk b/keyboards/salicylic_acid3/jisplit89/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/jisplit89/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/jisplit89/keymaps/via/rules.mk
diff --git a/keyboards/jisplit89/readme.md b/keyboards/salicylic_acid3/jisplit89/readme.md
similarity index 94%
rename from keyboards/jisplit89/readme.md
rename to keyboards/salicylic_acid3/jisplit89/readme.md
index d2228745774d..df0994e1091e 100644
--- a/keyboards/jisplit89/readme.md
+++ b/keyboards/salicylic_acid3/jisplit89/readme.md
@@ -10,7 +10,7 @@ This is 89 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jisplit89:default
+    make salicylic_acid3/jisplit89/rev1: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/jisplit89/rev1/config.h b/keyboards/salicylic_acid3/jisplit89/rev1/config.h
similarity index 100%
rename from keyboards/jisplit89/rev1/config.h
rename to keyboards/salicylic_acid3/jisplit89/rev1/config.h
diff --git a/keyboards/jisplit89/rev1/rev1.c b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.c
similarity index 100%
rename from keyboards/jisplit89/rev1/rev1.c
rename to keyboards/salicylic_acid3/jisplit89/rev1/rev1.c
diff --git a/keyboards/jisplit89/rev1/rev1.h b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
similarity index 100%
rename from keyboards/jisplit89/rev1/rev1.h
rename to keyboards/salicylic_acid3/jisplit89/rev1/rev1.h
diff --git a/keyboards/jisplit89/rev1/rules.mk b/keyboards/salicylic_acid3/jisplit89/rev1/rules.mk
similarity index 100%
rename from keyboards/jisplit89/rev1/rules.mk
rename to keyboards/salicylic_acid3/jisplit89/rev1/rules.mk
diff --git a/keyboards/jisplit89/rules.mk b/keyboards/salicylic_acid3/jisplit89/rules.mk
similarity index 100%
rename from keyboards/jisplit89/rules.mk
rename to keyboards/salicylic_acid3/jisplit89/rules.mk
diff --git a/keyboards/nafuda/config.h b/keyboards/salicylic_acid3/nafuda/config.h
similarity index 100%
rename from keyboards/nafuda/config.h
rename to keyboards/salicylic_acid3/nafuda/config.h
diff --git a/keyboards/nafuda/info.json b/keyboards/salicylic_acid3/nafuda/info.json
similarity index 100%
rename from keyboards/nafuda/info.json
rename to keyboards/salicylic_acid3/nafuda/info.json
diff --git a/keyboards/nafuda/keymaps/default/config.h b/keyboards/salicylic_acid3/nafuda/keymaps/default/config.h
similarity index 100%
rename from keyboards/nafuda/keymaps/default/config.h
rename to keyboards/salicylic_acid3/nafuda/keymaps/default/config.h
diff --git a/keyboards/nafuda/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nafuda/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nafuda/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/nafuda/keymaps/default/keymap.c
diff --git a/keyboards/nafuda/keymaps/default/readme.md b/keyboards/salicylic_acid3/nafuda/keymaps/default/readme.md
similarity index 100%
rename from keyboards/nafuda/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/nafuda/keymaps/default/readme.md
diff --git a/keyboards/nafuda/nafuda.c b/keyboards/salicylic_acid3/nafuda/nafuda.c
similarity index 100%
rename from keyboards/nafuda/nafuda.c
rename to keyboards/salicylic_acid3/nafuda/nafuda.c
diff --git a/keyboards/nafuda/nafuda.h b/keyboards/salicylic_acid3/nafuda/nafuda.h
similarity index 100%
rename from keyboards/nafuda/nafuda.h
rename to keyboards/salicylic_acid3/nafuda/nafuda.h
diff --git a/keyboards/nafuda/readme.md b/keyboards/salicylic_acid3/nafuda/readme.md
similarity index 95%
rename from keyboards/nafuda/readme.md
rename to keyboards/salicylic_acid3/nafuda/readme.md
index 73007ed01e62..5df9b5df0f88 100644
--- a/keyboards/nafuda/readme.md
+++ b/keyboards/salicylic_acid3/nafuda/readme.md
@@ -10,7 +10,7 @@ This is 7 keys cursor macropad.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nafuda:default
+    make salicylic_acid3/nafuda: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/nafuda/rules.mk b/keyboards/salicylic_acid3/nafuda/rules.mk
similarity index 100%
rename from keyboards/nafuda/rules.mk
rename to keyboards/salicylic_acid3/nafuda/rules.mk
diff --git a/keyboards/naked48/.noci b/keyboards/salicylic_acid3/naked48/.noci
similarity index 100%
rename from keyboards/naked48/.noci
rename to keyboards/salicylic_acid3/naked48/.noci
diff --git a/keyboards/naked48/config.h b/keyboards/salicylic_acid3/naked48/config.h
similarity index 100%
rename from keyboards/naked48/config.h
rename to keyboards/salicylic_acid3/naked48/config.h
diff --git a/keyboards/naked48/info.json b/keyboards/salicylic_acid3/naked48/info.json
similarity index 100%
rename from keyboards/naked48/info.json
rename to keyboards/salicylic_acid3/naked48/info.json
diff --git a/keyboards/naked48/keymaps/default/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/default/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/default/config.h
diff --git a/keyboards/naked48/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/default/keymap.c
diff --git a/keyboards/naked48/keymaps/default/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/default/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/default/readme.md
diff --git a/keyboards/naked48/keymaps/default/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/default/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/default/rules.mk
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_nafuda/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/config.h
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_nafuda/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_nafuda/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/readme.md
diff --git a/keyboards/naked48/keymaps/default_with_nafuda/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_nafuda/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/rules.mk
diff --git a/keyboards/naked48/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/config.h
diff --git a/keyboards/naked48/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/keymap.c
diff --git a/keyboards/naked48/keymaps/default_with_setta21/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/default_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/default_with_setta21/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic/config.h
diff --git a/keyboards/naked48/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic/keymap.c
diff --git a/keyboards/naked48/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic/rules.mk
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_nafuda/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/config.h
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_nafuda/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/keymap.c
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_nafuda/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic_with_nafuda/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_nafuda/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_nafuda/rules.mk
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/config.h
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/keymap.c
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/salicylic_with_setta21/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/salicylic_with_setta21/rules.mk
diff --git a/keyboards/naked48/keymaps/scheiklp/config.h b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/scheiklp/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/scheiklp/config.h
diff --git a/keyboards/naked48/keymaps/scheiklp/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/scheiklp/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/scheiklp/keymap.c
diff --git a/keyboards/naked48/keymaps/scheiklp/readme.md b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/readme.md
similarity index 100%
rename from keyboards/naked48/keymaps/scheiklp/readme.md
rename to keyboards/salicylic_acid3/naked48/keymaps/scheiklp/readme.md
diff --git a/keyboards/naked48/keymaps/scheiklp/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/scheiklp/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/scheiklp/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/scheiklp/rules.mk
diff --git a/keyboards/naked48/keymaps/via/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/via/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/via/config.h
diff --git a/keyboards/naked48/keymaps/via/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/via/keymap.c
diff --git a/keyboards/naked48/keymaps/via/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/via/rules.mk
diff --git a/keyboards/naked48/keymaps/via_rgb_matrix/config.h b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
similarity index 100%
rename from keyboards/naked48/keymaps/via_rgb_matrix/config.h
rename to keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/config.h
diff --git a/keyboards/naked48/keymaps/via_rgb_matrix/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
similarity index 100%
rename from keyboards/naked48/keymaps/via_rgb_matrix/keymap.c
rename to keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/keymap.c
diff --git a/keyboards/naked48/keymaps/via_rgb_matrix/rules.mk b/keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
similarity index 100%
rename from keyboards/naked48/keymaps/via_rgb_matrix/rules.mk
rename to keyboards/salicylic_acid3/naked48/keymaps/via_rgb_matrix/rules.mk
diff --git a/keyboards/naked48/naked48.c b/keyboards/salicylic_acid3/naked48/naked48.c
similarity index 100%
rename from keyboards/naked48/naked48.c
rename to keyboards/salicylic_acid3/naked48/naked48.c
diff --git a/keyboards/naked48/naked48.h b/keyboards/salicylic_acid3/naked48/naked48.h
similarity index 94%
rename from keyboards/naked48/naked48.h
rename to keyboards/salicylic_acid3/naked48/naked48.h
index e210cf0f576b..bbfa6d2e84f4 100644
--- a/keyboards/naked48/naked48.h
+++ b/keyboards/salicylic_acid3/naked48/naked48.h
@@ -19,6 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_naked48_rev1
+#ifdef KEYBOARD_salicylic_acid3_naked48_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/naked48/readme.md b/keyboards/salicylic_acid3/naked48/readme.md
similarity index 94%
rename from keyboards/naked48/readme.md
rename to keyboards/salicylic_acid3/naked48/readme.md
index bb16571efde3..c3a826f13e0a 100644
--- a/keyboards/naked48/readme.md
+++ b/keyboards/salicylic_acid3/naked48/readme.md
@@ -10,7 +10,7 @@ Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/PCB_
 
 Make example for this keyboard (after setting up your build environment):
 
-    make naked48:default:avrdude
+    make salicylic_acid3/naked48/rev1:default:avrdude
 
 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/naked48/rev1/config.h b/keyboards/salicylic_acid3/naked48/rev1/config.h
similarity index 100%
rename from keyboards/naked48/rev1/config.h
rename to keyboards/salicylic_acid3/naked48/rev1/config.h
diff --git a/keyboards/naked48/rev1/rev1.c b/keyboards/salicylic_acid3/naked48/rev1/rev1.c
similarity index 100%
rename from keyboards/naked48/rev1/rev1.c
rename to keyboards/salicylic_acid3/naked48/rev1/rev1.c
diff --git a/keyboards/naked48/rev1/rev1.h b/keyboards/salicylic_acid3/naked48/rev1/rev1.h
similarity index 100%
rename from keyboards/naked48/rev1/rev1.h
rename to keyboards/salicylic_acid3/naked48/rev1/rev1.h
diff --git a/keyboards/naked48/rev1/rules.mk b/keyboards/salicylic_acid3/naked48/rev1/rules.mk
similarity index 100%
rename from keyboards/naked48/rev1/rules.mk
rename to keyboards/salicylic_acid3/naked48/rev1/rules.mk
diff --git a/keyboards/naked48/rules.mk b/keyboards/salicylic_acid3/naked48/rules.mk
similarity index 100%
rename from keyboards/naked48/rules.mk
rename to keyboards/salicylic_acid3/naked48/rules.mk
diff --git a/keyboards/naked60/config.h b/keyboards/salicylic_acid3/naked60/config.h
similarity index 100%
rename from keyboards/naked60/config.h
rename to keyboards/salicylic_acid3/naked60/config.h
diff --git a/keyboards/naked60/info.json b/keyboards/salicylic_acid3/naked60/info.json
similarity index 100%
rename from keyboards/naked60/info.json
rename to keyboards/salicylic_acid3/naked60/info.json
diff --git a/keyboards/naked60/keymaps/333fred/config.h b/keyboards/salicylic_acid3/naked60/keymaps/333fred/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/333fred/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/333fred/config.h
diff --git a/keyboards/naked60/keymaps/333fred/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/333fred/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/333fred/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/333fred/keymap.c
diff --git a/keyboards/naked60/keymaps/default/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/default/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/default/config.h
diff --git a/keyboards/naked60/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
diff --git a/keyboards/naked60/keymaps/default/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/default/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/default/readme.md
diff --git a/keyboards/naked60/keymaps/default_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_nafuda/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/config.h
diff --git a/keyboards/naked60/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_nafuda/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
diff --git a/keyboards/naked60/keymaps/default_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_nafuda/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/readme.md
diff --git a/keyboards/naked60/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/config.h
diff --git a/keyboards/naked60/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
diff --git a/keyboards/naked60/keymaps/default_with_setta21/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/default_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic/config.h
diff --git a/keyboards/naked60/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic/keymap.c
diff --git a/keyboards/naked60/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic/rules.mk
diff --git a/keyboards/naked60/keymaps/salicylic_with_nafuda/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_nafuda/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/config.h
diff --git a/keyboards/naked60/keymaps/salicylic_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_nafuda/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/keymap.c
diff --git a/keyboards/naked60/keymaps/salicylic_with_nafuda/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_nafuda/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic_with_nafuda/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/rules.mk
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_nafuda/rules.mk
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_nafuda/rules.mk
diff --git a/keyboards/naked60/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/config.h
diff --git a/keyboards/naked60/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/keymap.c
diff --git a/keyboards/naked60/keymaps/salicylic_with_setta21/readme.md b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/rules.mk
similarity index 100%
rename from keyboards/naked60/keymaps/salicylic_with_setta21/rules.mk
rename to keyboards/salicylic_acid3/naked60/keymaps/salicylic_with_setta21/rules.mk
diff --git a/keyboards/naked60/keymaps/via/config.h b/keyboards/salicylic_acid3/naked60/keymaps/via/config.h
similarity index 100%
rename from keyboards/naked60/keymaps/via/config.h
rename to keyboards/salicylic_acid3/naked60/keymaps/via/config.h
diff --git a/keyboards/naked60/keymaps/via/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/naked60/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/naked60/keymaps/via/keymap.c
diff --git a/keyboards/naked60/keymaps/via/rules.mk b/keyboards/salicylic_acid3/naked60/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/naked60/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/naked60/keymaps/via/rules.mk
diff --git a/keyboards/naked60/naked60.c b/keyboards/salicylic_acid3/naked60/naked60.c
similarity index 100%
rename from keyboards/naked60/naked60.c
rename to keyboards/salicylic_acid3/naked60/naked60.c
diff --git a/keyboards/naked60/naked60.h b/keyboards/salicylic_acid3/naked60/naked60.h
similarity index 94%
rename from keyboards/naked60/naked60.h
rename to keyboards/salicylic_acid3/naked60/naked60.h
index 4952b6b076d5..9ad73df67f65 100644
--- a/keyboards/naked60/naked60.h
+++ b/keyboards/salicylic_acid3/naked60/naked60.h
@@ -19,6 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_naked60_rev1
+#ifdef KEYBOARD_salicylic_acid3_naked60_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/naked60/readme.md b/keyboards/salicylic_acid3/naked60/readme.md
similarity index 94%
rename from keyboards/naked60/readme.md
rename to keyboards/salicylic_acid3/naked60/readme.md
index 60bb1643772f..e44aa64a4418 100644
--- a/keyboards/naked60/readme.md
+++ b/keyboards/salicylic_acid3/naked60/readme.md
@@ -10,7 +10,7 @@ Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/PCB_
 
 Make example for this keyboard (after setting up your build environment):
 
-    make naked60:default:avrdude
+    make salicylic_acid3/naked60/rev1:default:avrdude
 
 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/naked60/rev1/config.h b/keyboards/salicylic_acid3/naked60/rev1/config.h
similarity index 100%
rename from keyboards/naked60/rev1/config.h
rename to keyboards/salicylic_acid3/naked60/rev1/config.h
diff --git a/keyboards/naked60/rev1/rev1.c b/keyboards/salicylic_acid3/naked60/rev1/rev1.c
similarity index 100%
rename from keyboards/naked60/rev1/rev1.c
rename to keyboards/salicylic_acid3/naked60/rev1/rev1.c
diff --git a/keyboards/naked60/rev1/rev1.h b/keyboards/salicylic_acid3/naked60/rev1/rev1.h
similarity index 100%
rename from keyboards/naked60/rev1/rev1.h
rename to keyboards/salicylic_acid3/naked60/rev1/rev1.h
diff --git a/keyboards/naked60/rev1/rules.mk b/keyboards/salicylic_acid3/naked60/rev1/rules.mk
similarity index 100%
rename from keyboards/naked60/rev1/rules.mk
rename to keyboards/salicylic_acid3/naked60/rev1/rules.mk
diff --git a/keyboards/naked60/rules.mk b/keyboards/salicylic_acid3/naked60/rules.mk
similarity index 100%
rename from keyboards/naked60/rules.mk
rename to keyboards/salicylic_acid3/naked60/rules.mk
diff --git a/keyboards/naked64/.noci b/keyboards/salicylic_acid3/naked64/.noci
similarity index 100%
rename from keyboards/naked64/.noci
rename to keyboards/salicylic_acid3/naked64/.noci
diff --git a/keyboards/naked64/config.h b/keyboards/salicylic_acid3/naked64/config.h
similarity index 100%
rename from keyboards/naked64/config.h
rename to keyboards/salicylic_acid3/naked64/config.h
diff --git a/keyboards/naked64/info.json b/keyboards/salicylic_acid3/naked64/info.json
similarity index 100%
rename from keyboards/naked64/info.json
rename to keyboards/salicylic_acid3/naked64/info.json
diff --git a/keyboards/naked64/keymaps/default/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default/config.h
similarity index 100%
rename from keyboards/naked64/keymaps/default/config.h
rename to keyboards/salicylic_acid3/naked64/keymaps/default/config.h
diff --git a/keyboards/naked64/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/naked64/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/naked64/keymaps/default/keymap.c
diff --git a/keyboards/naked64/keymaps/default/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/default/readme.md
similarity index 100%
rename from keyboards/naked64/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/naked64/keymaps/default/readme.md
diff --git a/keyboards/naked64/keymaps/default/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/naked64/keymaps/default/rules.mk
rename to keyboards/salicylic_acid3/naked64/keymaps/default/rules.mk
diff --git a/keyboards/naked64/keymaps/default_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
similarity index 100%
rename from keyboards/naked64/keymaps/default_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/config.h
diff --git a/keyboards/naked64/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked64/keymaps/default_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/keymap.c
diff --git a/keyboards/naked64/keymaps/default_with_setta21/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked64/keymaps/default_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/readme.md
diff --git a/keyboards/naked64/keymaps/default_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk
similarity index 100%
rename from keyboards/naked64/keymaps/default_with_setta21/rules.mk
rename to keyboards/salicylic_acid3/naked64/keymaps/default_with_setta21/rules.mk
diff --git a/keyboards/naked64/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic/config.h
diff --git a/keyboards/naked64/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic/keymap.c
diff --git a/keyboards/naked64/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/readme.md
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic/readme.md
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic/readme.md
diff --git a/keyboards/naked64/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic/rules.mk
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/config.h b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic_with_setta21/config.h
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/config.h
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic_with_setta21/keymap.c
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/keymap.c
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/readme.md b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/readme.md
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic_with_setta21/readme.md
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/readme.md
diff --git a/keyboards/naked64/keymaps/salicylic_with_setta21/rules.mk b/keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/rules.mk
similarity index 100%
rename from keyboards/naked64/keymaps/salicylic_with_setta21/rules.mk
rename to keyboards/salicylic_acid3/naked64/keymaps/salicylic_with_setta21/rules.mk
diff --git a/keyboards/naked64/naked64.c b/keyboards/salicylic_acid3/naked64/naked64.c
similarity index 100%
rename from keyboards/naked64/naked64.c
rename to keyboards/salicylic_acid3/naked64/naked64.c
diff --git a/keyboards/naked64/naked64.h b/keyboards/salicylic_acid3/naked64/naked64.h
similarity index 58%
rename from keyboards/naked64/naked64.h
rename to keyboards/salicylic_acid3/naked64/naked64.h
index a13144011825..cb73e2142d20 100644
--- a/keyboards/naked64/naked64.h
+++ b/keyboards/salicylic_acid3/naked64/naked64.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_naked64_rev1
+#ifdef KEYBOARD_salicylic_acid3_naked64_rev1
   #include "rev1.h"
 #endif
diff --git a/keyboards/naked64/readme.md b/keyboards/salicylic_acid3/naked64/readme.md
similarity index 95%
rename from keyboards/naked64/readme.md
rename to keyboards/salicylic_acid3/naked64/readme.md
index 403e5cf4aeb4..ab02be74f50d 100644
--- a/keyboards/naked64/readme.md
+++ b/keyboards/salicylic_acid3/naked64/readme.md
@@ -10,7 +10,7 @@ Hardware Availability: [PCB & Case Data](https://github.com/Salicylic-acid3/PCB_
 
 Make example for this keyboard (after setting up your build environment):
 
-    make naked64:default:flash
+    make salicylic_acid3/naked64/rev1: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/naked64/rev1/config.h b/keyboards/salicylic_acid3/naked64/rev1/config.h
similarity index 100%
rename from keyboards/naked64/rev1/config.h
rename to keyboards/salicylic_acid3/naked64/rev1/config.h
diff --git a/keyboards/naked64/rev1/rev1.c b/keyboards/salicylic_acid3/naked64/rev1/rev1.c
similarity index 100%
rename from keyboards/naked64/rev1/rev1.c
rename to keyboards/salicylic_acid3/naked64/rev1/rev1.c
diff --git a/keyboards/naked64/rev1/rev1.h b/keyboards/salicylic_acid3/naked64/rev1/rev1.h
similarity index 100%
rename from keyboards/naked64/rev1/rev1.h
rename to keyboards/salicylic_acid3/naked64/rev1/rev1.h
diff --git a/keyboards/naked64/rev1/rules.mk b/keyboards/salicylic_acid3/naked64/rev1/rules.mk
similarity index 100%
rename from keyboards/naked64/rev1/rules.mk
rename to keyboards/salicylic_acid3/naked64/rev1/rules.mk
diff --git a/keyboards/naked64/rules.mk b/keyboards/salicylic_acid3/naked64/rules.mk
similarity index 100%
rename from keyboards/naked64/rules.mk
rename to keyboards/salicylic_acid3/naked64/rules.mk
diff --git a/keyboards/nknl7en/config.h b/keyboards/salicylic_acid3/nknl7en/config.h
similarity index 100%
rename from keyboards/nknl7en/config.h
rename to keyboards/salicylic_acid3/nknl7en/config.h
diff --git a/keyboards/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json
similarity index 100%
rename from keyboards/nknl7en/info.json
rename to keyboards/salicylic_acid3/nknl7en/info.json
diff --git a/keyboards/nknl7en/keymaps/default/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/default/config.h
similarity index 100%
rename from keyboards/nknl7en/keymaps/default/config.h
rename to keyboards/salicylic_acid3/nknl7en/keymaps/default/config.h
diff --git a/keyboards/nknl7en/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nknl7en/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/nknl7en/keymaps/default/keymap.c
diff --git a/keyboards/nknl7en/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/nknl7en/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/config.h
diff --git a/keyboards/nknl7en/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/nknl7en/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/nknl7en/keymaps/salicylic/keymap.c
diff --git a/keyboards/nknl7en/keymaps/via/config.h b/keyboards/salicylic_acid3/nknl7en/keymaps/via/config.h
similarity index 100%
rename from keyboards/nknl7en/keymaps/via/config.h
rename to keyboards/salicylic_acid3/nknl7en/keymaps/via/config.h
diff --git a/keyboards/nknl7en/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nknl7en/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/nknl7en/keymaps/via/keymap.c
diff --git a/keyboards/nknl7en/keymaps/via/rules.mk b/keyboards/salicylic_acid3/nknl7en/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nknl7en/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/nknl7en/keymaps/via/rules.mk
diff --git a/keyboards/nknl7en/nknl7en.c b/keyboards/salicylic_acid3/nknl7en/nknl7en.c
similarity index 100%
rename from keyboards/nknl7en/nknl7en.c
rename to keyboards/salicylic_acid3/nknl7en/nknl7en.c
diff --git a/keyboards/nknl7en/nknl7en.h b/keyboards/salicylic_acid3/nknl7en/nknl7en.h
similarity index 100%
rename from keyboards/nknl7en/nknl7en.h
rename to keyboards/salicylic_acid3/nknl7en/nknl7en.h
diff --git a/keyboards/nknl7en/readme.md b/keyboards/salicylic_acid3/nknl7en/readme.md
similarity index 95%
rename from keyboards/nknl7en/readme.md
rename to keyboards/salicylic_acid3/nknl7en/readme.md
index 5cbffae30c0a..07f87e3e5e4b 100644
--- a/keyboards/nknl7en/readme.md
+++ b/keyboards/salicylic_acid3/nknl7en/readme.md
@@ -10,7 +10,7 @@ This is 70 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nknl7en:default
+    make salicylic_acid3/nknl7en: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/nknl7en/rules.mk b/keyboards/salicylic_acid3/nknl7en/rules.mk
similarity index 100%
rename from keyboards/nknl7en/rules.mk
rename to keyboards/salicylic_acid3/nknl7en/rules.mk
diff --git a/keyboards/nknl7jp/config.h b/keyboards/salicylic_acid3/nknl7jp/config.h
similarity index 100%
rename from keyboards/nknl7jp/config.h
rename to keyboards/salicylic_acid3/nknl7jp/config.h
diff --git a/keyboards/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json
similarity index 100%
rename from keyboards/nknl7jp/info.json
rename to keyboards/salicylic_acid3/nknl7jp/info.json
diff --git a/keyboards/nknl7jp/keymaps/default/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/config.h
similarity index 100%
rename from keyboards/nknl7jp/keymaps/default/config.h
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/default/config.h
diff --git a/keyboards/nknl7jp/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/nknl7jp/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/default/keymap.c
diff --git a/keyboards/nknl7jp/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/nknl7jp/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/config.h
diff --git a/keyboards/nknl7jp/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/nknl7jp/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/salicylic/keymap.c
diff --git a/keyboards/nknl7jp/keymaps/via/config.h b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/config.h
similarity index 100%
rename from keyboards/nknl7jp/keymaps/via/config.h
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/via/config.h
diff --git a/keyboards/nknl7jp/keymaps/via/keymap.c b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/nknl7jp/keymaps/via/keymap.c
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/via/keymap.c
diff --git a/keyboards/nknl7jp/keymaps/via/rules.mk b/keyboards/salicylic_acid3/nknl7jp/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/nknl7jp/keymaps/via/rules.mk
rename to keyboards/salicylic_acid3/nknl7jp/keymaps/via/rules.mk
diff --git a/keyboards/nknl7jp/nknl7jp.c b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.c
similarity index 100%
rename from keyboards/nknl7jp/nknl7jp.c
rename to keyboards/salicylic_acid3/nknl7jp/nknl7jp.c
diff --git a/keyboards/nknl7jp/nknl7jp.h b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h
similarity index 100%
rename from keyboards/nknl7jp/nknl7jp.h
rename to keyboards/salicylic_acid3/nknl7jp/nknl7jp.h
diff --git a/keyboards/nknl7jp/readme.md b/keyboards/salicylic_acid3/nknl7jp/readme.md
similarity index 95%
rename from keyboards/nknl7jp/readme.md
rename to keyboards/salicylic_acid3/nknl7jp/readme.md
index 9d0ccba4e8cf..b2f375aef872 100644
--- a/keyboards/nknl7jp/readme.md
+++ b/keyboards/salicylic_acid3/nknl7jp/readme.md
@@ -10,7 +10,7 @@ This is 73 keys Custom keyboard.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nknl7jp:default
+    make salicylic_acid3/nknl7jp: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/nknl7jp/rules.mk b/keyboards/salicylic_acid3/nknl7jp/rules.mk
similarity index 100%
rename from keyboards/nknl7jp/rules.mk
rename to keyboards/salicylic_acid3/nknl7jp/rules.mk
diff --git a/keyboards/setta21/config.h b/keyboards/salicylic_acid3/setta21/config.h
similarity index 100%
rename from keyboards/setta21/config.h
rename to keyboards/salicylic_acid3/setta21/config.h
diff --git a/keyboards/setta21/info.json b/keyboards/salicylic_acid3/setta21/info.json
similarity index 100%
rename from keyboards/setta21/info.json
rename to keyboards/salicylic_acid3/setta21/info.json
diff --git a/keyboards/setta21/keymaps/default/config.h b/keyboards/salicylic_acid3/setta21/keymaps/default/config.h
similarity index 100%
rename from keyboards/setta21/keymaps/default/config.h
rename to keyboards/salicylic_acid3/setta21/keymaps/default/config.h
diff --git a/keyboards/setta21/keymaps/default/keymap.c b/keyboards/salicylic_acid3/setta21/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/setta21/keymaps/default/keymap.c
rename to keyboards/salicylic_acid3/setta21/keymaps/default/keymap.c
diff --git a/keyboards/setta21/keymaps/default/readme.md b/keyboards/salicylic_acid3/setta21/keymaps/default/readme.md
similarity index 100%
rename from keyboards/setta21/keymaps/default/readme.md
rename to keyboards/salicylic_acid3/setta21/keymaps/default/readme.md
diff --git a/keyboards/setta21/keymaps/salicylic/config.h b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
similarity index 100%
rename from keyboards/setta21/keymaps/salicylic/config.h
rename to keyboards/salicylic_acid3/setta21/keymaps/salicylic/config.h
diff --git a/keyboards/setta21/keymaps/salicylic/keymap.c b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
similarity index 100%
rename from keyboards/setta21/keymaps/salicylic/keymap.c
rename to keyboards/salicylic_acid3/setta21/keymaps/salicylic/keymap.c
diff --git a/keyboards/setta21/keymaps/salicylic/readme.md b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/readme.md
similarity index 100%
rename from keyboards/setta21/keymaps/salicylic/readme.md
rename to keyboards/salicylic_acid3/setta21/keymaps/salicylic/readme.md
diff --git a/keyboards/setta21/keymaps/salicylic/rules.mk b/keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
similarity index 100%
rename from keyboards/setta21/keymaps/salicylic/rules.mk
rename to keyboards/salicylic_acid3/setta21/keymaps/salicylic/rules.mk
diff --git a/keyboards/setta21/readme.md b/keyboards/salicylic_acid3/setta21/readme.md
similarity index 94%
rename from keyboards/setta21/readme.md
rename to keyboards/salicylic_acid3/setta21/readme.md
index c940079997f4..25027b728129 100644
--- a/keyboards/setta21/readme.md
+++ b/keyboards/salicylic_acid3/setta21/readme.md
@@ -10,7 +10,7 @@ This is 21 keys tenkeypad.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make setta21:default
+    make salicylic_acid3/setta21/rev1: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/setta21/rev1/.noci b/keyboards/salicylic_acid3/setta21/rev1/.noci
similarity index 100%
rename from keyboards/setta21/rev1/.noci
rename to keyboards/salicylic_acid3/setta21/rev1/.noci
diff --git a/keyboards/setta21/rev1/config.h b/keyboards/salicylic_acid3/setta21/rev1/config.h
similarity index 100%
rename from keyboards/setta21/rev1/config.h
rename to keyboards/salicylic_acid3/setta21/rev1/config.h
diff --git a/keyboards/setta21/rev1/rev1.c b/keyboards/salicylic_acid3/setta21/rev1/rev1.c
similarity index 100%
rename from keyboards/setta21/rev1/rev1.c
rename to keyboards/salicylic_acid3/setta21/rev1/rev1.c
diff --git a/keyboards/setta21/rev1/rev1.h b/keyboards/salicylic_acid3/setta21/rev1/rev1.h
similarity index 100%
rename from keyboards/setta21/rev1/rev1.h
rename to keyboards/salicylic_acid3/setta21/rev1/rev1.h
diff --git a/keyboards/setta21/rev1/rules.mk b/keyboards/salicylic_acid3/setta21/rev1/rules.mk
similarity index 100%
rename from keyboards/setta21/rev1/rules.mk
rename to keyboards/salicylic_acid3/setta21/rev1/rules.mk
diff --git a/keyboards/setta21/rules.mk b/keyboards/salicylic_acid3/setta21/rules.mk
similarity index 100%
rename from keyboards/setta21/rules.mk
rename to keyboards/salicylic_acid3/setta21/rules.mk
diff --git a/keyboards/setta21/setta21.c b/keyboards/salicylic_acid3/setta21/setta21.c
similarity index 100%
rename from keyboards/setta21/setta21.c
rename to keyboards/salicylic_acid3/setta21/setta21.c
diff --git a/keyboards/setta21/setta21.h b/keyboards/salicylic_acid3/setta21/setta21.h
similarity index 58%
rename from keyboards/setta21/setta21.h
rename to keyboards/salicylic_acid3/setta21/setta21.h
index 0409f6cbc289..9e5b17e2c30c 100644
--- a/keyboards/setta21/setta21.h
+++ b/keyboards/salicylic_acid3/setta21/setta21.h
@@ -2,6 +2,6 @@
 
 #include "quantum.h"
 
-#ifdef KEYBOARD_setta21_rev1
+#ifdef KEYBOARD_salicylic_acid3_setta21_rev1
   #include "rev1.h"
 #endif