diff --git a/dotfiles/ranger/dot-config/commands.py b/dotfiles/ranger/dot-config/ranger/commands.py
similarity index 100%
rename from dotfiles/ranger/dot-config/commands.py
rename to dotfiles/ranger/dot-config/ranger/commands.py
diff --git a/dotfiles/ranger/dot-config/commands_full.py b/dotfiles/ranger/dot-config/ranger/commands_full.py
similarity index 100%
rename from dotfiles/ranger/dot-config/commands_full.py
rename to dotfiles/ranger/dot-config/ranger/commands_full.py
diff --git a/dotfiles/ranger/dot-config/rc.conf b/dotfiles/ranger/dot-config/ranger/rc.conf
similarity index 100%
rename from dotfiles/ranger/dot-config/rc.conf
rename to dotfiles/ranger/dot-config/ranger/rc.conf
diff --git a/dotfiles/ranger/dot-config/rifle.conf b/dotfiles/ranger/dot-config/ranger/rifle.conf
similarity index 100%
rename from dotfiles/ranger/dot-config/rifle.conf
rename to dotfiles/ranger/dot-config/ranger/rifle.conf
diff --git a/dotfiles/ranger/dot-config/scope.sh b/dotfiles/ranger/dot-config/ranger/scope.sh
similarity index 100%
rename from dotfiles/ranger/dot-config/scope.sh
rename to dotfiles/ranger/dot-config/ranger/scope.sh
diff --git a/system/arch/workstation.yaml b/system/arch/workstation.yaml
index 125a4d1..e01494c 100644
--- a/system/arch/workstation.yaml
+++ b/system/arch/workstation.yaml
@@ -9,29 +9,23 @@
       name:
         - acpi
         - alacritty
-        - arandr
         - aspell
         - aspell-de
         - aspell-en
-        - autorandr
         - bash
         - bash-completion
         - binutils
         - blueman
         - bluez-utils
-        - clipmenu
         - coreutils
         - cryptsetup
         - curl
         - device-mapper
         - dialog
         - diffutils
-        - dmenu
         - dos2unix
         - dosfstools
-        - dunst
         - e2fsprogs
-        - feh
         - file
         - filesystem
         - findutils
@@ -40,10 +34,6 @@
         - gnu-netcat
         - grep
         - gzip
-        - i3-wm
-        - i3lock
-        - i3status
-        - i3status-rust
         - imagemagick
         - inetutils
         - ispell
@@ -73,10 +63,8 @@
         - perl
         - perl-date-manip
         - powerline-fonts
-        - rofi
         - qrencode
         - screenfetch
-        - scrot
         - sed
         - strace
         - texinfo
@@ -104,6 +92,27 @@
         - w3m
         - wget
         - wpa_supplicant
+        - xdot
+        - zathura
+        - zathura-pdf-mupdf
+      state:        present
+      update_cache: True
+
+  - name: "Install X packages"
+    package:
+      name:
+        - arandr
+        - autorandr
+        - clipmenu
+        - dmenu
+        - dunst
+        - feh
+        - i3-wm
+        - i3lock
+        - i3status
+        - i3status-rust
+        - rofi
+        - scrot
         - xautolock
         - xclip
         - xdot
@@ -111,8 +120,6 @@
         - xorg-apps
         - xorg-xclipboard
         - xorg-server
-        - zathura
-        - zathura-pdf-mupdf
       state:        present
       update_cache: True