diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 2853240032e..eb12b54a2e5 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -807,6 +807,12 @@
     "eggman": {
         "target": "qpockets/eggman"
     },
+    "enter67": {
+        "target": "kezewa/enter67"
+    },
+    "enter80": {
+        "target": "kezewa/enter80"
+    },
     "ergo42": {
         "target": "biacco42/ergo42"
     },
diff --git a/keyboards/enter67/info.json b/keyboards/kezewa/enter67/info.json
similarity index 100%
rename from keyboards/enter67/info.json
rename to keyboards/kezewa/enter67/info.json
diff --git a/keyboards/enter67/keymaps/default/keymap.c b/keyboards/kezewa/enter67/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/enter67/keymaps/default/keymap.c
rename to keyboards/kezewa/enter67/keymaps/default/keymap.c
diff --git a/keyboards/enter67/keymaps/via/keymap.c b/keyboards/kezewa/enter67/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/enter67/keymaps/via/keymap.c
rename to keyboards/kezewa/enter67/keymaps/via/keymap.c
diff --git a/keyboards/enter67/keymaps/via/rules.mk b/keyboards/kezewa/enter67/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/enter67/keymaps/via/rules.mk
rename to keyboards/kezewa/enter67/keymaps/via/rules.mk
diff --git a/keyboards/enter67/readme.md b/keyboards/kezewa/enter67/readme.md
similarity index 87%
rename from keyboards/enter67/readme.md
rename to keyboards/kezewa/enter67/readme.md
index 8a4890ff1d5..beb5074f9d1 100644
--- a/keyboards/enter67/readme.md
+++ b/keyboards/kezewa/enter67/readme.md
@@ -6,14 +6,15 @@
 
 * Keyboard Maintainer: https://github.com/LXF-YZP
 * Hardware Supported: enter67 PCB
+* Hardware Availability: [Kezewa](https://kezewa.com/)
 
 Make example for this keyboard (after setting up your build environment):
     
-    make enter67:default
+    make kezewa/enter67:default
     
 Flashing example for this keyboard:
 
-    make enter67:default:flash
+    make kezewa/enter67: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).
 
@@ -23,4 +24,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/enter67/rules.mk b/keyboards/kezewa/enter67/rules.mk
similarity index 100%
rename from keyboards/enter67/rules.mk
rename to keyboards/kezewa/enter67/rules.mk
diff --git a/keyboards/enter80/info.json b/keyboards/kezewa/enter80/info.json
similarity index 100%
rename from keyboards/enter80/info.json
rename to keyboards/kezewa/enter80/info.json
diff --git a/keyboards/enter80/keymaps/default/keymap.c b/keyboards/kezewa/enter80/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/enter80/keymaps/default/keymap.c
rename to keyboards/kezewa/enter80/keymaps/default/keymap.c
diff --git a/keyboards/enter80/keymaps/via/keymap.c b/keyboards/kezewa/enter80/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/enter80/keymaps/via/keymap.c
rename to keyboards/kezewa/enter80/keymaps/via/keymap.c
diff --git a/keyboards/enter80/keymaps/via/rules.mk b/keyboards/kezewa/enter80/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/enter80/keymaps/via/rules.mk
rename to keyboards/kezewa/enter80/keymaps/via/rules.mk
diff --git a/keyboards/enter80/matrix_diagram.md b/keyboards/kezewa/enter80/matrix_diagram.md
similarity index 100%
rename from keyboards/enter80/matrix_diagram.md
rename to keyboards/kezewa/enter80/matrix_diagram.md
diff --git a/keyboards/enter80/readme.md b/keyboards/kezewa/enter80/readme.md
similarity index 94%
rename from keyboards/enter80/readme.md
rename to keyboards/kezewa/enter80/readme.md
index c02001a43d8..eaecf514cb8 100644
--- a/keyboards/enter80/readme.md
+++ b/keyboards/kezewa/enter80/readme.md
@@ -6,6 +6,7 @@
 
 * Keyboard Maintainer: https://github.com/LXF-YZP
 * Hardware Supported: enter80 PCB
+* Hardware Availability: [Kezewa](https://kezewa.com/)
 
 Make example for this keyboard (after setting up your build environment):
     
diff --git a/keyboards/enter80/rules.mk b/keyboards/kezewa/enter80/rules.mk
similarity index 100%
rename from keyboards/enter80/rules.mk
rename to keyboards/kezewa/enter80/rules.mk