qmk · drashna · Jan 10, 2022 · Jan 8, 2022
diff --git a/keyboards/7skb/.noci → keyboards/salicylic_acid3/7skb/.noci b/keyboards/7skb/.noci → keyboards/salicylic_acid3/7skb/.noci
diff --git a/keyboards/7skb/7skb.c → keyboards/salicylic_acid3/7skb/7skb.c b/keyboards/7skb/7skb.c → keyboards/salicylic_acid3/7skb/7skb.c
diff --git a/keyboards/7skb/7skb.h → keyboards/salicylic_acid3/7skb/7skb.h b/keyboards/7skb/7skb.h → 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 → keyboards/salicylic_acid3/7skb/config.h b/keyboards/7skb/config.h → keyboards/salicylic_acid3/7skb/config.h
diff --git a/keyboards/7skb/info.json → keyboards/salicylic_acid3/7skb/info.json b/keyboards/7skb/info.json → keyboards/salicylic_acid3/7skb/info.json
diff --git a/keyboards/7skb/keymaps/default/config.h → ...cylic_acid3/7skb/keymaps/default/config.h b/keyboards/7skb/keymaps/default/config.h → ...cylic_acid3/7skb/keymaps/default/config.h
diff --git a/keyboards/7skb/keymaps/default/keymap.c → ...cylic_acid3/7skb/keymaps/default/keymap.c b/keyboards/7skb/keymaps/default/keymap.c → ...cylic_acid3/7skb/keymaps/default/keymap.c
diff --git a/keyboards/7skb/keymaps/salicylic/config.h → ...lic_acid3/7skb/keymaps/salicylic/config.h b/keyboards/7skb/keymaps/salicylic/config.h → ...lic_acid3/7skb/keymaps/salicylic/config.h
diff --git a/keyboards/7skb/keymaps/salicylic/keymap.c → ...lic_acid3/7skb/keymaps/salicylic/keymap.c b/keyboards/7skb/keymaps/salicylic/keymap.c → ...lic_acid3/7skb/keymaps/salicylic/keymap.c
diff --git a/keyboards/7skb/keymaps/salicylic/rules.mk → ...lic_acid3/7skb/keymaps/salicylic/rules.mk b/keyboards/7skb/keymaps/salicylic/rules.mk → ...lic_acid3/7skb/keymaps/salicylic/rules.mk
diff --git a/keyboards/7skb/keymaps/via/keymap.c → ...salicylic_acid3/7skb/keymaps/via/keymap.c b/keyboards/7skb/keymaps/via/keymap.c → ...salicylic_acid3/7skb/keymaps/via/keymap.c
diff --git a/keyboards/7skb/keymaps/via/readme.md → ...alicylic_acid3/7skb/keymaps/via/readme.md b/keyboards/7skb/keymaps/via/readme.md → ...alicylic_acid3/7skb/keymaps/via/readme.md
diff --git a/keyboards/7skb/keymaps/via/rules.mk → ...salicylic_acid3/7skb/keymaps/via/rules.mk b/keyboards/7skb/keymaps/via/rules.mk → ...salicylic_acid3/7skb/keymaps/via/rules.mk
diff --git a/keyboards/7skb/readme.md → keyboards/salicylic_acid3/7skb/readme.md b/keyboards/7skb/readme.md → 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 → keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/7skb/rev1/config.h → keyboards/salicylic_acid3/7skb/rev1/config.h
diff --git a/keyboards/7skb/rev1/rev1.c → keyboards/salicylic_acid3/7skb/rev1/rev1.c b/keyboards/7skb/rev1/rev1.c → keyboards/salicylic_acid3/7skb/rev1/rev1.c
diff --git a/keyboards/7skb/rev1/rev1.h → keyboards/salicylic_acid3/7skb/rev1/rev1.h b/keyboards/7skb/rev1/rev1.h → keyboards/salicylic_acid3/7skb/rev1/rev1.h
diff --git a/keyboards/7skb/rev1/rules.mk → keyboards/salicylic_acid3/7skb/rev1/rules.mk b/keyboards/7skb/rev1/rules.mk → keyboards/salicylic_acid3/7skb/rev1/rules.mk
diff --git a/keyboards/7skb/rules.mk → keyboards/salicylic_acid3/7skb/rules.mk b/keyboards/7skb/rules.mk → keyboards/salicylic_acid3/7skb/rules.mk
diff --git a/keyboards/7splus/7splus.c → keyboards/salicylic_acid3/7splus/7splus.c b/keyboards/7splus/7splus.c → keyboards/salicylic_acid3/7splus/7splus.c
diff --git a/keyboards/7splus/7splus.h → keyboards/salicylic_acid3/7splus/7splus.h b/keyboards/7splus/7splus.h → keyboards/salicylic_acid3/7splus/7splus.h
diff --git a/keyboards/7splus/config.h → keyboards/salicylic_acid3/7splus/config.h b/keyboards/7splus/config.h → keyboards/salicylic_acid3/7splus/config.h
diff --git a/keyboards/7splus/info.json → keyboards/salicylic_acid3/7splus/info.json b/keyboards/7splus/info.json → keyboards/salicylic_acid3/7splus/info.json
diff --git a/keyboards/7splus/keymaps/default/keymap.c → ...lic_acid3/7splus/keymaps/default/keymap.c b/keyboards/7splus/keymaps/default/keymap.c → ...lic_acid3/7splus/keymaps/default/keymap.c
diff --git a/keyboards/7splus/keymaps/salicylic/config.h → ...c_acid3/7splus/keymaps/salicylic/config.h b/keyboards/7splus/keymaps/salicylic/config.h → ...c_acid3/7splus/keymaps/salicylic/config.h
diff --git a/keyboards/7splus/keymaps/salicylic/keymap.c → ...c_acid3/7splus/keymaps/salicylic/keymap.c b/keyboards/7splus/keymaps/salicylic/keymap.c → ...c_acid3/7splus/keymaps/salicylic/keymap.c
diff --git a/keyboards/7splus/keymaps/salicylic/rules.mk → ...c_acid3/7splus/keymaps/salicylic/rules.mk b/keyboards/7splus/keymaps/salicylic/rules.mk → ...c_acid3/7splus/keymaps/salicylic/rules.mk
diff --git a/keyboards/7splus/keymaps/via/config.h → ...licylic_acid3/7splus/keymaps/via/config.h b/keyboards/7splus/keymaps/via/config.h → ...licylic_acid3/7splus/keymaps/via/config.h
diff --git a/keyboards/7splus/keymaps/via/keymap.c → ...licylic_acid3/7splus/keymaps/via/keymap.c b/keyboards/7splus/keymaps/via/keymap.c → ...licylic_acid3/7splus/keymaps/via/keymap.c
diff --git a/keyboards/7splus/keymaps/via/rules.mk → ...licylic_acid3/7splus/keymaps/via/rules.mk b/keyboards/7splus/keymaps/via/rules.mk → ...licylic_acid3/7splus/keymaps/via/rules.mk
diff --git a/keyboards/7splus/readme.md → keyboards/salicylic_acid3/7splus/readme.md b/keyboards/7splus/readme.md → 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 → keyboards/salicylic_acid3/7splus/rules.mk b/keyboards/7splus/rules.mk → keyboards/salicylic_acid3/7splus/rules.mk
diff --git a/keyboards/ajisai74/ajisai74.c → ...oards/salicylic_acid3/ajisai74/ajisai74.c b/keyboards/ajisai74/ajisai74.c → ...oards/salicylic_acid3/ajisai74/ajisai74.c
diff --git a/keyboards/ajisai74/ajisai74.h → ...oards/salicylic_acid3/ajisai74/ajisai74.h b/keyboards/ajisai74/ajisai74.h → ...oards/salicylic_acid3/ajisai74/ajisai74.h
diff --git a/keyboards/ajisai74/config.h → keyboards/salicylic_acid3/ajisai74/config.h b/keyboards/ajisai74/config.h → keyboards/salicylic_acid3/ajisai74/config.h
diff --git a/keyboards/ajisai74/info.json → keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/ajisai74/info.json → keyboards/salicylic_acid3/ajisai74/info.json
diff --git a/keyboards/ajisai74/keymaps/default/config.h → ...c_acid3/ajisai74/keymaps/default/config.h b/keyboards/ajisai74/keymaps/default/config.h → ...c_acid3/ajisai74/keymaps/default/config.h
diff --git a/keyboards/ajisai74/keymaps/default/keymap.c → ...c_acid3/ajisai74/keymaps/default/keymap.c b/keyboards/ajisai74/keymaps/default/keymap.c → ...c_acid3/ajisai74/keymaps/default/keymap.c
diff --git a/keyboards/ajisai74/keymaps/jis/config.h → ...cylic_acid3/ajisai74/keymaps/jis/config.h b/keyboards/ajisai74/keymaps/jis/config.h → ...cylic_acid3/ajisai74/keymaps/jis/config.h
diff --git a/keyboards/ajisai74/keymaps/jis/keymap.c → ...cylic_acid3/ajisai74/keymaps/jis/keymap.c b/keyboards/ajisai74/keymaps/jis/keymap.c → ...cylic_acid3/ajisai74/keymaps/jis/keymap.c
diff --git a/keyboards/ajisai74/keymaps/jis/rules.mk → ...cylic_acid3/ajisai74/keymaps/jis/rules.mk b/keyboards/ajisai74/keymaps/jis/rules.mk → ...cylic_acid3/ajisai74/keymaps/jis/rules.mk
diff --git a/...oards/ajisai74/keymaps/salicylic/config.h → ...acid3/ajisai74/keymaps/salicylic/config.h b/...oards/ajisai74/keymaps/salicylic/config.h → ...acid3/ajisai74/keymaps/salicylic/config.h
diff --git a/...oards/ajisai74/keymaps/salicylic/keymap.c → ...acid3/ajisai74/keymaps/salicylic/keymap.c b/...oards/ajisai74/keymaps/salicylic/keymap.c → ...acid3/ajisai74/keymaps/salicylic/keymap.c
diff --git a/...oards/ajisai74/keymaps/salicylic/rules.mk → ...acid3/ajisai74/keymaps/salicylic/rules.mk b/...oards/ajisai74/keymaps/salicylic/rules.mk → ...acid3/ajisai74/keymaps/salicylic/rules.mk
diff --git a/keyboards/ajisai74/keymaps/via/config.h → ...cylic_acid3/ajisai74/keymaps/via/config.h b/keyboards/ajisai74/keymaps/via/config.h → ...cylic_acid3/ajisai74/keymaps/via/config.h
diff --git a/keyboards/ajisai74/keymaps/via/keymap.c → ...cylic_acid3/ajisai74/keymaps/via/keymap.c b/keyboards/ajisai74/keymaps/via/keymap.c → ...cylic_acid3/ajisai74/keymaps/via/keymap.c
diff --git a/keyboards/ajisai74/keymaps/via/rules.mk → ...cylic_acid3/ajisai74/keymaps/via/rules.mk b/keyboards/ajisai74/keymaps/via/rules.mk → ...cylic_acid3/ajisai74/keymaps/via/rules.mk
diff --git a/keyboards/ajisai74/readme.md → keyboards/salicylic_acid3/ajisai74/readme.md b/keyboards/ajisai74/readme.md → 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 → keyboards/salicylic_acid3/ajisai74/rules.mk b/keyboards/ajisai74/rules.mk → keyboards/salicylic_acid3/ajisai74/rules.mk
diff --git a/keyboards/ergoarrows/config.h → ...oards/salicylic_acid3/ergoarrows/config.h b/keyboards/ergoarrows/config.h → ...oards/salicylic_acid3/ergoarrows/config.h
diff --git a/keyboards/ergoarrows/ergoarrows.c → ...s/salicylic_acid3/ergoarrows/ergoarrows.c b/keyboards/ergoarrows/ergoarrows.c → ...s/salicylic_acid3/ergoarrows/ergoarrows.c
diff --git a/keyboards/ergoarrows/ergoarrows.h → ...s/salicylic_acid3/ergoarrows/ergoarrows.h b/keyboards/ergoarrows/ergoarrows.h → ...s/salicylic_acid3/ergoarrows/ergoarrows.h
diff --git a/keyboards/ergoarrows/info.json → ...ards/salicylic_acid3/ergoarrows/info.json b/keyboards/ergoarrows/info.json → ...ards/salicylic_acid3/ergoarrows/info.json
diff --git a/...oards/ergoarrows/keymaps/default/config.h → ...acid3/ergoarrows/keymaps/default/config.h b/...oards/ergoarrows/keymaps/default/config.h → ...acid3/ergoarrows/keymaps/default/config.h
diff --git a/...oards/ergoarrows/keymaps/default/keymap.c → ...acid3/ergoarrows/keymaps/default/keymap.c b/...oards/ergoarrows/keymaps/default/keymap.c → ...acid3/ergoarrows/keymaps/default/keymap.c
diff --git a/...rds/ergoarrows/keymaps/salicylic/config.h → ...id3/ergoarrows/keymaps/salicylic/config.h b/...rds/ergoarrows/keymaps/salicylic/config.h → ...id3/ergoarrows/keymaps/salicylic/config.h
diff --git a/...rds/ergoarrows/keymaps/salicylic/keymap.c → ...id3/ergoarrows/keymaps/salicylic/keymap.c b/...rds/ergoarrows/keymaps/salicylic/keymap.c → ...id3/ergoarrows/keymaps/salicylic/keymap.c
diff --git a/keyboards/ergoarrows/keymaps/via/config.h → ...lic_acid3/ergoarrows/keymaps/via/config.h b/keyboards/ergoarrows/keymaps/via/config.h → ...lic_acid3/ergoarrows/keymaps/via/config.h
diff --git a/keyboards/ergoarrows/keymaps/via/keymap.c → ...lic_acid3/ergoarrows/keymaps/via/keymap.c b/keyboards/ergoarrows/keymaps/via/keymap.c → ...lic_acid3/ergoarrows/keymaps/via/keymap.c
diff --git a/keyboards/ergoarrows/keymaps/via/rules.mk → ...lic_acid3/ergoarrows/keymaps/via/rules.mk b/keyboards/ergoarrows/keymaps/via/rules.mk → ...lic_acid3/ergoarrows/keymaps/via/rules.mk
diff --git a/keyboards/ergoarrows/readme.md → ...ards/salicylic_acid3/ergoarrows/readme.md b/keyboards/ergoarrows/readme.md → ...ards/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 → ...oards/salicylic_acid3/ergoarrows/rules.mk b/keyboards/ergoarrows/rules.mk → ...oards/salicylic_acid3/ergoarrows/rules.mk
diff --git a/keyboards/getta25/.noci → keyboards/salicylic_acid3/getta25/.noci b/keyboards/getta25/.noci → keyboards/salicylic_acid3/getta25/.noci
diff --git a/keyboards/getta25/config.h → keyboards/salicylic_acid3/getta25/config.h b/keyboards/getta25/config.h → keyboards/salicylic_acid3/getta25/config.h
diff --git a/keyboards/getta25/getta25.c → keyboards/salicylic_acid3/getta25/getta25.c b/keyboards/getta25/getta25.c → keyboards/salicylic_acid3/getta25/getta25.c
diff --git a/keyboards/getta25/getta25.h → keyboards/salicylic_acid3/getta25/getta25.h b/keyboards/getta25/getta25.h → 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 → keyboards/salicylic_acid3/getta25/info.json b/keyboards/getta25/info.json → keyboards/salicylic_acid3/getta25/info.json
diff --git a/keyboards/getta25/keymaps/default/config.h → ...ic_acid3/getta25/keymaps/default/config.h b/keyboards/getta25/keymaps/default/config.h → ...ic_acid3/getta25/keymaps/default/config.h
diff --git a/keyboards/getta25/keymaps/default/keymap.c → ...ic_acid3/getta25/keymaps/default/keymap.c b/keyboards/getta25/keymaps/default/keymap.c → ...ic_acid3/getta25/keymaps/default/keymap.c
diff --git a/keyboards/getta25/keymaps/oled/config.h → ...cylic_acid3/getta25/keymaps/oled/config.h b/keyboards/getta25/keymaps/oled/config.h → ...cylic_acid3/getta25/keymaps/oled/config.h
diff --git a/keyboards/getta25/keymaps/oled/glcdfont.c → ...lic_acid3/getta25/keymaps/oled/glcdfont.c b/keyboards/getta25/keymaps/oled/glcdfont.c → ...lic_acid3/getta25/keymaps/oled/glcdfont.c
diff --git a/keyboards/getta25/keymaps/oled/keymap.c → ...cylic_acid3/getta25/keymaps/oled/keymap.c b/keyboards/getta25/keymaps/oled/keymap.c → ...cylic_acid3/getta25/keymaps/oled/keymap.c
diff --git a/keyboards/getta25/keymaps/oled/rules.mk → ...cylic_acid3/getta25/keymaps/oled/rules.mk b/keyboards/getta25/keymaps/oled/rules.mk → ...cylic_acid3/getta25/keymaps/oled/rules.mk
diff --git a/keyboards/getta25/readme.md → keyboards/salicylic_acid3/getta25/readme.md b/keyboards/getta25/readme.md → 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 → ...rds/salicylic_acid3/getta25/rev1/config.h b/keyboards/getta25/rev1/config.h → ...rds/salicylic_acid3/getta25/rev1/config.h
diff --git a/keyboards/getta25/rev1/rev1.c → ...oards/salicylic_acid3/getta25/rev1/rev1.c b/keyboards/getta25/rev1/rev1.c → ...oards/salicylic_acid3/getta25/rev1/rev1.c
diff --git a/keyboards/getta25/rev1/rev1.h → ...oards/salicylic_acid3/getta25/rev1/rev1.h b/keyboards/getta25/rev1/rev1.h → ...oards/salicylic_acid3/getta25/rev1/rev1.h
diff --git a/keyboards/getta25/rev1/rules.mk → ...rds/salicylic_acid3/getta25/rev1/rules.mk b/keyboards/getta25/rev1/rules.mk → ...rds/salicylic_acid3/getta25/rev1/rules.mk
diff --git a/keyboards/getta25/rules.mk → keyboards/salicylic_acid3/getta25/rules.mk b/keyboards/getta25/rules.mk → keyboards/salicylic_acid3/getta25/rules.mk
diff --git a/keyboards/jisplit89/.noci → keyboards/salicylic_acid3/jisplit89/.noci b/keyboards/jisplit89/.noci → keyboards/salicylic_acid3/jisplit89/.noci
diff --git a/keyboards/jisplit89/config.h → keyboards/salicylic_acid3/jisplit89/config.h b/keyboards/jisplit89/config.h → keyboards/salicylic_acid3/jisplit89/config.h
diff --git a/keyboards/jisplit89/info.json → ...oards/salicylic_acid3/jisplit89/info.json b/keyboards/jisplit89/info.json → ...oards/salicylic_acid3/jisplit89/info.json
diff --git a/keyboards/jisplit89/jisplit89.c → ...rds/salicylic_acid3/jisplit89/jisplit89.c b/keyboards/jisplit89/jisplit89.c → ...rds/salicylic_acid3/jisplit89/jisplit89.c
diff --git a/keyboards/jisplit89/jisplit89.h → ...rds/salicylic_acid3/jisplit89/jisplit89.h b/keyboards/jisplit89/jisplit89.h → ...rds/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 → ..._acid3/jisplit89/keymaps/default/keymap.c b/keyboards/jisplit89/keymaps/default/keymap.c → ..._acid3/jisplit89/keymaps/default/keymap.c
diff --git a/...ards/jisplit89/keymaps/salicylic/config.h → ...cid3/jisplit89/keymaps/salicylic/config.h b/...ards/jisplit89/keymaps/salicylic/config.h → ...cid3/jisplit89/keymaps/salicylic/config.h
diff --git a/...ards/jisplit89/keymaps/salicylic/keymap.c → ...cid3/jisplit89/keymaps/salicylic/keymap.c b/...ards/jisplit89/keymaps/salicylic/keymap.c → ...cid3/jisplit89/keymaps/salicylic/keymap.c
diff --git a/...ards/jisplit89/keymaps/salicylic/rules.mk → ...cid3/jisplit89/keymaps/salicylic/rules.mk b/...ards/jisplit89/keymaps/salicylic/rules.mk → ...cid3/jisplit89/keymaps/salicylic/rules.mk
diff --git a/keyboards/jisplit89/keymaps/via/config.h → ...ylic_acid3/jisplit89/keymaps/via/config.h b/keyboards/jisplit89/keymaps/via/config.h → ...ylic_acid3/jisplit89/keymaps/via/config.h
diff --git a/keyboards/jisplit89/keymaps/via/keymap.c → ...ylic_acid3/jisplit89/keymaps/via/keymap.c b/keyboards/jisplit89/keymaps/via/keymap.c → ...ylic_acid3/jisplit89/keymaps/via/keymap.c
diff --git a/keyboards/jisplit89/keymaps/via/rules.mk → ...ylic_acid3/jisplit89/keymaps/via/rules.mk b/keyboards/jisplit89/keymaps/via/rules.mk → ...ylic_acid3/jisplit89/keymaps/via/rules.mk
diff --git a/keyboards/jisplit89/readme.md → ...oards/salicylic_acid3/jisplit89/readme.md b/keyboards/jisplit89/readme.md → ...oards/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 → ...s/salicylic_acid3/jisplit89/rev1/config.h b/keyboards/jisplit89/rev1/config.h → ...s/salicylic_acid3/jisplit89/rev1/config.h
diff --git a/keyboards/jisplit89/rev1/rev1.c → ...rds/salicylic_acid3/jisplit89/rev1/rev1.c b/keyboards/jisplit89/rev1/rev1.c → ...rds/salicylic_acid3/jisplit89/rev1/rev1.c
diff --git a/keyboards/jisplit89/rev1/rev1.h → ...rds/salicylic_acid3/jisplit89/rev1/rev1.h b/keyboards/jisplit89/rev1/rev1.h → ...rds/salicylic_acid3/jisplit89/rev1/rev1.h
diff --git a/keyboards/jisplit89/rev1/rules.mk → ...s/salicylic_acid3/jisplit89/rev1/rules.mk b/keyboards/jisplit89/rev1/rules.mk → ...s/salicylic_acid3/jisplit89/rev1/rules.mk
diff --git a/keyboards/jisplit89/rules.mk → keyboards/salicylic_acid3/jisplit89/rules.mk b/keyboards/jisplit89/rules.mk → keyboards/salicylic_acid3/jisplit89/rules.mk
diff --git a/keyboards/nafuda/config.h → keyboards/salicylic_acid3/nafuda/config.h b/keyboards/nafuda/config.h → keyboards/salicylic_acid3/nafuda/config.h
diff --git a/keyboards/nafuda/info.json → keyboards/salicylic_acid3/nafuda/info.json b/keyboards/nafuda/info.json → keyboards/salicylic_acid3/nafuda/info.json
diff --git a/keyboards/nafuda/keymaps/default/config.h → ...lic_acid3/nafuda/keymaps/default/config.h b/keyboards/nafuda/keymaps/default/config.h → ...lic_acid3/nafuda/keymaps/default/config.h
diff --git a/keyboards/nafuda/keymaps/default/keymap.c → ...lic_acid3/nafuda/keymaps/default/keymap.c b/keyboards/nafuda/keymaps/default/keymap.c → ...lic_acid3/nafuda/keymaps/default/keymap.c
diff --git a/keyboards/nafuda/keymaps/default/readme.md → ...ic_acid3/nafuda/keymaps/default/readme.md b/keyboards/nafuda/keymaps/default/readme.md → ...ic_acid3/nafuda/keymaps/default/readme.md
diff --git a/keyboards/nafuda/nafuda.c → keyboards/salicylic_acid3/nafuda/nafuda.c b/keyboards/nafuda/nafuda.c → keyboards/salicylic_acid3/nafuda/nafuda.c
diff --git a/keyboards/nafuda/nafuda.h → keyboards/salicylic_acid3/nafuda/nafuda.h b/keyboards/nafuda/nafuda.h → keyboards/salicylic_acid3/nafuda/nafuda.h
diff --git a/keyboards/nafuda/readme.md → keyboards/salicylic_acid3/nafuda/readme.md b/keyboards/nafuda/readme.md → 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 → keyboards/salicylic_acid3/nafuda/rules.mk b/keyboards/nafuda/rules.mk → keyboards/salicylic_acid3/nafuda/rules.mk
diff --git a/keyboards/naked48/.noci → keyboards/salicylic_acid3/naked48/.noci b/keyboards/naked48/.noci → keyboards/salicylic_acid3/naked48/.noci
diff --git a/keyboards/naked48/config.h → keyboards/salicylic_acid3/naked48/config.h b/keyboards/naked48/config.h → keyboards/salicylic_acid3/naked48/config.h
diff --git a/keyboards/naked48/info.json → keyboards/salicylic_acid3/naked48/info.json b/keyboards/naked48/info.json → keyboards/salicylic_acid3/naked48/info.json
diff --git a/keyboards/naked48/keymaps/default/config.h → ...ic_acid3/naked48/keymaps/default/config.h b/keyboards/naked48/keymaps/default/config.h → ...ic_acid3/naked48/keymaps/default/config.h
diff --git a/keyboards/naked48/keymaps/default/keymap.c → ...ic_acid3/naked48/keymaps/default/keymap.c b/keyboards/naked48/keymaps/default/keymap.c → ...ic_acid3/naked48/keymaps/default/keymap.c
diff --git a/keyboards/naked48/keymaps/default/readme.md → ...c_acid3/naked48/keymaps/default/readme.md b/keyboards/naked48/keymaps/default/readme.md → ...c_acid3/naked48/keymaps/default/readme.md
diff --git a/keyboards/naked48/keymaps/default/rules.mk → ...ic_acid3/naked48/keymaps/default/rules.mk b/keyboards/naked48/keymaps/default/rules.mk → ...ic_acid3/naked48/keymaps/default/rules.mk
diff --git a/...ed48/keymaps/default_with_nafuda/config.h → ...ed48/keymaps/default_with_nafuda/config.h b/...ed48/keymaps/default_with_nafuda/config.h → ...ed48/keymaps/default_with_nafuda/config.h
diff --git a/...ed48/keymaps/default_with_nafuda/keymap.c → ...ed48/keymaps/default_with_nafuda/keymap.c b/...ed48/keymaps/default_with_nafuda/keymap.c → ...ed48/keymaps/default_with_nafuda/keymap.c
diff --git a/...d48/keymaps/default_with_nafuda/readme.md → ...d48/keymaps/default_with_nafuda/readme.md b/...d48/keymaps/default_with_nafuda/readme.md → ...d48/keymaps/default_with_nafuda/readme.md
diff --git a/...ed48/keymaps/default_with_nafuda/rules.mk → ...ed48/keymaps/default_with_nafuda/rules.mk b/...ed48/keymaps/default_with_nafuda/rules.mk → ...ed48/keymaps/default_with_nafuda/rules.mk
diff --git a/...d48/keymaps/default_with_setta21/config.h → ...d48/keymaps/default_with_setta21/config.h b/...d48/keymaps/default_with_setta21/config.h → ...d48/keymaps/default_with_setta21/config.h
diff --git a/...d48/keymaps/default_with_setta21/keymap.c → ...d48/keymaps/default_with_setta21/keymap.c b/...d48/keymaps/default_with_setta21/keymap.c → ...d48/keymaps/default_with_setta21/keymap.c
diff --git a/...48/keymaps/default_with_setta21/readme.md → ...48/keymaps/default_with_setta21/readme.md b/...48/keymaps/default_with_setta21/readme.md → ...48/keymaps/default_with_setta21/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic/config.h → ..._acid3/naked48/keymaps/salicylic/config.h b/keyboards/naked48/keymaps/salicylic/config.h → ..._acid3/naked48/keymaps/salicylic/config.h
diff --git a/keyboards/naked48/keymaps/salicylic/keymap.c → ..._acid3/naked48/keymaps/salicylic/keymap.c b/keyboards/naked48/keymaps/salicylic/keymap.c → ..._acid3/naked48/keymaps/salicylic/keymap.c
diff --git a/...oards/naked48/keymaps/salicylic/readme.md → ...acid3/naked48/keymaps/salicylic/readme.md b/...oards/naked48/keymaps/salicylic/readme.md → ...acid3/naked48/keymaps/salicylic/readme.md
diff --git a/keyboards/naked48/keymaps/salicylic/rules.mk → ..._acid3/naked48/keymaps/salicylic/rules.mk b/keyboards/naked48/keymaps/salicylic/rules.mk → ..._acid3/naked48/keymaps/salicylic/rules.mk
diff --git a/...48/keymaps/salicylic_with_nafuda/config.h → ...48/keymaps/salicylic_with_nafuda/config.h b/...48/keymaps/salicylic_with_nafuda/config.h → ...48/keymaps/salicylic_with_nafuda/config.h
diff --git a/...48/keymaps/salicylic_with_nafuda/keymap.c → ...48/keymaps/salicylic_with_nafuda/keymap.c b/...48/keymaps/salicylic_with_nafuda/keymap.c → ...48/keymaps/salicylic_with_nafuda/keymap.c
diff --git a/...8/keymaps/salicylic_with_nafuda/readme.md → ...8/keymaps/salicylic_with_nafuda/readme.md b/...8/keymaps/salicylic_with_nafuda/readme.md → ...8/keymaps/salicylic_with_nafuda/readme.md
diff --git a/...48/keymaps/salicylic_with_nafuda/rules.mk → ...48/keymaps/salicylic_with_nafuda/rules.mk b/...48/keymaps/salicylic_with_nafuda/rules.mk → ...48/keymaps/salicylic_with_nafuda/rules.mk
diff --git a/...8/keymaps/salicylic_with_setta21/config.h → ...8/keymaps/salicylic_with_setta21/config.h b/...8/keymaps/salicylic_with_setta21/config.h → ...8/keymaps/salicylic_with_setta21/config.h
diff --git a/...8/keymaps/salicylic_with_setta21/keymap.c → ...8/keymaps/salicylic_with_setta21/keymap.c b/...8/keymaps/salicylic_with_setta21/keymap.c → ...8/keymaps/salicylic_with_setta21/keymap.c
diff --git a/.../keymaps/salicylic_with_setta21/readme.md → .../keymaps/salicylic_with_setta21/readme.md b/.../keymaps/salicylic_with_setta21/readme.md → .../keymaps/salicylic_with_setta21/readme.md
diff --git a/...8/keymaps/salicylic_with_setta21/rules.mk → ...8/keymaps/salicylic_with_setta21/rules.mk b/...8/keymaps/salicylic_with_setta21/rules.mk → ...8/keymaps/salicylic_with_setta21/rules.mk
diff --git a/keyboards/naked48/keymaps/scheiklp/config.h → ...c_acid3/naked48/keymaps/scheiklp/config.h b/keyboards/naked48/keymaps/scheiklp/config.h → ...c_acid3/naked48/keymaps/scheiklp/config.h
diff --git a/keyboards/naked48/keymaps/scheiklp/keymap.c → ...c_acid3/naked48/keymaps/scheiklp/keymap.c b/keyboards/naked48/keymaps/scheiklp/keymap.c → ...c_acid3/naked48/keymaps/scheiklp/keymap.c
diff --git a/keyboards/naked48/keymaps/scheiklp/readme.md → ..._acid3/naked48/keymaps/scheiklp/readme.md b/keyboards/naked48/keymaps/scheiklp/readme.md → ..._acid3/naked48/keymaps/scheiklp/readme.md
diff --git a/keyboards/naked48/keymaps/scheiklp/rules.mk → ...c_acid3/naked48/keymaps/scheiklp/rules.mk b/keyboards/naked48/keymaps/scheiklp/rules.mk → ...c_acid3/naked48/keymaps/scheiklp/rules.mk
diff --git a/keyboards/naked48/keymaps/via/config.h → ...icylic_acid3/naked48/keymaps/via/config.h b/keyboards/naked48/keymaps/via/config.h → ...icylic_acid3/naked48/keymaps/via/config.h
diff --git a/keyboards/naked48/keymaps/via/keymap.c → ...icylic_acid3/naked48/keymaps/via/keymap.c b/keyboards/naked48/keymaps/via/keymap.c → ...icylic_acid3/naked48/keymaps/via/keymap.c
diff --git a/keyboards/naked48/keymaps/via/rules.mk → ...icylic_acid3/naked48/keymaps/via/rules.mk b/keyboards/naked48/keymaps/via/rules.mk → ...icylic_acid3/naked48/keymaps/via/rules.mk
diff --git a/...s/naked48/keymaps/via_rgb_matrix/config.h → ...3/naked48/keymaps/via_rgb_matrix/config.h b/...s/naked48/keymaps/via_rgb_matrix/config.h → ...3/naked48/keymaps/via_rgb_matrix/config.h
diff --git a/...s/naked48/keymaps/via_rgb_matrix/keymap.c → ...3/naked48/keymaps/via_rgb_matrix/keymap.c b/...s/naked48/keymaps/via_rgb_matrix/keymap.c → ...3/naked48/keymaps/via_rgb_matrix/keymap.c
diff --git a/...s/naked48/keymaps/via_rgb_matrix/rules.mk → ...3/naked48/keymaps/via_rgb_matrix/rules.mk b/...s/naked48/keymaps/via_rgb_matrix/rules.mk → ...3/naked48/keymaps/via_rgb_matrix/rules.mk
diff --git a/keyboards/naked48/naked48.c → keyboards/salicylic_acid3/naked48/naked48.c b/keyboards/naked48/naked48.c → keyboards/salicylic_acid3/naked48/naked48.c
diff --git a/keyboards/naked48/naked48.h → keyboards/salicylic_acid3/naked48/naked48.h b/keyboards/naked48/naked48.h → 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 → keyboards/salicylic_acid3/naked48/readme.md b/keyboards/naked48/readme.md → 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 → ...rds/salicylic_acid3/naked48/rev1/config.h b/keyboards/naked48/rev1/config.h → ...rds/salicylic_acid3/naked48/rev1/config.h
diff --git a/keyboards/naked48/rev1/rev1.c → ...oards/salicylic_acid3/naked48/rev1/rev1.c b/keyboards/naked48/rev1/rev1.c → ...oards/salicylic_acid3/naked48/rev1/rev1.c
diff --git a/keyboards/naked48/rev1/rev1.h → ...oards/salicylic_acid3/naked48/rev1/rev1.h b/keyboards/naked48/rev1/rev1.h → ...oards/salicylic_acid3/naked48/rev1/rev1.h
diff --git a/keyboards/naked48/rev1/rules.mk → ...rds/salicylic_acid3/naked48/rev1/rules.mk b/keyboards/naked48/rev1/rules.mk → ...rds/salicylic_acid3/naked48/rev1/rules.mk
diff --git a/keyboards/naked48/rules.mk → keyboards/salicylic_acid3/naked48/rules.mk b/keyboards/naked48/rules.mk → keyboards/salicylic_acid3/naked48/rules.mk
diff --git a/keyboards/naked60/config.h → keyboards/salicylic_acid3/naked60/config.h b/keyboards/naked60/config.h → keyboards/salicylic_acid3/naked60/config.h
diff --git a/keyboards/naked60/info.json → keyboards/salicylic_acid3/naked60/info.json b/keyboards/naked60/info.json → keyboards/salicylic_acid3/naked60/info.json
diff --git a/keyboards/naked60/keymaps/333fred/config.h → ...ic_acid3/naked60/keymaps/333fred/config.h b/keyboards/naked60/keymaps/333fred/config.h → ...ic_acid3/naked60/keymaps/333fred/config.h
diff --git a/keyboards/naked60/keymaps/333fred/keymap.c → ...ic_acid3/naked60/keymaps/333fred/keymap.c b/keyboards/naked60/keymaps/333fred/keymap.c → ...ic_acid3/naked60/keymaps/333fred/keymap.c
diff --git a/keyboards/naked60/keymaps/default/config.h → ...ic_acid3/naked60/keymaps/default/config.h b/keyboards/naked60/keymaps/default/config.h → ...ic_acid3/naked60/keymaps/default/config.h
diff --git a/keyboards/naked60/keymaps/default/keymap.c → ...ic_acid3/naked60/keymaps/default/keymap.c b/keyboards/naked60/keymaps/default/keymap.c → ...ic_acid3/naked60/keymaps/default/keymap.c
diff --git a/keyboards/naked60/keymaps/default/readme.md → ...c_acid3/naked60/keymaps/default/readme.md b/keyboards/naked60/keymaps/default/readme.md → ...c_acid3/naked60/keymaps/default/readme.md
diff --git a/...ed60/keymaps/default_with_nafuda/config.h → ...ed60/keymaps/default_with_nafuda/config.h b/...ed60/keymaps/default_with_nafuda/config.h → ...ed60/keymaps/default_with_nafuda/config.h
diff --git a/...ed60/keymaps/default_with_nafuda/keymap.c → ...ed60/keymaps/default_with_nafuda/keymap.c b/...ed60/keymaps/default_with_nafuda/keymap.c → ...ed60/keymaps/default_with_nafuda/keymap.c
diff --git a/...d60/keymaps/default_with_nafuda/readme.md → ...d60/keymaps/default_with_nafuda/readme.md b/...d60/keymaps/default_with_nafuda/readme.md → ...d60/keymaps/default_with_nafuda/readme.md
diff --git a/...d60/keymaps/default_with_setta21/config.h → ...d60/keymaps/default_with_setta21/config.h b/...d60/keymaps/default_with_setta21/config.h → ...d60/keymaps/default_with_setta21/config.h
diff --git a/...d60/keymaps/default_with_setta21/keymap.c → ...d60/keymaps/default_with_setta21/keymap.c b/...d60/keymaps/default_with_setta21/keymap.c → ...d60/keymaps/default_with_setta21/keymap.c
diff --git a/...60/keymaps/default_with_setta21/readme.md → ...60/keymaps/default_with_setta21/readme.md b/...60/keymaps/default_with_setta21/readme.md → ...60/keymaps/default_with_setta21/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic/config.h → ..._acid3/naked60/keymaps/salicylic/config.h b/keyboards/naked60/keymaps/salicylic/config.h → ..._acid3/naked60/keymaps/salicylic/config.h
diff --git a/keyboards/naked60/keymaps/salicylic/keymap.c → ..._acid3/naked60/keymaps/salicylic/keymap.c b/keyboards/naked60/keymaps/salicylic/keymap.c → ..._acid3/naked60/keymaps/salicylic/keymap.c
diff --git a/...oards/naked60/keymaps/salicylic/readme.md → ...acid3/naked60/keymaps/salicylic/readme.md b/...oards/naked60/keymaps/salicylic/readme.md → ...acid3/naked60/keymaps/salicylic/readme.md
diff --git a/keyboards/naked60/keymaps/salicylic/rules.mk → ..._acid3/naked60/keymaps/salicylic/rules.mk b/keyboards/naked60/keymaps/salicylic/rules.mk → ..._acid3/naked60/keymaps/salicylic/rules.mk
diff --git a/...60/keymaps/salicylic_with_nafuda/config.h → ...60/keymaps/salicylic_with_nafuda/config.h b/...60/keymaps/salicylic_with_nafuda/config.h → ...60/keymaps/salicylic_with_nafuda/config.h
diff --git a/...60/keymaps/salicylic_with_nafuda/keymap.c → ...60/keymaps/salicylic_with_nafuda/keymap.c b/...60/keymaps/salicylic_with_nafuda/keymap.c → ...60/keymaps/salicylic_with_nafuda/keymap.c
diff --git a/...0/keymaps/salicylic_with_nafuda/readme.md → ...0/keymaps/salicylic_with_nafuda/readme.md b/...0/keymaps/salicylic_with_nafuda/readme.md → ...0/keymaps/salicylic_with_nafuda/readme.md
diff --git a/...60/keymaps/salicylic_with_nafuda/rules.mk → ...60/keymaps/salicylic_with_nafuda/rules.mk b/...60/keymaps/salicylic_with_nafuda/rules.mk → ...60/keymaps/salicylic_with_nafuda/rules.mk
diff --git a/...0/keymaps/salicylic_with_setta21/config.h → ...0/keymaps/salicylic_with_setta21/config.h b/...0/keymaps/salicylic_with_setta21/config.h → ...0/keymaps/salicylic_with_setta21/config.h
diff --git a/...0/keymaps/salicylic_with_setta21/keymap.c → ...0/keymaps/salicylic_with_setta21/keymap.c b/...0/keymaps/salicylic_with_setta21/keymap.c → ...0/keymaps/salicylic_with_setta21/keymap.c
diff --git a/.../keymaps/salicylic_with_setta21/readme.md → .../keymaps/salicylic_with_setta21/readme.md b/.../keymaps/salicylic_with_setta21/readme.md → .../keymaps/salicylic_with_setta21/readme.md
diff --git a/...0/keymaps/salicylic_with_setta21/rules.mk → ...0/keymaps/salicylic_with_setta21/rules.mk b/...0/keymaps/salicylic_with_setta21/rules.mk → ...0/keymaps/salicylic_with_setta21/rules.mk
diff --git a/keyboards/naked60/keymaps/via/config.h → ...icylic_acid3/naked60/keymaps/via/config.h b/keyboards/naked60/keymaps/via/config.h → ...icylic_acid3/naked60/keymaps/via/config.h
diff --git a/keyboards/naked60/keymaps/via/keymap.c → ...icylic_acid3/naked60/keymaps/via/keymap.c b/keyboards/naked60/keymaps/via/keymap.c → ...icylic_acid3/naked60/keymaps/via/keymap.c
diff --git a/keyboards/naked60/keymaps/via/rules.mk → ...icylic_acid3/naked60/keymaps/via/rules.mk b/keyboards/naked60/keymaps/via/rules.mk → ...icylic_acid3/naked60/keymaps/via/rules.mk
diff --git a/keyboards/naked60/naked60.c → keyboards/salicylic_acid3/naked60/naked60.c b/keyboards/naked60/naked60.c → keyboards/salicylic_acid3/naked60/naked60.c
diff --git a/keyboards/naked60/naked60.h → keyboards/salicylic_acid3/naked60/naked60.h b/keyboards/naked60/naked60.h → 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 → keyboards/salicylic_acid3/naked60/readme.md b/keyboards/naked60/readme.md → 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 → ...rds/salicylic_acid3/naked60/rev1/config.h b/keyboards/naked60/rev1/config.h → ...rds/salicylic_acid3/naked60/rev1/config.h
diff --git a/keyboards/naked60/rev1/rev1.c → ...oards/salicylic_acid3/naked60/rev1/rev1.c b/keyboards/naked60/rev1/rev1.c → ...oards/salicylic_acid3/naked60/rev1/rev1.c
diff --git a/keyboards/naked60/rev1/rev1.h → ...oards/salicylic_acid3/naked60/rev1/rev1.h b/keyboards/naked60/rev1/rev1.h → ...oards/salicylic_acid3/naked60/rev1/rev1.h
diff --git a/keyboards/naked60/rev1/rules.mk → ...rds/salicylic_acid3/naked60/rev1/rules.mk b/keyboards/naked60/rev1/rules.mk → ...rds/salicylic_acid3/naked60/rev1/rules.mk
diff --git a/keyboards/naked60/rules.mk → keyboards/salicylic_acid3/naked60/rules.mk b/keyboards/naked60/rules.mk → keyboards/salicylic_acid3/naked60/rules.mk
diff --git a/keyboards/naked64/.noci → keyboards/salicylic_acid3/naked64/.noci b/keyboards/naked64/.noci → keyboards/salicylic_acid3/naked64/.noci
diff --git a/keyboards/naked64/config.h → keyboards/salicylic_acid3/naked64/config.h b/keyboards/naked64/config.h → keyboards/salicylic_acid3/naked64/config.h
diff --git a/keyboards/naked64/info.json → keyboards/salicylic_acid3/naked64/info.json b/keyboards/naked64/info.json → keyboards/salicylic_acid3/naked64/info.json
diff --git a/keyboards/naked64/keymaps/default/config.h → ...ic_acid3/naked64/keymaps/default/config.h b/keyboards/naked64/keymaps/default/config.h → ...ic_acid3/naked64/keymaps/default/config.h
diff --git a/keyboards/naked64/keymaps/default/keymap.c → ...ic_acid3/naked64/keymaps/default/keymap.c b/keyboards/naked64/keymaps/default/keymap.c → ...ic_acid3/naked64/keymaps/default/keymap.c
diff --git a/keyboards/naked64/keymaps/default/readme.md → ...c_acid3/naked64/keymaps/default/readme.md b/keyboards/naked64/keymaps/default/readme.md → ...c_acid3/naked64/keymaps/default/readme.md
diff --git a/keyboards/naked64/keymaps/default/rules.mk → ...ic_acid3/naked64/keymaps/default/rules.mk b/keyboards/naked64/keymaps/default/rules.mk → ...ic_acid3/naked64/keymaps/default/rules.mk
diff --git a/...d64/keymaps/default_with_setta21/config.h → ...d64/keymaps/default_with_setta21/config.h b/...d64/keymaps/default_with_setta21/config.h → ...d64/keymaps/default_with_setta21/config.h
diff --git a/...d64/keymaps/default_with_setta21/keymap.c → ...d64/keymaps/default_with_setta21/keymap.c b/...d64/keymaps/default_with_setta21/keymap.c → ...d64/keymaps/default_with_setta21/keymap.c
diff --git a/...64/keymaps/default_with_setta21/readme.md → ...64/keymaps/default_with_setta21/readme.md b/...64/keymaps/default_with_setta21/readme.md → ...64/keymaps/default_with_setta21/readme.md
diff --git a/...d64/keymaps/default_with_setta21/rules.mk → ...d64/keymaps/default_with_setta21/rules.mk b/...d64/keymaps/default_with_setta21/rules.mk → ...d64/keymaps/default_with_setta21/rules.mk
diff --git a/keyboards/naked64/keymaps/salicylic/config.h → ..._acid3/naked64/keymaps/salicylic/config.h b/keyboards/naked64/keymaps/salicylic/config.h → ..._acid3/naked64/keymaps/salicylic/config.h
diff --git a/keyboards/naked64/keymaps/salicylic/keymap.c → ..._acid3/naked64/keymaps/salicylic/keymap.c b/keyboards/naked64/keymaps/salicylic/keymap.c → ..._acid3/naked64/keymaps/salicylic/keymap.c
diff --git a/...oards/naked64/keymaps/salicylic/readme.md → ...acid3/naked64/keymaps/salicylic/readme.md b/...oards/naked64/keymaps/salicylic/readme.md → ...acid3/naked64/keymaps/salicylic/readme.md
diff --git a/keyboards/naked64/keymaps/salicylic/rules.mk → ..._acid3/naked64/keymaps/salicylic/rules.mk b/keyboards/naked64/keymaps/salicylic/rules.mk → ..._acid3/naked64/keymaps/salicylic/rules.mk
diff --git a/...4/keymaps/salicylic_with_setta21/config.h → ...4/keymaps/salicylic_with_setta21/config.h b/...4/keymaps/salicylic_with_setta21/config.h → ...4/keymaps/salicylic_with_setta21/config.h
diff --git a/...4/keymaps/salicylic_with_setta21/keymap.c → ...4/keymaps/salicylic_with_setta21/keymap.c b/...4/keymaps/salicylic_with_setta21/keymap.c → ...4/keymaps/salicylic_with_setta21/keymap.c
diff --git a/.../keymaps/salicylic_with_setta21/readme.md → .../keymaps/salicylic_with_setta21/readme.md b/.../keymaps/salicylic_with_setta21/readme.md → .../keymaps/salicylic_with_setta21/readme.md
diff --git a/...4/keymaps/salicylic_with_setta21/rules.mk → ...4/keymaps/salicylic_with_setta21/rules.mk b/...4/keymaps/salicylic_with_setta21/rules.mk → ...4/keymaps/salicylic_with_setta21/rules.mk
diff --git a/keyboards/naked64/naked64.c → keyboards/salicylic_acid3/naked64/naked64.c b/keyboards/naked64/naked64.c → keyboards/salicylic_acid3/naked64/naked64.c
diff --git a/keyboards/naked64/naked64.h → keyboards/salicylic_acid3/naked64/naked64.h b/keyboards/naked64/naked64.h → 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 → keyboards/salicylic_acid3/naked64/readme.md b/keyboards/naked64/readme.md → 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 → ...rds/salicylic_acid3/naked64/rev1/config.h b/keyboards/naked64/rev1/config.h → ...rds/salicylic_acid3/naked64/rev1/config.h
diff --git a/keyboards/naked64/rev1/rev1.c → ...oards/salicylic_acid3/naked64/rev1/rev1.c b/keyboards/naked64/rev1/rev1.c → ...oards/salicylic_acid3/naked64/rev1/rev1.c
diff --git a/keyboards/naked64/rev1/rev1.h → ...oards/salicylic_acid3/naked64/rev1/rev1.h b/keyboards/naked64/rev1/rev1.h → ...oards/salicylic_acid3/naked64/rev1/rev1.h
diff --git a/keyboards/naked64/rev1/rules.mk → ...rds/salicylic_acid3/naked64/rev1/rules.mk b/keyboards/naked64/rev1/rules.mk → ...rds/salicylic_acid3/naked64/rev1/rules.mk
diff --git a/keyboards/naked64/rules.mk → keyboards/salicylic_acid3/naked64/rules.mk b/keyboards/naked64/rules.mk → keyboards/salicylic_acid3/naked64/rules.mk
diff --git a/keyboards/nknl7en/config.h → keyboards/salicylic_acid3/nknl7en/config.h b/keyboards/nknl7en/config.h → keyboards/salicylic_acid3/nknl7en/config.h
diff --git a/keyboards/nknl7en/info.json → keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/nknl7en/info.json → keyboards/salicylic_acid3/nknl7en/info.json
diff --git a/keyboards/nknl7en/keymaps/default/config.h → ...ic_acid3/nknl7en/keymaps/default/config.h b/keyboards/nknl7en/keymaps/default/config.h → ...ic_acid3/nknl7en/keymaps/default/config.h
diff --git a/keyboards/nknl7en/keymaps/default/keymap.c → ...ic_acid3/nknl7en/keymaps/default/keymap.c b/keyboards/nknl7en/keymaps/default/keymap.c → ...ic_acid3/nknl7en/keymaps/default/keymap.c
diff --git a/keyboards/nknl7en/keymaps/salicylic/config.h → ..._acid3/nknl7en/keymaps/salicylic/config.h b/keyboards/nknl7en/keymaps/salicylic/config.h → ..._acid3/nknl7en/keymaps/salicylic/config.h
diff --git a/keyboards/nknl7en/keymaps/salicylic/keymap.c → ..._acid3/nknl7en/keymaps/salicylic/keymap.c b/keyboards/nknl7en/keymaps/salicylic/keymap.c → ..._acid3/nknl7en/keymaps/salicylic/keymap.c
diff --git a/keyboards/nknl7en/keymaps/via/config.h → ...icylic_acid3/nknl7en/keymaps/via/config.h b/keyboards/nknl7en/keymaps/via/config.h → ...icylic_acid3/nknl7en/keymaps/via/config.h
diff --git a/keyboards/nknl7en/keymaps/via/keymap.c → ...icylic_acid3/nknl7en/keymaps/via/keymap.c b/keyboards/nknl7en/keymaps/via/keymap.c → ...icylic_acid3/nknl7en/keymaps/via/keymap.c
diff --git a/keyboards/nknl7en/keymaps/via/rules.mk → ...icylic_acid3/nknl7en/keymaps/via/rules.mk b/keyboards/nknl7en/keymaps/via/rules.mk → ...icylic_acid3/nknl7en/keymaps/via/rules.mk
diff --git a/keyboards/nknl7en/nknl7en.c → keyboards/salicylic_acid3/nknl7en/nknl7en.c b/keyboards/nknl7en/nknl7en.c → keyboards/salicylic_acid3/nknl7en/nknl7en.c
diff --git a/keyboards/nknl7en/nknl7en.h → keyboards/salicylic_acid3/nknl7en/nknl7en.h b/keyboards/nknl7en/nknl7en.h → keyboards/salicylic_acid3/nknl7en/nknl7en.h
diff --git a/keyboards/nknl7en/readme.md → keyboards/salicylic_acid3/nknl7en/readme.md b/keyboards/nknl7en/readme.md → 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 → keyboards/salicylic_acid3/nknl7en/rules.mk b/keyboards/nknl7en/rules.mk → keyboards/salicylic_acid3/nknl7en/rules.mk
diff --git a/keyboards/nknl7jp/config.h → keyboards/salicylic_acid3/nknl7jp/config.h b/keyboards/nknl7jp/config.h → keyboards/salicylic_acid3/nknl7jp/config.h
diff --git a/keyboards/nknl7jp/info.json → keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/nknl7jp/info.json → keyboards/salicylic_acid3/nknl7jp/info.json
diff --git a/keyboards/nknl7jp/keymaps/default/config.h → ...ic_acid3/nknl7jp/keymaps/default/config.h b/keyboards/nknl7jp/keymaps/default/config.h → ...ic_acid3/nknl7jp/keymaps/default/config.h
diff --git a/keyboards/nknl7jp/keymaps/default/keymap.c → ...ic_acid3/nknl7jp/keymaps/default/keymap.c b/keyboards/nknl7jp/keymaps/default/keymap.c → ...ic_acid3/nknl7jp/keymaps/default/keymap.c
diff --git a/keyboards/nknl7jp/keymaps/salicylic/config.h → ..._acid3/nknl7jp/keymaps/salicylic/config.h b/keyboards/nknl7jp/keymaps/salicylic/config.h → ..._acid3/nknl7jp/keymaps/salicylic/config.h
diff --git a/keyboards/nknl7jp/keymaps/salicylic/keymap.c → ..._acid3/nknl7jp/keymaps/salicylic/keymap.c b/keyboards/nknl7jp/keymaps/salicylic/keymap.c → ..._acid3/nknl7jp/keymaps/salicylic/keymap.c
diff --git a/keyboards/nknl7jp/keymaps/via/config.h → ...icylic_acid3/nknl7jp/keymaps/via/config.h b/keyboards/nknl7jp/keymaps/via/config.h → ...icylic_acid3/nknl7jp/keymaps/via/config.h
diff --git a/keyboards/nknl7jp/keymaps/via/keymap.c → ...icylic_acid3/nknl7jp/keymaps/via/keymap.c b/keyboards/nknl7jp/keymaps/via/keymap.c → ...icylic_acid3/nknl7jp/keymaps/via/keymap.c
diff --git a/keyboards/nknl7jp/keymaps/via/rules.mk → ...icylic_acid3/nknl7jp/keymaps/via/rules.mk b/keyboards/nknl7jp/keymaps/via/rules.mk → ...icylic_acid3/nknl7jp/keymaps/via/rules.mk
diff --git a/keyboards/nknl7jp/nknl7jp.c → keyboards/salicylic_acid3/nknl7jp/nknl7jp.c b/keyboards/nknl7jp/nknl7jp.c → keyboards/salicylic_acid3/nknl7jp/nknl7jp.c
diff --git a/keyboards/nknl7jp/nknl7jp.h → keyboards/salicylic_acid3/nknl7jp/nknl7jp.h b/keyboards/nknl7jp/nknl7jp.h → keyboards/salicylic_acid3/nknl7jp/nknl7jp.h
diff --git a/keyboards/nknl7jp/readme.md → keyboards/salicylic_acid3/nknl7jp/readme.md b/keyboards/nknl7jp/readme.md → 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 → keyboards/salicylic_acid3/nknl7jp/rules.mk b/keyboards/nknl7jp/rules.mk → keyboards/salicylic_acid3/nknl7jp/rules.mk
diff --git a/keyboards/setta21/config.h → keyboards/salicylic_acid3/setta21/config.h b/keyboards/setta21/config.h → keyboards/salicylic_acid3/setta21/config.h
diff --git a/keyboards/setta21/info.json → keyboards/salicylic_acid3/setta21/info.json b/keyboards/setta21/info.json → keyboards/salicylic_acid3/setta21/info.json
diff --git a/keyboards/setta21/keymaps/default/config.h → ...ic_acid3/setta21/keymaps/default/config.h b/keyboards/setta21/keymaps/default/config.h → ...ic_acid3/setta21/keymaps/default/config.h
diff --git a/keyboards/setta21/keymaps/default/keymap.c → ...ic_acid3/setta21/keymaps/default/keymap.c b/keyboards/setta21/keymaps/default/keymap.c → ...ic_acid3/setta21/keymaps/default/keymap.c
diff --git a/keyboards/setta21/keymaps/default/readme.md → ...c_acid3/setta21/keymaps/default/readme.md b/keyboards/setta21/keymaps/default/readme.md → ...c_acid3/setta21/keymaps/default/readme.md
diff --git a/keyboards/setta21/keymaps/salicylic/config.h → ..._acid3/setta21/keymaps/salicylic/config.h b/keyboards/setta21/keymaps/salicylic/config.h → ..._acid3/setta21/keymaps/salicylic/config.h
diff --git a/keyboards/setta21/keymaps/salicylic/keymap.c → ..._acid3/setta21/keymaps/salicylic/keymap.c b/keyboards/setta21/keymaps/salicylic/keymap.c → ..._acid3/setta21/keymaps/salicylic/keymap.c
diff --git a/...oards/setta21/keymaps/salicylic/readme.md → ...acid3/setta21/keymaps/salicylic/readme.md b/...oards/setta21/keymaps/salicylic/readme.md → ...acid3/setta21/keymaps/salicylic/readme.md
diff --git a/keyboards/setta21/keymaps/salicylic/rules.mk → ..._acid3/setta21/keymaps/salicylic/rules.mk b/keyboards/setta21/keymaps/salicylic/rules.mk → ..._acid3/setta21/keymaps/salicylic/rules.mk
diff --git a/keyboards/setta21/readme.md → keyboards/salicylic_acid3/setta21/readme.md b/keyboards/setta21/readme.md → 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 → keyboards/salicylic_acid3/setta21/rev1/.noci b/keyboards/setta21/rev1/.noci → keyboards/salicylic_acid3/setta21/rev1/.noci
diff --git a/keyboards/setta21/rev1/config.h → ...rds/salicylic_acid3/setta21/rev1/config.h b/keyboards/setta21/rev1/config.h → ...rds/salicylic_acid3/setta21/rev1/config.h
diff --git a/keyboards/setta21/rev1/rev1.c → ...oards/salicylic_acid3/setta21/rev1/rev1.c b/keyboards/setta21/rev1/rev1.c → ...oards/salicylic_acid3/setta21/rev1/rev1.c
diff --git a/keyboards/setta21/rev1/rev1.h → ...oards/salicylic_acid3/setta21/rev1/rev1.h b/keyboards/setta21/rev1/rev1.h → ...oards/salicylic_acid3/setta21/rev1/rev1.h
diff --git a/keyboards/setta21/rev1/rules.mk → ...rds/salicylic_acid3/setta21/rev1/rules.mk b/keyboards/setta21/rev1/rules.mk → ...rds/salicylic_acid3/setta21/rev1/rules.mk
diff --git a/keyboards/setta21/rules.mk → keyboards/salicylic_acid3/setta21/rules.mk b/keyboards/setta21/rules.mk → keyboards/salicylic_acid3/setta21/rules.mk
diff --git a/keyboards/setta21/setta21.c → keyboards/salicylic_acid3/setta21/setta21.c b/keyboards/setta21/setta21.c → keyboards/salicylic_acid3/setta21/setta21.c
diff --git a/keyboards/setta21/setta21.h → keyboards/salicylic_acid3/setta21/setta21.h b/keyboards/setta21/setta21.h → 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