From 51e99b562d410e8be7075cac6e5bee6a4b9d99bf Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Mon, 31 Jan 2022 03:17:04 +0800
Subject: [PATCH] [Keyboard] move @monksoffunk 's boards into 25keys/ (#15789)

---
 keyboards/{ => 25keys}/aleth42/info.json                    | 0
 keyboards/{ => 25keys}/aleth42/keymaps/default/keymap.c     | 0
 keyboards/{ => 25keys}/aleth42/keymaps/default/readme.md    | 0
 keyboards/{ => 25keys}/aleth42/keymaps/via/config.h         | 0
 keyboards/{ => 25keys}/aleth42/keymaps/via/keymap.c         | 0
 keyboards/{ => 25keys}/aleth42/keymaps/via/readme.md        | 0
 keyboards/{ => 25keys}/aleth42/keymaps/via/rules.mk         | 0
 keyboards/{aleth42/rev1 => 25keys/aleth42}/readme.md        | 2 +-
 keyboards/{ => 25keys}/aleth42/rev0/config.h                | 0
 keyboards/{ => 25keys}/aleth42/rev0/readme.md               | 0
 keyboards/{ => 25keys}/aleth42/rev0/rev0.c                  | 0
 keyboards/{ => 25keys}/aleth42/rev0/rev0.h                  | 0
 keyboards/{ => 25keys}/aleth42/rev0/rules.mk                | 0
 keyboards/{ => 25keys}/aleth42/rev1/config.h                | 0
 keyboards/{aleth42 => 25keys/aleth42/rev1}/readme.md        | 0
 keyboards/{ => 25keys}/aleth42/rev1/rev1.c                  | 0
 keyboards/{ => 25keys}/aleth42/rev1/rev1.h                  | 0
 keyboards/{ => 25keys}/aleth42/rev1/rules.mk                | 0
 keyboards/{ => 25keys}/aleth42/rules.mk                     | 0
 keyboards/{ => 25keys}/cassette42/cassette42.c              | 0
 keyboards/{ => 25keys}/cassette42/cassette42.h              | 0
 keyboards/{ => 25keys}/cassette42/common/glcdfont.c         | 0
 keyboards/{ => 25keys}/cassette42/common/oled_helper.c      | 0
 keyboards/{ => 25keys}/cassette42/common/oled_helper.h      | 0
 keyboards/{ => 25keys}/cassette42/config.h                  | 2 +-
 keyboards/{ => 25keys}/cassette42/info.json                 | 0
 keyboards/{ => 25keys}/cassette42/keymaps/default/keymap.c  | 0
 keyboards/{ => 25keys}/cassette42/keymaps/default/readme.md | 0
 keyboards/{ => 25keys}/cassette42/readme.md                 | 2 +-
 keyboards/{ => 25keys}/cassette42/rules.mk                  | 0
 keyboards/{ => 25keys}/zinc/.noci                           | 0
 keyboards/{ => 25keys}/zinc/config.h                        | 0
 keyboards/{ => 25keys}/zinc/info.json                       | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/config.h        | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/keymap.c        | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/readme_en.md    | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/readme_jp.md    | 0
 keyboards/{ => 25keys}/zinc/keymaps/default/rules.mk        | 0
 keyboards/{ => 25keys}/zinc/keymaps/ginjake/config.h        | 0
 keyboards/{ => 25keys}/zinc/keymaps/ginjake/keymap.c        | 0
 keyboards/{ => 25keys}/zinc/keymaps/ginjake/readme_jp.md    | 0
 keyboards/{ => 25keys}/zinc/keymaps/ginjake/rules.mk        | 0
 keyboards/{ => 25keys}/zinc/keymaps/monks/config.h          | 0
 keyboards/{ => 25keys}/zinc/keymaps/monks/keymap.c          | 0
 keyboards/{ => 25keys}/zinc/keymaps/monks/readme_jp.md      | 0
 keyboards/{ => 25keys}/zinc/keymaps/monks/rules.mk          | 0
 keyboards/{ => 25keys}/zinc/keymaps/toshi0383/config.h      | 0
 keyboards/{ => 25keys}/zinc/keymaps/toshi0383/keymap.c      | 0
 keyboards/{ => 25keys}/zinc/keymaps/toshi0383/rules.mk      | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/config.h            | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/keymap.c            | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/readme_en.md        | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/readme_jp.md        | 0
 keyboards/{ => 25keys}/zinc/keymaps/via/rules.mk            | 0
 keyboards/{ => 25keys}/zinc/readme.md                       | 2 +-
 keyboards/{ => 25keys}/zinc/rev1/.noci                      | 0
 keyboards/{ => 25keys}/zinc/rev1/config.h                   | 0
 keyboards/{ => 25keys}/zinc/rev1/info.json                  | 0
 keyboards/{ => 25keys}/zinc/rev1/post_config.h              | 0
 keyboards/{ => 25keys}/zinc/rev1/rev1.c                     | 0
 keyboards/{ => 25keys}/zinc/rev1/rev1.h                     | 0
 keyboards/{ => 25keys}/zinc/rev1/rules.mk                   | 0
 keyboards/{ => 25keys}/zinc/reva/.noci                      | 0
 keyboards/{ => 25keys}/zinc/reva/config.h                   | 0
 keyboards/{ => 25keys}/zinc/reva/info.json                  | 0
 keyboards/{ => 25keys}/zinc/reva/post_config.h              | 0
 keyboards/{ => 25keys}/zinc/reva/reva.c                     | 0
 keyboards/{ => 25keys}/zinc/reva/reva.h                     | 0
 keyboards/{ => 25keys}/zinc/reva/rules.mk                   | 0
 keyboards/{ => 25keys}/zinc/rules.mk                        | 2 +-
 keyboards/{ => 25keys}/zinc/zinc.c                          | 0
 keyboards/{ => 25keys}/zinc/zinc.h                          | 4 ++--
 72 files changed, 7 insertions(+), 7 deletions(-)
 rename keyboards/{ => 25keys}/aleth42/info.json (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/default/readme.md (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/via/config.h (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/via/keymap.c (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/via/readme.md (100%)
 rename keyboards/{ => 25keys}/aleth42/keymaps/via/rules.mk (100%)
 rename keyboards/{aleth42/rev1 => 25keys/aleth42}/readme.md (95%)
 rename keyboards/{ => 25keys}/aleth42/rev0/config.h (100%)
 rename keyboards/{ => 25keys}/aleth42/rev0/readme.md (100%)
 rename keyboards/{ => 25keys}/aleth42/rev0/rev0.c (100%)
 rename keyboards/{ => 25keys}/aleth42/rev0/rev0.h (100%)
 rename keyboards/{ => 25keys}/aleth42/rev0/rules.mk (100%)
 rename keyboards/{ => 25keys}/aleth42/rev1/config.h (100%)
 rename keyboards/{aleth42 => 25keys/aleth42/rev1}/readme.md (100%)
 rename keyboards/{ => 25keys}/aleth42/rev1/rev1.c (100%)
 rename keyboards/{ => 25keys}/aleth42/rev1/rev1.h (100%)
 rename keyboards/{ => 25keys}/aleth42/rev1/rules.mk (100%)
 rename keyboards/{ => 25keys}/aleth42/rules.mk (100%)
 rename keyboards/{ => 25keys}/cassette42/cassette42.c (100%)
 rename keyboards/{ => 25keys}/cassette42/cassette42.h (100%)
 rename keyboards/{ => 25keys}/cassette42/common/glcdfont.c (100%)
 rename keyboards/{ => 25keys}/cassette42/common/oled_helper.c (100%)
 rename keyboards/{ => 25keys}/cassette42/common/oled_helper.h (100%)
 rename keyboards/{ => 25keys}/cassette42/config.h (95%)
 rename keyboards/{ => 25keys}/cassette42/info.json (100%)
 rename keyboards/{ => 25keys}/cassette42/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 25keys}/cassette42/keymaps/default/readme.md (100%)
 rename keyboards/{ => 25keys}/cassette42/readme.md (95%)
 rename keyboards/{ => 25keys}/cassette42/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/.noci (100%)
 rename keyboards/{ => 25keys}/zinc/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/info.json (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/readme_en.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/readme_jp.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/default/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/ginjake/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/ginjake/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/ginjake/readme_jp.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/ginjake/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/monks/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/monks/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/monks/readme_jp.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/monks/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/toshi0383/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/toshi0383/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/toshi0383/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/keymap.c (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/readme_en.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/readme_jp.md (100%)
 rename keyboards/{ => 25keys}/zinc/keymaps/via/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/readme.md (95%)
 rename keyboards/{ => 25keys}/zinc/rev1/.noci (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/info.json (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/post_config.h (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/rev1.c (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/rev1.h (100%)
 rename keyboards/{ => 25keys}/zinc/rev1/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/reva/.noci (100%)
 rename keyboards/{ => 25keys}/zinc/reva/config.h (100%)
 rename keyboards/{ => 25keys}/zinc/reva/info.json (100%)
 rename keyboards/{ => 25keys}/zinc/reva/post_config.h (100%)
 rename keyboards/{ => 25keys}/zinc/reva/reva.c (100%)
 rename keyboards/{ => 25keys}/zinc/reva/reva.h (100%)
 rename keyboards/{ => 25keys}/zinc/reva/rules.mk (100%)
 rename keyboards/{ => 25keys}/zinc/rules.mk (95%)
 rename keyboards/{ => 25keys}/zinc/zinc.c (100%)
 rename keyboards/{ => 25keys}/zinc/zinc.h (58%)

diff --git a/keyboards/aleth42/info.json b/keyboards/25keys/aleth42/info.json
similarity index 100%
rename from keyboards/aleth42/info.json
rename to keyboards/25keys/aleth42/info.json
diff --git a/keyboards/aleth42/keymaps/default/keymap.c b/keyboards/25keys/aleth42/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/aleth42/keymaps/default/keymap.c
rename to keyboards/25keys/aleth42/keymaps/default/keymap.c
diff --git a/keyboards/aleth42/keymaps/default/readme.md b/keyboards/25keys/aleth42/keymaps/default/readme.md
similarity index 100%
rename from keyboards/aleth42/keymaps/default/readme.md
rename to keyboards/25keys/aleth42/keymaps/default/readme.md
diff --git a/keyboards/aleth42/keymaps/via/config.h b/keyboards/25keys/aleth42/keymaps/via/config.h
similarity index 100%
rename from keyboards/aleth42/keymaps/via/config.h
rename to keyboards/25keys/aleth42/keymaps/via/config.h
diff --git a/keyboards/aleth42/keymaps/via/keymap.c b/keyboards/25keys/aleth42/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/aleth42/keymaps/via/keymap.c
rename to keyboards/25keys/aleth42/keymaps/via/keymap.c
diff --git a/keyboards/aleth42/keymaps/via/readme.md b/keyboards/25keys/aleth42/keymaps/via/readme.md
similarity index 100%
rename from keyboards/aleth42/keymaps/via/readme.md
rename to keyboards/25keys/aleth42/keymaps/via/readme.md
diff --git a/keyboards/aleth42/keymaps/via/rules.mk b/keyboards/25keys/aleth42/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/aleth42/keymaps/via/rules.mk
rename to keyboards/25keys/aleth42/keymaps/via/rules.mk
diff --git a/keyboards/aleth42/rev1/readme.md b/keyboards/25keys/aleth42/readme.md
similarity index 95%
rename from keyboards/aleth42/rev1/readme.md
rename to keyboards/25keys/aleth42/readme.md
index 3da1231d60..acf9c38e2e 100644
--- a/keyboards/aleth42/rev1/readme.md
+++ b/keyboards/25keys/aleth42/readme.md
@@ -10,6 +10,6 @@
 
 Make example for this keyboard (after setting up your build environment):
 
-    make aleth42:default
+    make 25keys/aleth42/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/aleth42/rev0/config.h b/keyboards/25keys/aleth42/rev0/config.h
similarity index 100%
rename from keyboards/aleth42/rev0/config.h
rename to keyboards/25keys/aleth42/rev0/config.h
diff --git a/keyboards/aleth42/rev0/readme.md b/keyboards/25keys/aleth42/rev0/readme.md
similarity index 100%
rename from keyboards/aleth42/rev0/readme.md
rename to keyboards/25keys/aleth42/rev0/readme.md
diff --git a/keyboards/aleth42/rev0/rev0.c b/keyboards/25keys/aleth42/rev0/rev0.c
similarity index 100%
rename from keyboards/aleth42/rev0/rev0.c
rename to keyboards/25keys/aleth42/rev0/rev0.c
diff --git a/keyboards/aleth42/rev0/rev0.h b/keyboards/25keys/aleth42/rev0/rev0.h
similarity index 100%
rename from keyboards/aleth42/rev0/rev0.h
rename to keyboards/25keys/aleth42/rev0/rev0.h
diff --git a/keyboards/aleth42/rev0/rules.mk b/keyboards/25keys/aleth42/rev0/rules.mk
similarity index 100%
rename from keyboards/aleth42/rev0/rules.mk
rename to keyboards/25keys/aleth42/rev0/rules.mk
diff --git a/keyboards/aleth42/rev1/config.h b/keyboards/25keys/aleth42/rev1/config.h
similarity index 100%
rename from keyboards/aleth42/rev1/config.h
rename to keyboards/25keys/aleth42/rev1/config.h
diff --git a/keyboards/aleth42/readme.md b/keyboards/25keys/aleth42/rev1/readme.md
similarity index 100%
rename from keyboards/aleth42/readme.md
rename to keyboards/25keys/aleth42/rev1/readme.md
diff --git a/keyboards/aleth42/rev1/rev1.c b/keyboards/25keys/aleth42/rev1/rev1.c
similarity index 100%
rename from keyboards/aleth42/rev1/rev1.c
rename to keyboards/25keys/aleth42/rev1/rev1.c
diff --git a/keyboards/aleth42/rev1/rev1.h b/keyboards/25keys/aleth42/rev1/rev1.h
similarity index 100%
rename from keyboards/aleth42/rev1/rev1.h
rename to keyboards/25keys/aleth42/rev1/rev1.h
diff --git a/keyboards/aleth42/rev1/rules.mk b/keyboards/25keys/aleth42/rev1/rules.mk
similarity index 100%
rename from keyboards/aleth42/rev1/rules.mk
rename to keyboards/25keys/aleth42/rev1/rules.mk
diff --git a/keyboards/aleth42/rules.mk b/keyboards/25keys/aleth42/rules.mk
similarity index 100%
rename from keyboards/aleth42/rules.mk
rename to keyboards/25keys/aleth42/rules.mk
diff --git a/keyboards/cassette42/cassette42.c b/keyboards/25keys/cassette42/cassette42.c
similarity index 100%
rename from keyboards/cassette42/cassette42.c
rename to keyboards/25keys/cassette42/cassette42.c
diff --git a/keyboards/cassette42/cassette42.h b/keyboards/25keys/cassette42/cassette42.h
similarity index 100%
rename from keyboards/cassette42/cassette42.h
rename to keyboards/25keys/cassette42/cassette42.h
diff --git a/keyboards/cassette42/common/glcdfont.c b/keyboards/25keys/cassette42/common/glcdfont.c
similarity index 100%
rename from keyboards/cassette42/common/glcdfont.c
rename to keyboards/25keys/cassette42/common/glcdfont.c
diff --git a/keyboards/cassette42/common/oled_helper.c b/keyboards/25keys/cassette42/common/oled_helper.c
similarity index 100%
rename from keyboards/cassette42/common/oled_helper.c
rename to keyboards/25keys/cassette42/common/oled_helper.c
diff --git a/keyboards/cassette42/common/oled_helper.h b/keyboards/25keys/cassette42/common/oled_helper.h
similarity index 100%
rename from keyboards/cassette42/common/oled_helper.h
rename to keyboards/25keys/cassette42/common/oled_helper.h
diff --git a/keyboards/cassette42/config.h b/keyboards/25keys/cassette42/config.h
similarity index 95%
rename from keyboards/cassette42/config.h
rename to keyboards/25keys/cassette42/config.h
index 1729c31fbd..cac03f6346 100644
--- a/keyboards/cassette42/config.h
+++ b/keyboards/25keys/cassette42/config.h
@@ -49,4 +49,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    define RGBLIGHT_ANIMATIONS
 #endif
 
-#define OLED_FONT_H "keyboards/cassette42/common/glcdfont.c"
+#define OLED_FONT_H "keyboards/25keys/cassette42/common/glcdfont.c"
diff --git a/keyboards/cassette42/info.json b/keyboards/25keys/cassette42/info.json
similarity index 100%
rename from keyboards/cassette42/info.json
rename to keyboards/25keys/cassette42/info.json
diff --git a/keyboards/cassette42/keymaps/default/keymap.c b/keyboards/25keys/cassette42/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/cassette42/keymaps/default/keymap.c
rename to keyboards/25keys/cassette42/keymaps/default/keymap.c
diff --git a/keyboards/cassette42/keymaps/default/readme.md b/keyboards/25keys/cassette42/keymaps/default/readme.md
similarity index 100%
rename from keyboards/cassette42/keymaps/default/readme.md
rename to keyboards/25keys/cassette42/keymaps/default/readme.md
diff --git a/keyboards/cassette42/readme.md b/keyboards/25keys/cassette42/readme.md
similarity index 95%
rename from keyboards/cassette42/readme.md
rename to keyboards/25keys/cassette42/readme.md
index 2ba9a661bb..cb6b2cc5b7 100644
--- a/keyboards/cassette42/readme.md
+++ b/keyboards/25keys/cassette42/readme.md
@@ -10,6 +10,6 @@ An audio control pad with 4 switches and 2 rotary encoders.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make cassette42:default
+    make 25keys/cassette42: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/cassette42/rules.mk b/keyboards/25keys/cassette42/rules.mk
similarity index 100%
rename from keyboards/cassette42/rules.mk
rename to keyboards/25keys/cassette42/rules.mk
diff --git a/keyboards/zinc/.noci b/keyboards/25keys/zinc/.noci
similarity index 100%
rename from keyboards/zinc/.noci
rename to keyboards/25keys/zinc/.noci
diff --git a/keyboards/zinc/config.h b/keyboards/25keys/zinc/config.h
similarity index 100%
rename from keyboards/zinc/config.h
rename to keyboards/25keys/zinc/config.h
diff --git a/keyboards/zinc/info.json b/keyboards/25keys/zinc/info.json
similarity index 100%
rename from keyboards/zinc/info.json
rename to keyboards/25keys/zinc/info.json
diff --git a/keyboards/zinc/keymaps/default/config.h b/keyboards/25keys/zinc/keymaps/default/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/default/config.h
rename to keyboards/25keys/zinc/keymaps/default/config.h
diff --git a/keyboards/zinc/keymaps/default/keymap.c b/keyboards/25keys/zinc/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/default/keymap.c
rename to keyboards/25keys/zinc/keymaps/default/keymap.c
diff --git a/keyboards/zinc/keymaps/default/readme_en.md b/keyboards/25keys/zinc/keymaps/default/readme_en.md
similarity index 100%
rename from keyboards/zinc/keymaps/default/readme_en.md
rename to keyboards/25keys/zinc/keymaps/default/readme_en.md
diff --git a/keyboards/zinc/keymaps/default/readme_jp.md b/keyboards/25keys/zinc/keymaps/default/readme_jp.md
similarity index 100%
rename from keyboards/zinc/keymaps/default/readme_jp.md
rename to keyboards/25keys/zinc/keymaps/default/readme_jp.md
diff --git a/keyboards/zinc/keymaps/default/rules.mk b/keyboards/25keys/zinc/keymaps/default/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/default/rules.mk
rename to keyboards/25keys/zinc/keymaps/default/rules.mk
diff --git a/keyboards/zinc/keymaps/ginjake/config.h b/keyboards/25keys/zinc/keymaps/ginjake/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/ginjake/config.h
rename to keyboards/25keys/zinc/keymaps/ginjake/config.h
diff --git a/keyboards/zinc/keymaps/ginjake/keymap.c b/keyboards/25keys/zinc/keymaps/ginjake/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/ginjake/keymap.c
rename to keyboards/25keys/zinc/keymaps/ginjake/keymap.c
diff --git a/keyboards/zinc/keymaps/ginjake/readme_jp.md b/keyboards/25keys/zinc/keymaps/ginjake/readme_jp.md
similarity index 100%
rename from keyboards/zinc/keymaps/ginjake/readme_jp.md
rename to keyboards/25keys/zinc/keymaps/ginjake/readme_jp.md
diff --git a/keyboards/zinc/keymaps/ginjake/rules.mk b/keyboards/25keys/zinc/keymaps/ginjake/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/ginjake/rules.mk
rename to keyboards/25keys/zinc/keymaps/ginjake/rules.mk
diff --git a/keyboards/zinc/keymaps/monks/config.h b/keyboards/25keys/zinc/keymaps/monks/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/monks/config.h
rename to keyboards/25keys/zinc/keymaps/monks/config.h
diff --git a/keyboards/zinc/keymaps/monks/keymap.c b/keyboards/25keys/zinc/keymaps/monks/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/monks/keymap.c
rename to keyboards/25keys/zinc/keymaps/monks/keymap.c
diff --git a/keyboards/zinc/keymaps/monks/readme_jp.md b/keyboards/25keys/zinc/keymaps/monks/readme_jp.md
similarity index 100%
rename from keyboards/zinc/keymaps/monks/readme_jp.md
rename to keyboards/25keys/zinc/keymaps/monks/readme_jp.md
diff --git a/keyboards/zinc/keymaps/monks/rules.mk b/keyboards/25keys/zinc/keymaps/monks/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/monks/rules.mk
rename to keyboards/25keys/zinc/keymaps/monks/rules.mk
diff --git a/keyboards/zinc/keymaps/toshi0383/config.h b/keyboards/25keys/zinc/keymaps/toshi0383/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/toshi0383/config.h
rename to keyboards/25keys/zinc/keymaps/toshi0383/config.h
diff --git a/keyboards/zinc/keymaps/toshi0383/keymap.c b/keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/toshi0383/keymap.c
rename to keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
diff --git a/keyboards/zinc/keymaps/toshi0383/rules.mk b/keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/toshi0383/rules.mk
rename to keyboards/25keys/zinc/keymaps/toshi0383/rules.mk
diff --git a/keyboards/zinc/keymaps/via/config.h b/keyboards/25keys/zinc/keymaps/via/config.h
similarity index 100%
rename from keyboards/zinc/keymaps/via/config.h
rename to keyboards/25keys/zinc/keymaps/via/config.h
diff --git a/keyboards/zinc/keymaps/via/keymap.c b/keyboards/25keys/zinc/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/zinc/keymaps/via/keymap.c
rename to keyboards/25keys/zinc/keymaps/via/keymap.c
diff --git a/keyboards/zinc/keymaps/via/readme_en.md b/keyboards/25keys/zinc/keymaps/via/readme_en.md
similarity index 100%
rename from keyboards/zinc/keymaps/via/readme_en.md
rename to keyboards/25keys/zinc/keymaps/via/readme_en.md
diff --git a/keyboards/zinc/keymaps/via/readme_jp.md b/keyboards/25keys/zinc/keymaps/via/readme_jp.md
similarity index 100%
rename from keyboards/zinc/keymaps/via/readme_jp.md
rename to keyboards/25keys/zinc/keymaps/via/readme_jp.md
diff --git a/keyboards/zinc/keymaps/via/rules.mk b/keyboards/25keys/zinc/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/zinc/keymaps/via/rules.mk
rename to keyboards/25keys/zinc/keymaps/via/rules.mk
diff --git a/keyboards/zinc/readme.md b/keyboards/25keys/zinc/readme.md
similarity index 95%
rename from keyboards/zinc/readme.md
rename to keyboards/25keys/zinc/readme.md
index 0e8d6cd65d..61172f1635 100644
--- a/keyboards/zinc/readme.md
+++ b/keyboards/25keys/zinc/readme.md
@@ -11,7 +11,7 @@ Zinc
 
 Make example for this keyboard (after setting up your build environment):
 
-    make zinc:default
+    make 25keys/zinc/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/zinc/rev1/.noci b/keyboards/25keys/zinc/rev1/.noci
similarity index 100%
rename from keyboards/zinc/rev1/.noci
rename to keyboards/25keys/zinc/rev1/.noci
diff --git a/keyboards/zinc/rev1/config.h b/keyboards/25keys/zinc/rev1/config.h
similarity index 100%
rename from keyboards/zinc/rev1/config.h
rename to keyboards/25keys/zinc/rev1/config.h
diff --git a/keyboards/zinc/rev1/info.json b/keyboards/25keys/zinc/rev1/info.json
similarity index 100%
rename from keyboards/zinc/rev1/info.json
rename to keyboards/25keys/zinc/rev1/info.json
diff --git a/keyboards/zinc/rev1/post_config.h b/keyboards/25keys/zinc/rev1/post_config.h
similarity index 100%
rename from keyboards/zinc/rev1/post_config.h
rename to keyboards/25keys/zinc/rev1/post_config.h
diff --git a/keyboards/zinc/rev1/rev1.c b/keyboards/25keys/zinc/rev1/rev1.c
similarity index 100%
rename from keyboards/zinc/rev1/rev1.c
rename to keyboards/25keys/zinc/rev1/rev1.c
diff --git a/keyboards/zinc/rev1/rev1.h b/keyboards/25keys/zinc/rev1/rev1.h
similarity index 100%
rename from keyboards/zinc/rev1/rev1.h
rename to keyboards/25keys/zinc/rev1/rev1.h
diff --git a/keyboards/zinc/rev1/rules.mk b/keyboards/25keys/zinc/rev1/rules.mk
similarity index 100%
rename from keyboards/zinc/rev1/rules.mk
rename to keyboards/25keys/zinc/rev1/rules.mk
diff --git a/keyboards/zinc/reva/.noci b/keyboards/25keys/zinc/reva/.noci
similarity index 100%
rename from keyboards/zinc/reva/.noci
rename to keyboards/25keys/zinc/reva/.noci
diff --git a/keyboards/zinc/reva/config.h b/keyboards/25keys/zinc/reva/config.h
similarity index 100%
rename from keyboards/zinc/reva/config.h
rename to keyboards/25keys/zinc/reva/config.h
diff --git a/keyboards/zinc/reva/info.json b/keyboards/25keys/zinc/reva/info.json
similarity index 100%
rename from keyboards/zinc/reva/info.json
rename to keyboards/25keys/zinc/reva/info.json
diff --git a/keyboards/zinc/reva/post_config.h b/keyboards/25keys/zinc/reva/post_config.h
similarity index 100%
rename from keyboards/zinc/reva/post_config.h
rename to keyboards/25keys/zinc/reva/post_config.h
diff --git a/keyboards/zinc/reva/reva.c b/keyboards/25keys/zinc/reva/reva.c
similarity index 100%
rename from keyboards/zinc/reva/reva.c
rename to keyboards/25keys/zinc/reva/reva.c
diff --git a/keyboards/zinc/reva/reva.h b/keyboards/25keys/zinc/reva/reva.h
similarity index 100%
rename from keyboards/zinc/reva/reva.h
rename to keyboards/25keys/zinc/reva/reva.h
diff --git a/keyboards/zinc/reva/rules.mk b/keyboards/25keys/zinc/reva/rules.mk
similarity index 100%
rename from keyboards/zinc/reva/rules.mk
rename to keyboards/25keys/zinc/reva/rules.mk
diff --git a/keyboards/zinc/rules.mk b/keyboards/25keys/zinc/rules.mk
similarity index 95%
rename from keyboards/zinc/rules.mk
rename to keyboards/25keys/zinc/rules.mk
index c83741f40c..2fd608c56c 100644
--- a/keyboards/zinc/rules.mk
+++ b/keyboards/25keys/zinc/rules.mk
@@ -19,7 +19,7 @@ RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this w
 RGB_MATRIX_ENABLE = no
 RGB_MATRIX_DRIVER = WS2812
 
-DEFAULT_FOLDER = zinc/rev1
+DEFAULT_FOLDER = 25keys/zinc/rev1
 
 #SRC += i2c.c
 SRC += serial.c
diff --git a/keyboards/zinc/zinc.c b/keyboards/25keys/zinc/zinc.c
similarity index 100%
rename from keyboards/zinc/zinc.c
rename to keyboards/25keys/zinc/zinc.c
diff --git a/keyboards/zinc/zinc.h b/keyboards/25keys/zinc/zinc.h
similarity index 58%
rename from keyboards/zinc/zinc.h
rename to keyboards/25keys/zinc/zinc.h
index dedc9253b0..8a80538e4c 100644
--- a/keyboards/zinc/zinc.h
+++ b/keyboards/25keys/zinc/zinc.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#ifdef KEYBOARD_zinc_reva
+#ifdef KEYBOARD_25keys_zinc_reva
     #include "reva.h"
 #endif
-#ifdef KEYBOARD_zinc_rev1
+#ifdef KEYBOARD_25keys_zinc_rev1
     #include "rev1.h"
 #endif