diff --git a/modules/akmods.yml b/modules/akmods.yml
new file mode 100644
index 0000000..826f868
--- /dev/null
+++ b/modules/akmods.yml
@@ -0,0 +1,3 @@
+type: akmods
+install:
+  - evdi
\ No newline at end of file
diff --git a/modules/common-flatpaks.yml b/modules/common-flatpaks.yml
new file mode 100644
index 0000000..bfd3463
--- /dev/null
+++ b/modules/common-flatpaks.yml
@@ -0,0 +1,49 @@
+type: default-flatpaks
+notify: true # Send notification after install/uninstall is finished (true/false)
+system:
+  # If no repo information is specified, Flathub will be used by default
+  # repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
+  # repo-name: flathub
+  # repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software
+  install:
+    # Browsers
+    - org.mozilla.firefox
+    - com.microsoft.Edge
+
+    # Social
+    - io.github.mimbrero.WhatsAppDesktop
+    - com.github.IsmaelMartinez.teams_for_linux
+    - us.zoom.Zoom
+
+    # Media
+    # - org.freedesktop.Platform.ffmpeg-full
+    - com.spotify.Client
+    - com.stremio.Stremio
+    - sh.cider.Cider
+
+    # Utility
+    - org.gnome.Loupe
+    - com.github.tchx84.Flatseal
+    - com.mattjakeman.ExtensionManager
+    - org.localsend.localsend_app
+    - com.bitwarden.desktop
+    - com.usebottles.bottles
+    - io.missioncenter.MissionCenter
+    - org.gnome.Papers
+    
+    # Development
+    - com.visualstudio.code
+
+    # Needed for winapps
+    - com.freerdp.FreeRDP
+
+    # Gaming
+    - com.valvesoftware.Steam
+    - net.lutris.Lutris
+
+    # - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch).
+  # Flatpak runtimes are not supported (like org.winehq.Wine//stable-23.08),
+  # only normal flatpak applications are (like Floorp Lightning web browser in this example).
+  # Installing different branches of the same Flatpak is not supported.
+  remove:
+  # - org.gnome.eog
\ No newline at end of file
diff --git a/modules/common-packages.yml b/modules/common-packages.yml
new file mode 100644
index 0000000..b2859d9
--- /dev/null
+++ b/modules/common-packages.yml
@@ -0,0 +1,38 @@
+type: rpm-ostree
+repos:
+  - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo
+
+install:
+  # Utility
+  - distrobox
+  - adw-gtk3-theme
+  - rsms-inter-fonts
+  - podman-compose
+  - fastfetch
+  - starship
+
+  # Codecs
+  - pipewire-codec-aptx
+  - libavcodec-freeworld
+  - openh264
+  - ffmpeg
+  - heif-pixbuf-loader
+  - libheif-freeworld
+  - libheif-tools
+
+  # Gnome Extensions
+  - gnome-shell-extension-appindicator
+  - gnome-shell-extension-pop-shell
+  - gnome-shell-extension-pop-shell-shortcut-overrides
+  - gnome-shell-extension-dash-to-dock
+
+  # Needed for winapps
+  - dialog
+  - nmap-ncat
+
+remove:
+  # example: removing firefox (in favor of the flatpak)
+  # "firefox" is the main package, "firefox-langpacks" is a dependency
+  - firefox
+  - firefox-langpacks # also remove firefox dependency (not required for all packages, this is a special case)
+  - noopenh264
\ No newline at end of file
diff --git a/modules/cosmic.yml b/modules/cosmic.yml
new file mode 100644
index 0000000..5abdf6e
--- /dev/null
+++ b/modules/cosmic.yml
@@ -0,0 +1,7 @@
+type: script
+snippets:
+  - wget https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-$(rpm -E %fedora)/ryanabx-cosmic-epoch-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ryanabx-cosmic.repo
+
+type: rpm-ostree
+install:
+  - cosmic-desktop
diff --git a/modules/displaylink.yml b/modules/displaylink.yml
new file mode 100644
index 0000000..bca2aab
--- /dev/null
+++ b/modules/displaylink.yml
@@ -0,0 +1,7 @@
+type: script
+snippets:
+  - wget https://copr.fedorainfracloud.org/coprs/crashdummy/Displaylink/repo/fedora-$(rpm -E %fedora)/crashdummy-Displaylink-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_crashdummy-displaylink.repo
+
+type: rpm-ostree
+install:
+  - displaylink
\ No newline at end of file
diff --git a/modules/extra-repos.yml b/modules/extra-repos.yml
new file mode 100644
index 0000000..cff1a02
--- /dev/null
+++ b/modules/extra-repos.yml
@@ -0,0 +1,5 @@
+type: rpm-ostree
+install:
+  # https://docs.fedoraproject.org/en-US/quick-docs/rpmfusion-setup/#_enabling_the_rpm_fusion_repositories_for_ostree_based_systems
+  - rpmfusion-free-release
+  - rpmfusion-nonfree-release
\ No newline at end of file
diff --git a/recipes/gschema-overrides.yml b/modules/gschema-overrides.yml
similarity index 100%
rename from recipes/gschema-overrides.yml
rename to modules/gschema-overrides.yml
diff --git a/modules/intel.yml b/modules/intel.yml
new file mode 100644
index 0000000..4c1fe1d
--- /dev/null
+++ b/modules/intel.yml
@@ -0,0 +1,4 @@
+type: rpm-ostree
+install:
+  - igt-gpu-tools
+  - intel-media-driver
\ No newline at end of file
diff --git a/modules/remove-packages.yml b/modules/remove-packages.yml
new file mode 100644
index 0000000..2e6134a
--- /dev/null
+++ b/modules/remove-packages.yml
@@ -0,0 +1,5 @@
+type: rpm-ostree
+remove:
+  - gnome-extensions-app
+  - nvtop
+  - htop
\ No newline at end of file
diff --git a/modules/scripts.yml b/modules/scripts.yml
new file mode 100644
index 0000000..e267ebc
--- /dev/null
+++ b/modules/scripts.yml
@@ -0,0 +1,3 @@
+type: script
+scripts:
+  - izzy-os-changes.sh
\ No newline at end of file
diff --git a/modules/system76-power.yml b/modules/system76-power.yml
new file mode 100644
index 0000000..805c6eb
--- /dev/null
+++ b/modules/system76-power.yml
@@ -0,0 +1,14 @@
+type: rpm-ostree
+repos:
+  - https://copr.fedorainfracloud.org/coprs/szydell/system76/repo/fedora-%OS_VERSION%/szydell-system76-fedora-%OS_VERSION%.repo
+install:
+  - system76-driver
+  - system76-power
+
+type: systemd
+system:
+  enabled:
+    - com.system76.PowerDaemon.service 
+    - system76-power-wake.service
+  masked:
+    - power-profiles-daemon.service
\ No newline at end of file
diff --git a/recipes/akmods.yml b/recipes/akmods.yml
deleted file mode 100644
index 3d7c184..0000000
--- a/recipes/akmods.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-type: akmods
-  install:
-    - evdi
\ No newline at end of file
diff --git a/recipes/common-flatpaks.yml b/recipes/common-flatpaks.yml
deleted file mode 100644
index 6b295f1..0000000
--- a/recipes/common-flatpaks.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-type: default-flatpaks
-  notify: true # Send notification after install/uninstall is finished (true/false)
-  system:
-    # If no repo information is specified, Flathub will be used by default
-    # repo-url: https://dl.flathub.org/repo/flathub.flatpakrepo
-    # repo-name: flathub
-    # repo-title: "Flathub (system-wide)" # Optional; this sets the remote's user-facing name in graphical frontends like GNOME Software
-    install:
-      # Browsers
-      - org.mozilla.firefox
-      - com.microsoft.Edge
-
-      # Social
-      - io.github.mimbrero.WhatsAppDesktop
-      - com.github.IsmaelMartinez.teams_for_linux
-      - us.zoom.Zoom
-
-      # Media
-      # - org.freedesktop.Platform.ffmpeg-full
-      - com.spotify.Client
-      - com.stremio.Stremio
-      - sh.cider.Cider
-
-      # Utility
-      - org.gnome.Loupe
-      - com.github.tchx84.Flatseal
-      - com.mattjakeman.ExtensionManager
-      - org.localsend.localsend_app
-      - com.bitwarden.desktop
-      - com.usebottles.bottles
-      - io.missioncenter.MissionCenter
-      - org.gnome.Papers
-      
-      # Development
-      - com.visualstudio.code
-
-      # Needed for winapps
-      - com.freerdp.FreeRDP
-
-      # Gaming
-      - com.valvesoftware.Steam
-      - net.lutris.Lutris
-
-      # - one.ablaze.floorp//lightning # This is an example of flatpak which has multiple branches in selection (flatpak//branch).
-    # Flatpak runtimes are not supported (like org.winehq.Wine//stable-23.08),
-    # only normal flatpak applications are (like Floorp Lightning web browser in this example).
-    # Installing different branches of the same Flatpak is not supported.
-    remove:
-    # - org.gnome.eog
\ No newline at end of file
diff --git a/recipes/common-packages.yml b/recipes/common-packages.yml
deleted file mode 100644
index df39137..0000000
--- a/recipes/common-packages.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-type: rpm-ostree
-  repos:
-    - https://copr.fedorainfracloud.org/coprs/atim/starship/repo/fedora-%OS_VERSION%/atim-starship-fedora-%OS_VERSION%.repo
-
-  install:
-    # Utility
-    - distrobox
-    - adw-gtk3-theme
-    - rsms-inter-fonts
-    - podman-compose
-    - fastfetch
-    - starship
-
-    # Codecs
-    - pipewire-codec-aptx
-    - libavcodec-freeworld
-    - openh264
-    - ffmpeg
-    - heif-pixbuf-loader
-    - libheif-freeworld
-    - libheif-tools
-
-    # Gnome Extensions
-    - gnome-shell-extension-appindicator
-    - gnome-shell-extension-pop-shell
-    - gnome-shell-extension-pop-shell-shortcut-overrides
-    - gnome-shell-extension-dash-to-dock
-
-    # Needed for winapps
-    - dialog
-    - nmap-ncat
-
-  remove:
-    # example: removing firefox (in favor of the flatpak)
-    # "firefox" is the main package, "firefox-langpacks" is a dependency
-    - firefox
-    - firefox-langpacks # also remove firefox dependency (not required for all packages, this is a special case)
-    - noopenh264
\ No newline at end of file
diff --git a/recipes/cosmic.yml b/recipes/cosmic.yml
deleted file mode 100644
index 5fe2fcf..0000000
--- a/recipes/cosmic.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-type: script
-  snippets:
-    - wget https://copr.fedorainfracloud.org/coprs/ryanabx/cosmic-epoch/repo/fedora-$(rpm -E %fedora)/ryanabx-cosmic-epoch-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ryanabx-cosmic.repo
-
-type: rpm-ostree
-  install:
-    - cosmic-desktop
diff --git a/recipes/displaylink.yml b/recipes/displaylink.yml
deleted file mode 100644
index da1eb98..0000000
--- a/recipes/displaylink.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-type: script
-  snippets:
-    - wget https://copr.fedorainfracloud.org/coprs/crashdummy/Displaylink/repo/fedora-$(rpm -E %fedora)/crashdummy-Displaylink-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_crashdummy-displaylink.repo
-
-type: rpm-ostree
-  install:
-    - displaylink
\ No newline at end of file
diff --git a/recipes/extra-repos.yml b/recipes/extra-repos.yml
deleted file mode 100644
index 6d1a380..0000000
--- a/recipes/extra-repos.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-type: rpm-ostree
-  install:
-    # https://docs.fedoraproject.org/en-US/quick-docs/rpmfusion-setup/#_enabling_the_rpm_fusion_repositories_for_ostree_based_systems
-    - rpmfusion-free-release
-    - rpmfusion-nonfree-release
\ No newline at end of file
diff --git a/recipes/intel.yml b/recipes/intel.yml
deleted file mode 100644
index f46ef1f..0000000
--- a/recipes/intel.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-type: rpm-ostree
-  install:
-    - igt-gpu-tools
-    - intel-media-driver
\ No newline at end of file
diff --git a/recipes/rawhide.yml b/recipes/rawhide.yml
new file mode 100644
index 0000000..c39d2bc
--- /dev/null
+++ b/recipes/rawhide.yml
@@ -0,0 +1,33 @@
+# image will be published to ghcr.io/<user>/<name>
+name: izzy-os-rawhide
+# description will be included in the image's metadata
+description: This is my personal OS image.
+
+# the base image to build on top of (FROM) and the version tag to use
+base-image: ghcr.io/ublue-os/silverblue-main
+image-version: rawhide # latest is also supported if you want new updates ASAP
+
+# module configuration, executed in order
+# you can include multiple instances of the same module
+modules:
+  - type: files
+    files:
+      - source: system
+        destination: / # copies files/system/* (* means everything inside it) into your image's root folder /
+                       # put configuration files you want in /usr/etc/ inside the image
+                       # while putting files in /etc/ is done on booted system by system administrators.
+                       # read more about this in files module reference.
+
+  - from-file: modules/akmods.yml
+  - from-file: modules/displaylink.yml
+  - from-file: modules/system76-power.yml
+  - from-file: modules/extra-repos.yml
+  - from-file: modules/intel.yml
+  - from-file: modules/cosmic.yml
+  - from-file: modules/common-packages.yml
+  - from-file: modules/common-flatpaks.yml
+  - from-file: modules/remove-packages.yml
+  - from-file: modules/gschema-overrides.yml
+  - from-file: modules/scripts.yml
+
+  - type: signing # this sets up the proper policy & signing files for signed images to work fully
\ No newline at end of file
diff --git a/recipes/recipe.yml b/recipes/recipe.yml
index d675f01..a0ca2e3 100644
--- a/recipes/recipe.yml
+++ b/recipes/recipe.yml
@@ -18,16 +18,16 @@ modules:
                        # while putting files in /etc/ is done on booted system by system administrators.
                        # read more about this in files module reference.
 
-  - from-file: akmods.yml
-  - from-file: displaylink.yml
-  - from-file: system76-power.yml
-  - from-file: extra-repos.yml
-  - from-file: intel.yml
-  - from-file: cosmic.yml
-  - from-file: common-packages.yml
-  - from-file: common-flatpaks.yml
-  - from-file: remove-packages.yml
-  - from-file: gschema-overrides.yml
-  - from-file: scripts.yml
+  - from-file: modules/akmods.yml
+  - from-file: modules/displaylink.yml
+  - from-file: modules/system76-power.yml
+  - from-file: modules/extra-repos.yml
+  - from-file: modules/intel.yml
+  - from-file: modules/cosmic.yml
+  - from-file: modules/common-packages.yml
+  - from-file: modules/common-flatpaks.yml
+  - from-file: modules/remove-packages.yml
+  - from-file: modules/gschema-overrides.yml
+  - from-file: modules/scripts.yml
 
   - type: signing # this sets up the proper policy & signing files for signed images to work fully
\ No newline at end of file
diff --git a/recipes/remove-packages.yml b/recipes/remove-packages.yml
deleted file mode 100644
index 21bd192..0000000
--- a/recipes/remove-packages.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-type: rpm-ostree
-  remove:
-    - gnome-extensions-app
-    - nvtop
-    - htop
\ No newline at end of file
diff --git a/recipes/scripts.yml b/recipes/scripts.yml
deleted file mode 100644
index d831c41..0000000
--- a/recipes/scripts.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-type: script
-  scripts:
-    - izzy-os-changes.sh
\ No newline at end of file
diff --git a/recipes/system76-power.yml b/recipes/system76-power.yml
deleted file mode 100644
index bea8047..0000000
--- a/recipes/system76-power.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-type: rpm-ostree
-  repos:
-    - https://copr.fedorainfracloud.org/coprs/szydell/system76/repo/fedora-%OS_VERSION%/szydell-system76-fedora-%OS_VERSION%.repo
-  install:
-    - system76-driver
-    - system76-power
-
-type: systemd
-  system:
-    enabled:
-      - com.system76.PowerDaemon.service 
-      - system76-power-wake.service
-    masked:
-      - power-profiles-daemon.service
\ No newline at end of file