diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3870ab0..1f17c5f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,8 +22,8 @@ build-image:
   parallel:
     matrix:
       - RECIPE:
-          - recipe-jp-desktop-gaming.yml
-          - recipe-jp-laptop.yml
+          - jp-desktop-gaming.yml
+          - jp-laptop.yml
   variables:
     DOCKER_HOST: tcp://docker:2376
     DOCKER_TLS_CERTDIR: /certs
diff --git a/recipes/recipe-cp-laptop.yml b/recipes/cp-laptop.yml
similarity index 91%
rename from recipes/recipe-cp-laptop.yml
rename to recipes/cp-laptop.yml
index 3cc766b..5564671 100644
--- a/recipes/recipe-cp-laptop.yml
+++ b/recipes/cp-laptop.yml
@@ -6,7 +6,7 @@ modules:
   - type: files
     files:
       - usr: /usr
-  - from-file: framework.yml
+  - from-file: modules/framework.yml
   - type: rpm-ostree
     install:
       - libadwaita
diff --git a/recipes/recipe-jp-desktop-gaming.yml b/recipes/jp-desktop.yml
similarity index 72%
rename from recipes/recipe-jp-desktop-gaming.yml
rename to recipes/jp-desktop.yml
index 65de493..63ef605 100644
--- a/recipes/recipe-jp-desktop-gaming.yml
+++ b/recipes/jp-desktop.yml
@@ -9,6 +9,6 @@ modules:
     files:
       - steam-firewall: /usr
       - desktop-audio: /usr
-  - from-file: jp-apps.yml
-  - from-file: gaming.yml
-  - from-file: dev-packages.yml
+  - from-file: modules/jp-apps.yml
+  - from-file: modules/gaming.yml
+  - from-file: modules/dev-packages.yml
diff --git a/recipes/recipe-jp-laptop.yml b/recipes/jp-laptop.yml
similarity index 67%
rename from recipes/recipe-jp-laptop.yml
rename to recipes/jp-laptop.yml
index 734799b..888ee69 100644
--- a/recipes/recipe-jp-laptop.yml
+++ b/recipes/jp-laptop.yml
@@ -4,10 +4,10 @@ image-version: latest
 description: The image of Wunker OS for JP's Laptop.
 modules:
   - type: signing
-  - from-file: jp-apps.yml
+  - from-file: modules/jp-apps.yml
   - type: rpm-ostree
     install:
       - fprintd
       - fprintd-pam
-  - from-file: gaming.yml
-  - from-file: dev-packages.yml
+  - from-file: modules/gaming.yml
+  - from-file: modules/dev-packages.yml
diff --git a/recipes/dev-packages.yml b/recipes/modules/dev-packages.yml
similarity index 93%
rename from recipes/dev-packages.yml
rename to recipes/modules/dev-packages.yml
index e40e7ce..5c61670 100644
--- a/recipes/dev-packages.yml
+++ b/recipes/modules/dev-packages.yml
@@ -1,4 +1,5 @@
 modules:
+  - from-file: modules/docker-engine.yml
   - type: script
     scripts:
       - setup-kubectl.sh
@@ -28,4 +29,3 @@ modules:
     scripts:
       - install-mkcert.sh
       - install-codelldb.sh
-  - from-file: docker-engine.yml
diff --git a/recipes/docker-engine.yml b/recipes/modules/docker-engine.yml
similarity index 100%
rename from recipes/docker-engine.yml
rename to recipes/modules/docker-engine.yml
diff --git a/recipes/framework.yml b/recipes/modules/framework.yml
similarity index 100%
rename from recipes/framework.yml
rename to recipes/modules/framework.yml
diff --git a/recipes/gaming.yml b/recipes/modules/gaming.yml
similarity index 100%
rename from recipes/gaming.yml
rename to recipes/modules/gaming.yml
diff --git a/recipes/jp-apps.yml b/recipes/modules/jp-apps.yml
similarity index 76%
rename from recipes/jp-apps.yml
rename to recipes/modules/jp-apps.yml
index 7922c54..86e5086 100644
--- a/recipes/jp-apps.yml
+++ b/recipes/modules/jp-apps.yml
@@ -3,7 +3,7 @@ modules:
     files:
       - usr: /usr
       - distrobox: /usr
-  - from-file: jp-packages.yml
+  - from-file: modules/jp-packages.yml
   - type: fonts
     nerdfont:
       - JetBrainsMono
diff --git a/recipes/jp-packages.yml b/recipes/modules/jp-packages.yml
similarity index 100%
rename from recipes/jp-packages.yml
rename to recipes/modules/jp-packages.yml
diff --git a/recipes/remove-firefox.yml b/recipes/modules/remove-firefox.yml
similarity index 100%
rename from recipes/remove-firefox.yml
rename to recipes/modules/remove-firefox.yml
diff --git a/recipes/recipe-jp-desktop.yml b/recipes/recipe-jp-desktop.yml
deleted file mode 100644
index a563a4b..0000000
--- a/recipes/recipe-jp-desktop.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: jp-desktop
-base-image: ghcr.io/ublue-os/kinoite-nvidia
-image-version: latest
-description: The image of Wunker OS for JP's desktop.
-blue-build-tag: main-installer
-modules:
-  - from-file: remove-firefox.yml
-  - type: files
-    files:
-      - 8bitdo-ultimate: /usr
-      - steam-firewall: /usr
-      - desktop-audio: /usr
-  - from-file: jp-apps.yml
-  - from-file: dev-packages.yml
diff --git a/recipes/recipe-jp-laptop-hypr.yml b/recipes/recipe-jp-laptop-hypr.yml
deleted file mode 100644
index 60c52b6..0000000
--- a/recipes/recipe-jp-laptop-hypr.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: jp-laptop
-base-image: ghcr.io/wayblueorg/hyprland-gdm
-image-version: latest
-description: The image of Wunker OS for JP's Laptop.
-modules:
-  - from-file: jp-apps.yml
-  - from-file: dev-packages.yml
-  - type: rpm-ostree
-    install:
-      - fprintd
-      - fprintd-pam
-  - from-file: docker-engine.yml
-  - type: signing