diff --git a/keyboards/alicia_cook/alicia_cook.c b/keyboards/ibnuda/alicia_cook/alicia_cook.c
similarity index 100%
rename from keyboards/alicia_cook/alicia_cook.c
rename to keyboards/ibnuda/alicia_cook/alicia_cook.c
diff --git a/keyboards/alicia_cook/alicia_cook.h b/keyboards/ibnuda/alicia_cook/alicia_cook.h
similarity index 100%
rename from keyboards/alicia_cook/alicia_cook.h
rename to keyboards/ibnuda/alicia_cook/alicia_cook.h
diff --git a/keyboards/alicia_cook/config.h b/keyboards/ibnuda/alicia_cook/config.h
similarity index 100%
rename from keyboards/alicia_cook/config.h
rename to keyboards/ibnuda/alicia_cook/config.h
diff --git a/keyboards/alicia_cook/info.json b/keyboards/ibnuda/alicia_cook/info.json
similarity index 100%
rename from keyboards/alicia_cook/info.json
rename to 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
similarity index 100%
rename from keyboards/alicia_cook/keymaps/default/keymap.c
rename to 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
similarity index 100%
rename from keyboards/alicia_cook/keymaps/default/readme.md
rename to 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
similarity index 100%
rename from keyboards/alicia_cook/keymaps/rick/config.h
rename to 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
similarity index 100%
rename from keyboards/alicia_cook/keymaps/rick/keymap.c
rename to 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
similarity index 100%
rename from keyboards/alicia_cook/keymaps/rick/readme.md
rename to 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
similarity index 100%
rename from keyboards/alicia_cook/keymaps/rick/rules.mk
rename to keyboards/ibnuda/alicia_cook/keymaps/rick/rules.mk
diff --git a/keyboards/alicia_cook/readme.md b/keyboards/ibnuda/alicia_cook/readme.md
similarity index 92%
rename from keyboards/alicia_cook/readme.md
rename to keyboards/ibnuda/alicia_cook/readme.md
index 4e37a366e71b..f4475cd22ee7 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
similarity index 100%
rename from keyboards/alicia_cook/rules.mk
rename to keyboards/ibnuda/alicia_cook/rules.mk
diff --git a/keyboards/gurindam/config.h b/keyboards/ibnuda/gurindam/config.h
similarity index 100%
rename from keyboards/gurindam/config.h
rename to keyboards/ibnuda/gurindam/config.h
diff --git a/keyboards/gurindam/gurindam.c b/keyboards/ibnuda/gurindam/gurindam.c
similarity index 100%
rename from keyboards/gurindam/gurindam.c
rename to keyboards/ibnuda/gurindam/gurindam.c
diff --git a/keyboards/gurindam/gurindam.h b/keyboards/ibnuda/gurindam/gurindam.h
similarity index 100%
rename from keyboards/gurindam/gurindam.h
rename to keyboards/ibnuda/gurindam/gurindam.h
diff --git a/keyboards/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json
similarity index 100%
rename from keyboards/gurindam/info.json
rename to keyboards/ibnuda/gurindam/info.json
diff --git a/keyboards/gurindam/keymaps/default/keymap.c b/keyboards/ibnuda/gurindam/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/gurindam/keymaps/default/keymap.c
rename to keyboards/ibnuda/gurindam/keymaps/default/keymap.c
diff --git a/keyboards/gurindam/keymaps/default/readme.md b/keyboards/ibnuda/gurindam/keymaps/default/readme.md
similarity index 100%
rename from keyboards/gurindam/keymaps/default/readme.md
rename to keyboards/ibnuda/gurindam/keymaps/default/readme.md
diff --git a/keyboards/gurindam/keymaps/via/keymap.c b/keyboards/ibnuda/gurindam/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/gurindam/keymaps/via/keymap.c
rename to keyboards/ibnuda/gurindam/keymaps/via/keymap.c
diff --git a/keyboards/gurindam/keymaps/via/rules.mk b/keyboards/ibnuda/gurindam/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/gurindam/keymaps/via/rules.mk
rename to keyboards/ibnuda/gurindam/keymaps/via/rules.mk
diff --git a/keyboards/gurindam/readme.md b/keyboards/ibnuda/gurindam/readme.md
similarity index 96%
rename from keyboards/gurindam/readme.md
rename to keyboards/ibnuda/gurindam/readme.md
index 0f6ae158b00c..072084f4f07d 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
similarity index 100%
rename from keyboards/gurindam/rules.mk
rename to keyboards/ibnuda/gurindam/rules.mk
diff --git a/keyboards/squiggle/config.h b/keyboards/ibnuda/squiggle/config.h
similarity index 100%
rename from keyboards/squiggle/config.h
rename to keyboards/ibnuda/squiggle/config.h
diff --git a/keyboards/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/default/config.h
rename to keyboards/ibnuda/squiggle/keymaps/default/config.h
diff --git a/keyboards/squiggle/keymaps/default/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/default/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/default/keymap.c
diff --git a/keyboards/squiggle/keymaps/default/readme.md b/keyboards/ibnuda/squiggle/keymaps/default/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/default/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/default/readme.md
diff --git a/keyboards/squiggle/keymaps/default/rules.mk b/keyboards/ibnuda/squiggle/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/default/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/default/rules.mk
diff --git a/keyboards/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/default38/config.h
rename to keyboards/ibnuda/squiggle/keymaps/default38/config.h
diff --git a/keyboards/squiggle/keymaps/default38/keymap.c b/keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/default38/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/default38/keymap.c
diff --git a/keyboards/squiggle/keymaps/default38/readme.md b/keyboards/ibnuda/squiggle/keymaps/default38/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/default38/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/default38/readme.md
diff --git a/keyboards/squiggle/keymaps/default38/rules.mk b/keyboards/ibnuda/squiggle/keymaps/default38/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/default38/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/default38/rules.mk
diff --git a/keyboards/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultfull/config.h
rename to keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
diff --git a/keyboards/squiggle/keymaps/defaultfull/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultfull/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/defaultfull/keymap.c
diff --git a/keyboards/squiggle/keymaps/defaultfull/readme.md b/keyboards/ibnuda/squiggle/keymaps/defaultfull/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultfull/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/defaultfull/readme.md
diff --git a/keyboards/squiggle/keymaps/defaultfull/rules.mk b/keyboards/ibnuda/squiggle/keymaps/defaultfull/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultfull/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/defaultfull/rules.mk
diff --git a/keyboards/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultminidox/config.h
rename to keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
diff --git a/keyboards/squiggle/keymaps/defaultminidox/keymap.c b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultminidox/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/defaultminidox/keymap.c
diff --git a/keyboards/squiggle/keymaps/defaultminidox/readme.md b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultminidox/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/defaultminidox/readme.md
diff --git a/keyboards/squiggle/keymaps/defaultminidox/rules.mk b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/defaultminidox/rules.mk
rename to 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
similarity index 100%
rename from keyboards/squiggle/keymaps/rick-complicated/config.h
rename to 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
similarity index 100%
rename from keyboards/squiggle/keymaps/rick-complicated/keymap.c
rename to 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
similarity index 100%
rename from keyboards/squiggle/keymaps/rick-complicated/readme.md
rename to 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
similarity index 100%
rename from keyboards/squiggle/keymaps/rick-complicated/rules.mk
rename to 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
similarity index 100%
rename from keyboards/squiggle/keymaps/rick/config.h
rename to keyboards/ibnuda/squiggle/keymaps/rick/config.h
diff --git a/keyboards/squiggle/keymaps/rick/keymap.c b/keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
similarity index 100%
rename from keyboards/squiggle/keymaps/rick/keymap.c
rename to keyboards/ibnuda/squiggle/keymaps/rick/keymap.c
diff --git a/keyboards/squiggle/keymaps/rick/readme.md b/keyboards/ibnuda/squiggle/keymaps/rick/readme.md
similarity index 100%
rename from keyboards/squiggle/keymaps/rick/readme.md
rename to keyboards/ibnuda/squiggle/keymaps/rick/readme.md
diff --git a/keyboards/squiggle/keymaps/rick/rules.mk b/keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
similarity index 100%
rename from keyboards/squiggle/keymaps/rick/rules.mk
rename to keyboards/ibnuda/squiggle/keymaps/rick/rules.mk
diff --git a/keyboards/squiggle/readme.md b/keyboards/ibnuda/squiggle/readme.md
similarity index 95%
rename from keyboards/squiggle/readme.md
rename to keyboards/ibnuda/squiggle/readme.md
index 8d7b58125e4a..95204ade57d7 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
similarity index 100%
rename from keyboards/squiggle/rev1/.noci
rename to keyboards/ibnuda/squiggle/rev1/.noci
diff --git a/keyboards/squiggle/rev1/config.h b/keyboards/ibnuda/squiggle/rev1/config.h
similarity index 100%
rename from keyboards/squiggle/rev1/config.h
rename to keyboards/ibnuda/squiggle/rev1/config.h
diff --git a/keyboards/squiggle/rev1/info.json b/keyboards/ibnuda/squiggle/rev1/info.json
similarity index 100%
rename from keyboards/squiggle/rev1/info.json
rename to keyboards/ibnuda/squiggle/rev1/info.json
diff --git a/keyboards/squiggle/rev1/rev1.c b/keyboards/ibnuda/squiggle/rev1/rev1.c
similarity index 100%
rename from keyboards/squiggle/rev1/rev1.c
rename to keyboards/ibnuda/squiggle/rev1/rev1.c
diff --git a/keyboards/squiggle/rev1/rev1.h b/keyboards/ibnuda/squiggle/rev1/rev1.h
similarity index 100%
rename from keyboards/squiggle/rev1/rev1.h
rename to keyboards/ibnuda/squiggle/rev1/rev1.h
diff --git a/keyboards/squiggle/rev1/rules.mk b/keyboards/ibnuda/squiggle/rev1/rules.mk
similarity index 100%
rename from keyboards/squiggle/rev1/rules.mk
rename to 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 000000000000..0214333999bd
--- /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
similarity index 100%
rename from keyboards/squiggle/squiggle.c
rename to keyboards/ibnuda/squiggle/squiggle.c
diff --git a/keyboards/squiggle/squiggle.h b/keyboards/ibnuda/squiggle/squiggle.h
similarity index 95%
rename from keyboards/squiggle/squiggle.h
rename to keyboards/ibnuda/squiggle/squiggle.h
index 1f3e48552fc1..4ed95e707cec 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 4f44ddbb73fa..000000000000
--- a/keyboards/squiggle/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = squiggle/rev1