diff --git a/configuration/packages/atom.txt b/configuration/packages/client/apm/general.txt
similarity index 100%
rename from configuration/packages/atom.txt
rename to configuration/packages/client/apm/general.txt
diff --git a/configuration/packages/client/pacman/games.txt b/configuration/packages/client/pacman/games.txt
new file mode 100644
index 0000000..989a1f9
--- /dev/null
+++ b/configuration/packages/client/pacman/games.txt
@@ -0,0 +1,14 @@
+## games
+0ad
+warzone2100
+supertuxkart
+gnuchess
+sauerbraten
+assaultcube
+minetest
+mari0
+
+### retroarch
+retroarch
+retroarch-assets-xmb
+retroarch-assets-ozone
diff --git a/configuration/packages/client-pacman.txt b/configuration/packages/client/pacman/general.txt
similarity index 85%
rename from configuration/packages/client-pacman.txt
rename to configuration/packages/client/pacman/general.txt
index c73e5a7..9aae08b 100644
--- a/configuration/packages/client-pacman.txt
+++ b/configuration/packages/client/pacman/general.txt
@@ -78,18 +78,3 @@ ansible
 
 # entertainment software
 rhythmbox
-
-## games
-0ad
-warzone2100
-supertuxkart
-gnuchess
-sauerbraten
-assaultcube
-minetest
-mari0
-
-### retroarch
-retroarch
-retroarch-assets-xmb
-retroarch-assets-ozone
diff --git a/configuration/packages/client-yay.txt b/configuration/packages/client/yay/general.txt
similarity index 100%
rename from configuration/packages/client-yay.txt
rename to configuration/packages/client/yay/general.txt
diff --git a/scripts/client/setup.sh b/scripts/client/setup.sh
index f5618fd..dcd4c75 100644
--- a/scripts/client/setup.sh
+++ b/scripts/client/setup.sh
@@ -13,9 +13,9 @@ info "Update packages..." &&
 sudo pacman -Syyu || error "Package syncronisation failed."
 
 info "Synchronizing pacman packages..." &&
-get_packages "general" "client-pacman" | sudo pacman -S --needed - &&
+get_packages "general" "client/pacman/general" "client/pacman/games" | sudo pacman -S --needed - &&
 info "Synchronizing yay packages..." &&
-get_packages "client-yay" | yay -S - || error "Syncronisation failed."
+get_packages "client/yay/general" | yay -S - || error "Syncronisation failed."
 
 FSTAB_SWAP_ENTRY="/swapfile none swap defaults 0 0"
 SWAP_FILE="/swapfile"
@@ -57,7 +57,7 @@ fi
 
 if pacman -Qi "atom" > /dev/null ; then
 	info "Installing atom packages..." &&
-	get_packages "atom" | apm install --verbose -c - &&
+	get_packages "client/apm/general" | apm install --verbose -c - &&
 	info "Installing software which is required by atom..." &&
 	sudo npm i -g bash-language-server &&
 	python -m pip install 'python-language-server[all]' || error "Failed."