diff --git a/Makefile b/Makefile
index deb04d7..588bb08 100644
--- a/Makefile
+++ b/Makefile
@@ -1,29 +1,23 @@
-.PHONY: all format cp compile json clean
+.PHONY: all format clean dztech_dz60rgb_wkl
 
 all:
 	$(MAKE) format
-	$(MAKE) compile
+	$(MAKE) dztech_dz60rgb_wkl
 
 format:
-	clang-format -i keymaps/haunt98/*.c keymaps/haunt98/*.h
-
-cp:
-	rm -rf ~/qmk_firmware/keyboards/dztech/dz60rgb_wkl/keymaps/haunt98
-	cp -rf keymaps/haunt98 ~/qmk_firmware/keyboards/dztech/dz60rgb_wkl/keymaps/
-
-compile:
-	$(MAKE) cp
-	qmk compile -j 8 -kb dztech/dz60rgb_wkl/v2_1 -km haunt98
-	mv ~/qmk_firmware/dztech_dz60rgb_wkl_v2_1_haunt98.bin .
-
-json:
-	$(MAKE) cp
-	rm -rf keymaps_json/haunt98/keymap.json
-	qmk c2json -kb dztech/dz60rgb_wkl/v2_1 -km haunt98 -o keymaps_json/haunt98/keymap.json keymaps/haunt98/keymap.c
+	clang-format -i dztech_dz60rgb_wkl/keymaps/haunt98/*.c dztech_dz60rgb_wkl/keymaps/haunt98/*.h
 
 clean:
 	qmk clean
 	rm -rf dztech_dz60rgb_wkl_v2_1_haunt98.bin
 
-draw:
-	pipx install keymap-drawer
+dztech_dz60rgb_wkl:
+	# Copy
+	rm -rf ~/qmk_firmware/keyboards/dztech/dz60rgb_wkl/keymaps/haunt98
+	cp -rf dztech_dz60rgb_wkl/keymaps/haunt98 ~/qmk_firmware/keyboards/dztech/dz60rgb_wkl/keymaps/
+	# Compile
+	qmk compile -j 8 -kb dztech/dz60rgb_wkl/v2_1 -km haunt98
+	# JSON
+	mv ~/qmk_firmware/dztech_dz60rgb_wkl_v2_1_haunt98.bin .
+	rm -rf dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
+	qmk c2json -kb dztech/dz60rgb_wkl/v2_1 -km haunt98 -o dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
diff --git a/README.md b/README.md
index b0f46c3..20cbe78 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,25 @@
-# QMK for dztech/dz60rgb_wkl
+# QMK custom keymaps
 
-From [QMK dztech/dz60rgb_wkl](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dztech/dz60rgb_wkl):
+## [dztech/dz60rgb_wkl](https://github.com/qmk/qmk_firmware/tree/master/keyboards/dztech/dz60rgb_wkl)
 
 > V2.1: ATmega32U4 (AVR), takes .bin files Started shipping in June 2021 as a slightly modified version of v2.
 
-## Install
+### Stock
 
-Run `make` to build the firmware.
-If success, firmware file `dztech_dz60rgb_wkl_v2_1_haunt98.bin` is located inside repo.
+Stock firmware is `dztech_dz60rgb_wkl/stock/new dztech_dz60rgb_wkl_v3_via.bin`.
+Can be flashed with QMK Toolbox.
+
+Links:
+
+- [DZ60RGB-WKL Hot-Swap PCB](https://kbdfans.com/products/dz60rgb-wkl-hot-swap-pcb)
+- [USB Drive Flash Manual (New Flash Manual)](https://docs.google.com/document/d/111qx6Qec4JqtIhWaZlMND-VuRnFtn9a-gJaHN8fsL7M/edit?usp=sharing)
+
+### Compile
+
+```sh
+make dztech_dz60rgb_wkl
+# Output is dztech_dz60rgb_wkl_v2_1_haunt98.bin
+```
 
 Currently firmware size:
 
@@ -15,7 +27,11 @@ Currently firmware size:
 * The firmware size is fine - 16074/26624 (60%, 10550 bytes free)
 ```
 
-Put keyboard into bootloader mode in 2 ways (only choose one):
+## Install
+
+Locate firmware file after compile successfully.
+
+Put keyboard into bootloader mode in 2 ways:
 
 - Press `QK_BOOT`.
 - Unplug cable, then hold `ESC` and plug cable.
@@ -55,16 +71,6 @@ Build/Optimize
 - [Reducing firmware size](https://get.vial.today/docs/firmware-size.html)
 - [Configuring QMK](https://www.caniusevia.com/docs/configuring_qmk)
 
-## Stock
-
-Stock firmware is `stock/dztech_dz60rgb_wkl_v2_1.bin`.
-Can be flashed with QMK Toolbox.
-
-Links:
-
-- [DZ60RGB-WKL Hot-Swap PCB](https://kbdfans.com/products/dz60rgb-wkl-hot-swap-pcb)
-- [USB Drive Flash Manual (New Flash Manual)](https://docs.google.com/document/d/111qx6Qec4JqtIhWaZlMND-VuRnFtn9a-gJaHN8fsL7M/edit?usp=sharing)
-
 ## TODO
 
 - [x] How to flash
diff --git a/keymaps/haunt98/config.h b/dztech_dz60rgb_wkl/keymaps/haunt98/config.h
similarity index 100%
rename from keymaps/haunt98/config.h
rename to dztech_dz60rgb_wkl/keymaps/haunt98/config.h
diff --git a/keymaps/haunt98/info.json b/dztech_dz60rgb_wkl/keymaps/haunt98/info.json
similarity index 100%
rename from keymaps/haunt98/info.json
rename to dztech_dz60rgb_wkl/keymaps/haunt98/info.json
diff --git a/keymaps/haunt98/keymap.c b/dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
similarity index 100%
rename from keymaps/haunt98/keymap.c
rename to dztech_dz60rgb_wkl/keymaps/haunt98/keymap.c
diff --git a/keymaps/haunt98/rules.mk b/dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk
similarity index 100%
rename from keymaps/haunt98/rules.mk
rename to dztech_dz60rgb_wkl/keymaps/haunt98/rules.mk
diff --git a/keymaps_json/haunt98/keymap.json b/dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
similarity index 100%
rename from keymaps_json/haunt98/keymap.json
rename to dztech_dz60rgb_wkl/keymaps_json/haunt98/keymap.json
diff --git a/stock/new dztech_dz60rgb_wkl_v3_via.bin b/dztech_dz60rgb_wkl/stock/new dztech_dz60rgb_wkl_v3_via.bin
similarity index 100%
rename from stock/new dztech_dz60rgb_wkl_v3_via.bin
rename to dztech_dz60rgb_wkl/stock/new dztech_dz60rgb_wkl_v3_via.bin