diff --git a/client/defaults/main.yml b/desktop/defaults/main.yml
similarity index 100%
rename from client/defaults/main.yml
rename to desktop/defaults/main.yml
diff --git a/client/files/00-keyboard.conf b/desktop/files/00-keyboard.conf
similarity index 100%
rename from client/files/00-keyboard.conf
rename to desktop/files/00-keyboard.conf
diff --git a/client/files/google.gpg b/desktop/files/google.gpg
similarity index 100%
rename from client/files/google.gpg
rename to desktop/files/google.gpg
diff --git a/client/files/i3lock b/desktop/files/i3lock
similarity index 100%
rename from client/files/i3lock
rename to desktop/files/i3lock
diff --git a/client/files/kde/kglobalshortcutsrc b/desktop/files/kde/kglobalshortcutsrc
similarity index 100%
rename from client/files/kde/kglobalshortcutsrc
rename to desktop/files/kde/kglobalshortcutsrc
diff --git a/client/files/kde/khotkeysrc b/desktop/files/kde/khotkeysrc
similarity index 100%
rename from client/files/kde/khotkeysrc
rename to desktop/files/kde/khotkeysrc
diff --git a/client/files/kde/kickoffrc b/desktop/files/kde/kickoffrc
similarity index 100%
rename from client/files/kde/kickoffrc
rename to desktop/files/kde/kickoffrc
diff --git a/client/files/kde/ksplashrc b/desktop/files/kde/ksplashrc
similarity index 100%
rename from client/files/kde/ksplashrc
rename to desktop/files/kde/ksplashrc
diff --git a/client/files/kdm/fsmpi_theme/KdmGreeterTheme.desktop b/desktop/files/kdm/fsmpi_theme/KdmGreeterTheme.desktop
similarity index 100%
rename from client/files/kdm/fsmpi_theme/KdmGreeterTheme.desktop
rename to desktop/files/kdm/fsmpi_theme/KdmGreeterTheme.desktop
diff --git a/client/files/kdm/fsmpi_theme/background.svg b/desktop/files/kdm/fsmpi_theme/background.svg
similarity index 100%
rename from client/files/kdm/fsmpi_theme/background.svg
rename to desktop/files/kdm/fsmpi_theme/background.svg
diff --git a/client/files/kdm/fsmpi_theme/fsmpi.xml b/desktop/files/kdm/fsmpi_theme/fsmpi.xml
similarity index 100%
rename from client/files/kdm/fsmpi_theme/fsmpi.xml
rename to desktop/files/kdm/fsmpi_theme/fsmpi.xml
diff --git a/client/files/kdm/fsmpi_theme/lineedit_active.png b/desktop/files/kdm/fsmpi_theme/lineedit_active.png
similarity index 100%
rename from client/files/kdm/fsmpi_theme/lineedit_active.png
rename to desktop/files/kdm/fsmpi_theme/lineedit_active.png
diff --git a/client/files/kdm/fsmpi_theme/lineedit_normal.png b/desktop/files/kdm/fsmpi_theme/lineedit_normal.png
similarity index 100%
rename from client/files/kdm/fsmpi_theme/lineedit_normal.png
rename to desktop/files/kdm/fsmpi_theme/lineedit_normal.png
diff --git a/client/files/kdm/fsmpi_theme/lock.png b/desktop/files/kdm/fsmpi_theme/lock.png
similarity index 100%
rename from client/files/kdm/fsmpi_theme/lock.png
rename to desktop/files/kdm/fsmpi_theme/lock.png
diff --git a/client/files/kdm/fsmpi_theme/rectangle.png b/desktop/files/kdm/fsmpi_theme/rectangle.png
similarity index 100%
rename from client/files/kdm/fsmpi_theme/rectangle.png
rename to desktop/files/kdm/fsmpi_theme/rectangle.png
diff --git a/client/files/kdm/fsmpi_theme/session_normal.png b/desktop/files/kdm/fsmpi_theme/session_normal.png
similarity index 100%
rename from client/files/kdm/fsmpi_theme/session_normal.png
rename to desktop/files/kdm/fsmpi_theme/session_normal.png
diff --git a/client/files/kdm/fsmpi_theme/system_normal.png b/desktop/files/kdm/fsmpi_theme/system_normal.png
similarity index 100%
rename from client/files/kdm/fsmpi_theme/system_normal.png
rename to desktop/files/kdm/fsmpi_theme/system_normal.png
diff --git a/client/files/kdm/fsmpi_theme/user_icon.png b/desktop/files/kdm/fsmpi_theme/user_icon.png
similarity index 100%
rename from client/files/kdm/fsmpi_theme/user_icon.png
rename to desktop/files/kdm/fsmpi_theme/user_icon.png
diff --git a/client/files/kdm/kdmrc b/desktop/files/kdm/kdmrc
similarity index 100%
rename from client/files/kdm/kdmrc
rename to desktop/files/kdm/kdmrc
diff --git a/client/files/mozilla/firefox/defaults/pref/local-settings.js b/desktop/files/mozilla/firefox/defaults/pref/local-settings.js
similarity index 100%
rename from client/files/mozilla/firefox/defaults/pref/local-settings.js
rename to desktop/files/mozilla/firefox/defaults/pref/local-settings.js
diff --git a/client/files/mozilla/firefox/mozilla.cfg b/desktop/files/mozilla/firefox/mozilla.cfg
similarity index 100%
rename from client/files/mozilla/firefox/mozilla.cfg
rename to desktop/files/mozilla/firefox/mozilla.cfg
diff --git a/client/files/mozilla/thunderbird/defaults/pref/vendor.js b/desktop/files/mozilla/thunderbird/defaults/pref/vendor.js
similarity index 100%
rename from client/files/mozilla/thunderbird/defaults/pref/vendor.js
rename to desktop/files/mozilla/thunderbird/defaults/pref/vendor.js
diff --git a/client/files/sddm-override.conf b/desktop/files/sddm-override.conf
similarity index 100%
rename from client/files/sddm-override.conf
rename to desktop/files/sddm-override.conf
diff --git a/client/files/sddm.conf b/desktop/files/sddm.conf
similarity index 100%
rename from client/files/sddm.conf
rename to desktop/files/sddm.conf
diff --git a/client/files/udev_audio-perm.rules b/desktop/files/udev_audio-perm.rules
similarity index 100%
rename from client/files/udev_audio-perm.rules
rename to desktop/files/udev_audio-perm.rules
diff --git a/client/handlers/main.yml b/desktop/handlers/main.yml
similarity index 100%
rename from client/handlers/main.yml
rename to desktop/handlers/main.yml
diff --git a/client/tasks/configuration.yml b/desktop/tasks/configuration.yml
similarity index 97%
rename from client/tasks/configuration.yml
rename to desktop/tasks/configuration.yml
index 0c93616082f135d740aaa17a7f158d4a265ce530..d8968c272783e1d31fe7218140234635455663be 100644
--- a/client/tasks/configuration.yml
+++ b/desktop/tasks/configuration.yml
@@ -38,7 +38,7 @@
     group: root
     mode: '0644'
   with_fileglob:
-    - fonts/*
+    - "{{ inventory_dir }}/files/fonts/*"
 
 - name: ensure firefox default profile stuff is installed
   copy:
diff --git a/client/tasks/kde.yml b/desktop/tasks/kde.yml
similarity index 100%
rename from client/tasks/kde.yml
rename to desktop/tasks/kde.yml
diff --git a/client/tasks/main.yml b/desktop/tasks/main.yml
similarity index 100%
rename from client/tasks/main.yml
rename to desktop/tasks/main.yml
diff --git a/client/tasks/network.yml b/desktop/tasks/network.yml
similarity index 100%
rename from client/tasks/network.yml
rename to desktop/tasks/network.yml
diff --git a/client/tasks/proprietary.yml b/desktop/tasks/proprietary.yml
similarity index 100%
rename from client/tasks/proprietary.yml
rename to desktop/tasks/proprietary.yml
diff --git a/client/tasks/software.yml b/desktop/tasks/software.yml
similarity index 100%
rename from client/tasks/software.yml
rename to desktop/tasks/software.yml
diff --git a/client/templates/lpoptions.j2 b/desktop/templates/lpoptions.j2
similarity index 100%
rename from client/templates/lpoptions.j2
rename to desktop/templates/lpoptions.j2