diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index cd870405ef5..2853240032e 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1383,6 +1383,12 @@
     "yurei": {
         "target": "kkatano/yurei"
     },
+    "z12": {
+        "target": "zigotica/z12"
+    },
+    "z34": {
+        "target": "zigotica/z34"
+    },
     "zinc": {
         "target": "25keys/zinc"
     },
diff --git a/keyboards/z12/config.h b/keyboards/zigotica/z12/config.h
similarity index 100%
rename from keyboards/z12/config.h
rename to keyboards/zigotica/z12/config.h
diff --git a/keyboards/z12/info.json b/keyboards/zigotica/z12/info.json
similarity index 100%
rename from keyboards/z12/info.json
rename to keyboards/zigotica/z12/info.json
diff --git a/keyboards/z12/keymaps/default/config.h b/keyboards/zigotica/z12/keymaps/default/config.h
similarity index 100%
rename from keyboards/z12/keymaps/default/config.h
rename to keyboards/zigotica/z12/keymaps/default/config.h
diff --git a/keyboards/z12/keymaps/default/keymap.c b/keyboards/zigotica/z12/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/z12/keymaps/default/keymap.c
rename to keyboards/zigotica/z12/keymaps/default/keymap.c
diff --git a/keyboards/z12/keymaps/default/readme.md b/keyboards/zigotica/z12/keymaps/default/readme.md
similarity index 100%
rename from keyboards/z12/keymaps/default/readme.md
rename to keyboards/zigotica/z12/keymaps/default/readme.md
diff --git a/keyboards/z12/keymaps/default/rules.mk b/keyboards/zigotica/z12/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/z12/keymaps/default/rules.mk
rename to keyboards/zigotica/z12/keymaps/default/rules.mk
diff --git a/keyboards/z12/readme.md b/keyboards/zigotica/z12/readme.md
similarity index 100%
rename from keyboards/z12/readme.md
rename to keyboards/zigotica/z12/readme.md
diff --git a/keyboards/z12/rules.mk b/keyboards/zigotica/z12/rules.mk
similarity index 100%
rename from keyboards/z12/rules.mk
rename to keyboards/zigotica/z12/rules.mk
diff --git a/keyboards/z34/config.h b/keyboards/zigotica/z34/config.h
similarity index 100%
rename from keyboards/z34/config.h
rename to keyboards/zigotica/z34/config.h
diff --git a/keyboards/z34/info.json b/keyboards/zigotica/z34/info.json
similarity index 100%
rename from keyboards/z34/info.json
rename to keyboards/zigotica/z34/info.json
diff --git a/keyboards/z34/keymaps/default/config.h b/keyboards/zigotica/z34/keymaps/default/config.h
similarity index 100%
rename from keyboards/z34/keymaps/default/config.h
rename to keyboards/zigotica/z34/keymaps/default/config.h
diff --git a/keyboards/z34/keymaps/default/keymap.c b/keyboards/zigotica/z34/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/z34/keymaps/default/keymap.c
rename to keyboards/zigotica/z34/keymaps/default/keymap.c
diff --git a/keyboards/z34/keymaps/default/readme.md b/keyboards/zigotica/z34/keymaps/default/readme.md
similarity index 100%
rename from keyboards/z34/keymaps/default/readme.md
rename to keyboards/zigotica/z34/keymaps/default/readme.md
diff --git a/keyboards/z34/keymaps/default/rules.mk b/keyboards/zigotica/z34/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/z34/keymaps/default/rules.mk
rename to keyboards/zigotica/z34/keymaps/default/rules.mk
diff --git a/keyboards/z34/readme.md b/keyboards/zigotica/z34/readme.md
similarity index 100%
rename from keyboards/z34/readme.md
rename to keyboards/zigotica/z34/readme.md
diff --git a/keyboards/z34/rules.mk b/keyboards/zigotica/z34/rules.mk
similarity index 100%
rename from keyboards/z34/rules.mk
rename to keyboards/zigotica/z34/rules.mk