diff --git a/packages.txt b/packages.txt
deleted file mode 100644
index f885992..0000000
--- a/packages.txt
+++ /dev/null
@@ -1,124 +0,0 @@
-adw-gtk-theme
-alsa-utils
-amd-ucode
-anki
-base
-base-devel
-bash-completion
-blueman
-bluez
-bluez-utils
-breeze
-brightnessctl
-btop
-ccache
-chromium
-cmatrix
-cups
-curl
-discord
-docker
-docker-compose
-efibootmgr
-ex-vi-compat
-file-roller
-firefox
-foliate
-fuse3
-fzf
-gdb
-geoclue
-git
-gpu-screen-recorder
-gpu-screen-recorder-ui
-grim
-grub
-hyprcursor
-hyprland
-hyprlang
-hyprpaper
-hyprutils
-imagemagick
-inter-font
-jdk21-openjdk
-kate
-kitty
-kvantum-qt5
-less
-libdwarf
-libreoffice-fresh
-libva-nvidia-driver
-linux
-linux-firmware
-lldb
-lxappearance
-mako
-man-db
-maven
-ncdu
-neovim
-networkmanager
-nextcloud-client
-nmap
-npm
-nvidia-open
-nvidia-settings
-nvidia-utils
-obs-studio
-obsidian
-openmpi
-openssh
-os-prober
-pacman-contrib
-pavucontrol
-pipewire-alsa
-pipewire-jack
-pipewire-pulse
-postgresql
-postgresql-libs
-prismlauncher
-python
-python-pip
-python-pipx
-python-pydbus
-qt5ct
-qt6-wayland
-qt6ct
-quickshell
-ranger
-rust
-sddm
-slurp
-sof-firmware
-solaar
-sshfs
-steam
-sudo
-swappy
-thunar
-thunar-archive-plugin
-tmux
-ttf-0xproto-nerd
-ttf-jetbrains-mono-nerd
-ttf-noto-nerd
-tumbler
-ufw
-unzip
-vim
-vlc
-vlc-plugin-ffmpeg
-vlc-plugin-x264
-waybar
-webkit2gtk
-wf-recorder
-wget
-wl-clipboard
-woff2-font-awesome
-wofi
-xdg-desktop-portal-hyprland
-xdg-desktop-portal-wlr
-xorg-xrandr
-xpad
-zip
-zsh
-zsh-syntax-highlighting
diff --git a/packages/packages-apps.txt b/packages/packages-apps.txt
new file mode 100644
index 0000000..c2b80ae
--- /dev/null
+++ b/packages/packages-apps.txt
@@ -0,0 +1,13 @@
+firefox
+chromium
+discord
+obsidian
+anki
+libreoffice-fresh
+foliate
+file-roller
+kate
+xpad
+nextcloud-client
+cmatrix
+quickshell
diff --git a/packages/packages-base.txt b/packages/packages-base.txt
new file mode 100644
index 0000000..e683700
--- /dev/null
+++ b/packages/packages-base.txt
@@ -0,0 +1,22 @@
+base
+base-devel
+linux
+linux-firmware
+amd-ucode
+grub
+efibootmgr
+os-prober
+sudo
+networkmanager
+openssh
+fuse3
+man-db
+bash-completion
+pacman-contrib
+curl
+wget
+less
+unzip
+zip
+zsh
+zsh-syntax-highlighting
diff --git a/packages/packages-desktop.txt b/packages/packages-desktop.txt
new file mode 100644
index 0000000..d775ccf
--- /dev/null
+++ b/packages/packages-desktop.txt
@@ -0,0 +1,49 @@
+hyprland
+hyprpaper
+hyprcursor
+hyprlang
+hyprutils
+waybar
+wofi
+mako
+kitty
+thunar
+thunar-archive-plugin
+tumbler
+wl-clipboard
+slurp
+grim
+swappy
+brightnessctl
+pavucontrol
+pipewire-alsa
+pipewire-jack
+pipewire-pulse
+xdg-desktop-portal-hyprland
+xdg-desktop-portal-wlr
+qt5ct
+qt6ct
+qt6-wayland
+adw-gtk-theme
+breeze
+inter-font
+ttf-0xproto-nerd
+ttf-jetbrains-mono-nerd
+ttf-noto-nerd
+woff2-font-awesome
+lxappearance
+kvantum-qt5
+sddm
+libva-nvidia-driver
+nvidia-open
+nvidia-settings
+nvidia-utils
+sof-firmware
+alsa-utils
+blueman
+bluez
+bluez-utils
+geoclue
+imagemagick
+webkit2gtk
+xorg-xrandr
diff --git a/packages/packages-dev.txt b/packages/packages-dev.txt
new file mode 100644
index 0000000..152e68f
--- /dev/null
+++ b/packages/packages-dev.txt
@@ -0,0 +1,28 @@
+git
+neovim
+vim
+tmux
+fzf
+btop
+ranger
+gdb
+lldb
+ccache
+rust
+python
+python-pip
+python-pipx
+python-pydbus
+npm
+jdk21-openjdk
+maven
+openmpi
+docker
+docker-compose
+postgresql
+postgresql-libs
+libdwarf
+nmap
+ncdu
+ufw
+sshfs
diff --git a/packages/packages-gaming.txt b/packages/packages-gaming.txt
new file mode 100644
index 0000000..9a712dd
--- /dev/null
+++ b/packages/packages-gaming.txt
@@ -0,0 +1,2 @@
+steam
+prismlauncher
diff --git a/packages/packages-media.txt b/packages/packages-media.txt
new file mode 100644
index 0000000..838f9ce
--- /dev/null
+++ b/packages/packages-media.txt
@@ -0,0 +1,7 @@
+vlc
+vlc-plugin-ffmpeg
+vlc-plugin-x264
+obs-studio
+gpu-screen-recorder
+gpu-screen-recorder-ui
+wf-recorder