58 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/alicia_cook/alicia_cook.c b/keyboards/ibnuda/alicia_cook/alicia_cook.c
index 39f17e4a7d..39f17e4a7d 100644
--- a/keyboards/alicia_cook/alicia_cook.c
+++ b/keyboards/ibnuda/alicia_cook/alicia_cook.c
diff --git a/keyboards/alicia_cook/alicia_cook.h b/keyboards/ibnuda/alicia_cook/alicia_cook.h
index 35c803b3ae..35c803b3ae 100644
--- a/keyboards/alicia_cook/alicia_cook.h
+++ b/keyboards/ibnuda/alicia_cook/alicia_cook.h
diff --git a/keyboards/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h
index 28db5f3420..28db5f3420 100644
--- a/keyboards/alicia_cook/config.h
+++ b/keyboards/ibnuda/alicia_cook/config.h
diff --git a/keyboards/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json
index c07be77190..c07be77190 100644
--- a/keyboards/alicia_cook/info.json
+++ b/keyboards/ibnuda/alicia_cook/info.json
diff --git a/keyboards/alicia_cook/keymaps/default/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/default/keymap.c
index c28967f381..c28967f381 100644
--- a/keyboards/alicia_cook/keymaps/default/keymap.c
+++ b/keyboards/ibnuda/alicia_cook/keymaps/default/keymap.c
diff --git a/keyboards/alicia_cook/keymaps/default/readme.md b/keyboards/ibnuda/alicia_cook/keymaps/default/readme.md
index 18f516f6fb..18f516f6fb 100644
--- a/keyboards/alicia_cook/keymaps/default/readme.md
+++ b/keyboards/ibnuda/alicia_cook/keymaps/default/readme.md
diff --git a/keyboards/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
index fc9cdfe786..fc9cdfe786 100644
--- a/keyboards/alicia_cook/keymaps/rick/config.h
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
diff --git a/keyboards/alicia_cook/keymaps/rick/keymap.c b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
index 35e0e1db97..35e0e1db97 100644
--- a/keyboards/alicia_cook/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/keymap.c
diff --git a/keyboards/alicia_cook/keymaps/rick/readme.md b/keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md
index 2bfb2a96fa..2bfb2a96fa 100644
--- a/keyboards/alicia_cook/keymaps/rick/readme.md
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/readme.md
diff --git a/keyboards/alicia_cook/keymaps/rick/rules.mk b/keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk
index 6ecc620954..6ecc620954 100644
--- a/keyboards/alicia_cook/keymaps/rick/rules.mk
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk
diff --git a/keyboards/alicia_cook/readme.md b/keyboards/ibnuda/alicia_cook/readme.md
index 4e37a366e7..f4475cd22e 100644
--- a/keyboards/alicia_cook/readme.md
+++ b/keyboards/ibnuda/alicia_cook/readme.md
@@ -10,11 +10,11 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make alicia_cook:default
+    make ibnuda/alicia_cook:default
 
 Flashing example for this keyboard:
 
-    make alicia_cook:default:flash
+    make ibnuda/alicia_cook:default:flash
 
 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/alicia_cook/rules.mk b/keyboards/ibnuda/alicia_cook/rules.mk
index f35bef0a63..f35bef0a63 100644
--- a/keyboards/alicia_cook/rules.mk
+++ b/keyboards/ibnuda/alicia_cook/rules.mk
diff --git a/keyboards/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
index 9262bdbcda..9262bdbcda 100644
--- a/keyboards/gurindam/config.h
+++ b/keyboards/ibnuda/gurindam/config.h
diff --git a/keyboards/gurindam/gurindam.c b/keyboards/ibnuda/gurindam/gurindam.c
index bdca0269c2..bdca0269c2 100644
--- a/keyboards/gurindam/gurindam.c
+++ b/keyboards/ibnuda/gurindam/gurindam.c
diff --git a/keyboards/gurindam/gurindam.h b/keyboards/ibnuda/gurindam/gurindam.h
index 9967bcf528..9967bcf528 100644
--- a/keyboards/gurindam/gurindam.h
+++ b/keyboards/ibnuda/gurindam/gurindam.h
diff --git a/keyboards/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json
index a196f066e0..a196f066e0 100644
--- a/keyboards/gurindam/info.json
+++ b/keyboards/ibnuda/gurindam/info.json
diff --git a/keyboards/gurindam/keymaps/default/keymap.c b/keyboards/ibnuda/gurindam/keymaps/default/keymap.c
index b451bbf050..b451bbf050 100644
--- a/keyboards/gurindam/keymaps/default/keymap.c
+++ b/keyboards/ibnuda/gurindam/keymaps/default/keymap.c
diff --git a/keyboards/gurindam/keymaps/default/readme.md b/keyboards/ibnuda/gurindam/keymaps/default/readme.md
index 52e0c72c53..52e0c72c53 100644
--- a/keyboards/gurindam/keymaps/default/readme.md
+++ b/keyboards/ibnuda/gurindam/keymaps/default/readme.md
diff --git a/keyboards/gurindam/keymaps/via/keymap.c b/keyboards/ibnuda/gurindam/keymaps/via/keymap.c
index 3549a1bdea..3549a1bdea 100644
--- a/keyboards/gurindam/keymaps/via/keymap.c
+++ b/keyboards/ibnuda/gurindam/keymaps/via/keymap.c
diff --git a/keyboards/gurindam/keymaps/via/rules.mk b/keyboards/ibnuda/gurindam/keymaps/via/rules.mk
index 036bd6d1c3..036bd6d1c3 100644
--- a/keyboards/gurindam/keymaps/via/rules.mk
+++ b/keyboards/ibnuda/gurindam/keymaps/via/rules.mk
diff --git a/keyboards/gurindam/readme.md b/keyboards/ibnuda/gurindam/readme.md
index 0f6ae158b0..072084f4f0 100644
--- a/keyboards/gurindam/readme.md
+++ b/keyboards/ibnuda/gurindam/readme.md
@@ -10,7 +10,7 @@ A keyboard inspired by Arisu which in turn by Lyn's EM7 and TGR Alice.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gurindam:default
+    make ibnuda/gurindam: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/gurindam/rules.mk b/keyboards/ibnuda/gurindam/rules.mk
index afcb13df48..afcb13df48 100644
--- a/keyboards/gurindam/rules.mk
+++ b/keyboards/ibnuda/gurindam/rules.mk
diff --git a/keyboards/squiggle/config.h b/keyboards/ibnuda/squiggle/config.h
index 6aca2c1b18..6aca2c1b18 100644
--- a/keyboards/squiggle/config.h
+++ b/keyboards/ibnuda/squiggle/config.h
diff --git a/keyboards/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h
index 88c4203d8b..88c4203d8b 100644
--- a/keyboards/squiggle/keymaps/default/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/default/config.h
diff --git a/keyboards/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
index 68ef0ed210..68ef0ed210 100644
--- a/keyboards/squiggle/keymaps/default/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
diff --git a/keyboards/squiggle/keymaps/default/readme.md b/keyboards/ibnuda/squiggle/keymaps/default/readme.md
index 41e1ef7b1c..41e1ef7b1c 100644
--- a/keyboards/squiggle/keymaps/default/readme.md
+++ b/keyboards/ibnuda/squiggle/keymaps/default/readme.md
diff --git a/keyboards/squiggle/keymaps/default/rules.mk b/keyboards/ibnuda/squiggle/keymaps/default/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/squiggle/keymaps/default/rules.mk
+++ b/keyboards/ibnuda/squiggle/keymaps/default/rules.mk
diff --git a/keyboards/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
index 9b7c369dda..9b7c369dda 100644
--- a/keyboards/squiggle/keymaps/default38/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
diff --git a/keyboards/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
index c42b9e783d..c42b9e783d 100644
--- a/keyboards/squiggle/keymaps/default38/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
diff --git a/keyboards/squiggle/keymaps/default38/readme.md b/keyboards/ibnuda/squiggle/keymaps/default38/readme.md
index 7487986dbf..7487986dbf 100644
--- a/keyboards/squiggle/keymaps/default38/readme.md
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/readme.md
diff --git a/keyboards/squiggle/keymaps/default38/rules.mk b/keyboards/ibnuda/squiggle/keymaps/default38/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/squiggle/keymaps/default38/rules.mk
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/rules.mk
diff --git a/keyboards/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
index 1c8cff4bb6..1c8cff4bb6 100644
--- a/keyboards/squiggle/keymaps/defaultfull/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
diff --git a/keyboards/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
index 97785f0614..97785f0614 100644
--- a/keyboards/squiggle/keymaps/defaultfull/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
diff --git a/keyboards/squiggle/keymaps/defaultfull/readme.md b/keyboards/ibnuda/squiggle/keymaps/defaultfull/readme.md
index 41e1ef7b1c..41e1ef7b1c 100644
--- a/keyboards/squiggle/keymaps/defaultfull/readme.md
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/readme.md
diff --git a/keyboards/squiggle/keymaps/defaultfull/rules.mk b/keyboards/ibnuda/squiggle/keymaps/defaultfull/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/squiggle/keymaps/defaultfull/rules.mk
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/rules.mk
diff --git a/keyboards/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
index 88c4203d8b..88c4203d8b 100644
--- a/keyboards/squiggle/keymaps/defaultminidox/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
diff --git a/keyboards/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
index 3c19f38818..3c19f38818 100644
--- a/keyboards/squiggle/keymaps/defaultminidox/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
diff --git a/keyboards/squiggle/keymaps/defaultminidox/readme.md b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/readme.md
index 41e1ef7b1c..41e1ef7b1c 100644
--- a/keyboards/squiggle/keymaps/defaultminidox/readme.md
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/readme.md
diff --git a/keyboards/squiggle/keymaps/defaultminidox/rules.mk b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/squiggle/keymaps/defaultminidox/rules.mk
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/rules.mk
diff --git a/keyboards/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
index 5b97451890..5b97451890 100644
--- a/keyboards/squiggle/keymaps/rick-complicated/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
diff --git a/keyboards/squiggle/keymaps/rick-complicated/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
index eb5853e90e..eb5853e90e 100644
--- a/keyboards/squiggle/keymaps/rick-complicated/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/keymap.c
diff --git a/keyboards/squiggle/keymaps/rick-complicated/readme.md b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md
index d14eb193c0..d14eb193c0 100644
--- a/keyboards/squiggle/keymaps/rick-complicated/readme.md
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/readme.md
diff --git a/keyboards/squiggle/keymaps/rick-complicated/rules.mk b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk
index 00c78275d9..00c78275d9 100644
--- a/keyboards/squiggle/keymaps/rick-complicated/rules.mk
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/rules.mk
diff --git a/keyboards/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
index 88c4203d8b..88c4203d8b 100644
--- a/keyboards/squiggle/keymaps/rick/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
diff --git a/keyboards/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
index 7dddeb4089..7dddeb4089 100644
--- a/keyboards/squiggle/keymaps/rick/keymap.c
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
diff --git a/keyboards/squiggle/keymaps/rick/readme.md b/keyboards/ibnuda/squiggle/keymaps/rick/readme.md
index aaff442b90..aaff442b90 100644
--- a/keyboards/squiggle/keymaps/rick/readme.md
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/readme.md
diff --git a/keyboards/squiggle/keymaps/rick/rules.mk b/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
index ab1e438182..ab1e438182 100644
--- a/keyboards/squiggle/keymaps/rick/rules.mk
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
diff --git a/keyboards/squiggle/readme.md b/keyboards/ibnuda/squiggle/readme.md
index 8d7b58125e..95204ade57 100644
--- a/keyboards/squiggle/readme.md
+++ b/keyboards/ibnuda/squiggle/readme.md
@@ -15,7 +15,7 @@ It's a keyboard family which has the following requirements:
 
 Make example for this keyboard (after setting up your build environment):
 
-    make squiggle:default
+    make ibnuda/squiggle: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/squiggle/rev1/.noci b/keyboards/ibnuda/squiggle/rev1/.noci
index e69de29bb2..e69de29bb2 100644
--- a/keyboards/squiggle/rev1/.noci
+++ b/keyboards/ibnuda/squiggle/rev1/.noci
diff --git a/keyboards/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h
index 9dec7e30f5..9dec7e30f5 100644
--- a/keyboards/squiggle/rev1/config.h
+++ b/keyboards/ibnuda/squiggle/rev1/config.h
diff --git a/keyboards/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
index 754164e5d7..754164e5d7 100644
--- a/keyboards/squiggle/rev1/info.json
+++ b/keyboards/ibnuda/squiggle/rev1/info.json
diff --git a/keyboards/squiggle/rev1/rev1.c b/keyboards/ibnuda/squiggle/rev1/rev1.c
index 520a869e57..520a869e57 100644
--- a/keyboards/squiggle/rev1/rev1.c
+++ b/keyboards/ibnuda/squiggle/rev1/rev1.c
diff --git a/keyboards/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h
index 73cb7abd2f..73cb7abd2f 100644
--- a/keyboards/squiggle/rev1/rev1.h
+++ b/keyboards/ibnuda/squiggle/rev1/rev1.h
diff --git a/keyboards/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk
index c5eccd2db9..c5eccd2db9 100644
--- a/keyboards/squiggle/rev1/rules.mk
+++ b/keyboards/ibnuda/squiggle/rev1/rules.mk
diff --git a/keyboards/ibnuda/squiggle/rules.mk b/keyboards/ibnuda/squiggle/rules.mk
new file mode 100644
index 0000000000..0214333999
--- /dev/null
+++ b/keyboards/ibnuda/squiggle/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = ibnuda/squiggle/rev1
diff --git a/keyboards/squiggle/squiggle.c b/keyboards/ibnuda/squiggle/squiggle.c
index 7c73aabf51..7c73aabf51 100644
--- a/keyboards/squiggle/squiggle.c
+++ b/keyboards/ibnuda/squiggle/squiggle.c
diff --git a/keyboards/squiggle/squiggle.h b/keyboards/ibnuda/squiggle/squiggle.h
index 1f3e48552f..4ed95e707c 100644
--- a/keyboards/squiggle/squiggle.h
+++ b/keyboards/ibnuda/squiggle/squiggle.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#ifdef KEYBOARD_squiggle_rev1
+#ifdef KEYBOARD_ibnuda_squiggle_rev1
     #include "rev1.h"
 #endif
 
diff --git a/keyboards/squiggle/rules.mk b/keyboards/squiggle/rules.mk
deleted file mode 100644
index 4f44ddbb73..0000000000
--- a/keyboards/squiggle/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = squiggle/rev1