diff --git a/modules/apps/default.nix b/modules/apps/default.nix
new file mode 100644
index 0000000..31bd9d1
--- /dev/null
+++ b/modules/apps/default.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./rofi
+    ./kitty.nix
+    ./zathura.nix
+  ];
+  home-manager.users.moritz.home.packages = with pkgs; [
+    neofetch
+    keepassxc
+    spotify
+    spicetify-cli
+  ];
+}
diff --git a/modules/kitty.nix b/modules/apps/kitty.nix
similarity index 100%
rename from modules/kitty.nix
rename to modules/apps/kitty.nix
diff --git a/modules/rofi/default.nix b/modules/apps/rofi/default.nix
similarity index 100%
rename from modules/rofi/default.nix
rename to modules/apps/rofi/default.nix
diff --git a/modules/rofi/dracula.rasi b/modules/apps/rofi/dracula.rasi
similarity index 100%
rename from modules/rofi/dracula.rasi
rename to modules/apps/rofi/dracula.rasi
diff --git a/modules/zathura.nix b/modules/apps/zathura.nix
similarity index 100%
rename from modules/zathura.nix
rename to modules/apps/zathura.nix
diff --git a/modules/cli/default.nix b/modules/cli/default.nix
new file mode 100644
index 0000000..67b0cf4
--- /dev/null
+++ b/modules/cli/default.nix
@@ -0,0 +1,9 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+   ./git.nix
+   ./nix.nix
+   ./zsh.nix
+  ];
+}
diff --git a/modules/git.nix b/modules/cli/git.nix
similarity index 100%
rename from modules/git.nix
rename to modules/cli/git.nix
diff --git a/modules/nix.nix b/modules/cli/nix.nix
similarity index 100%
rename from modules/nix.nix
rename to modules/cli/nix.nix
diff --git a/modules/zsh.nix b/modules/cli/zsh.nix
similarity index 100%
rename from modules/zsh.nix
rename to modules/cli/zsh.nix
diff --git a/modules/default.nix b/modules/default.nix
index 1e48634..f513ef3 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -2,19 +2,10 @@
 
 {
   imports = [
-    ./bspwm
-    ./dunst
-    ./emacs
-    ./polybar
-    ./rofi
-    ./agenix.nix
-    ./diskstation.nix
-    ./git.nix
-    ./kitty.nix
-    ./picom.nix
-    ./zathura.nix
-    ./zsh.nix
-    ./nix.nix
+    ./apps
+    ./cli
+    ./desktop
+    ./services
   ];
 
   # USERS
@@ -44,17 +35,6 @@
     home.username = "moritz";
     home.homeDirectory = "/home/moritz";
 
-    services = {
-      kdeconnect.enable = true;
-    };
-
-    home.packages = with pkgs; [
-      neofetch
-      keepassxc
-      spotify
-      spicetify-cli
-    ];
-
     home.stateVersion = "21.05";
   };
 }
diff --git a/modules/bspwm/bspwmrc b/modules/desktop/bspwm/bspwmrc
similarity index 100%
rename from modules/bspwm/bspwmrc
rename to modules/desktop/bspwm/bspwmrc
diff --git a/modules/bspwm/default.nix b/modules/desktop/bspwm/default.nix
similarity index 100%
rename from modules/bspwm/default.nix
rename to modules/desktop/bspwm/default.nix
diff --git a/modules/bspwm/dracula.png b/modules/desktop/bspwm/dracula.png
similarity index 100%
rename from modules/bspwm/dracula.png
rename to modules/desktop/bspwm/dracula.png
diff --git a/modules/bspwm/sxhkdrc b/modules/desktop/bspwm/sxhkdrc
similarity index 100%
rename from modules/bspwm/sxhkdrc
rename to modules/desktop/bspwm/sxhkdrc
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
new file mode 100644
index 0000000..3076c1c
--- /dev/null
+++ b/modules/desktop/default.nix
@@ -0,0 +1,8 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./bspwm
+    ./polybar
+  ];
+}
diff --git a/modules/polybar/colors.ini b/modules/desktop/polybar/colors.ini
similarity index 100%
rename from modules/polybar/colors.ini
rename to modules/desktop/polybar/colors.ini
diff --git a/modules/polybar/config.ini b/modules/desktop/polybar/config.ini
similarity index 100%
rename from modules/polybar/config.ini
rename to modules/desktop/polybar/config.ini
diff --git a/modules/polybar/default.nix b/modules/desktop/polybar/default.nix
similarity index 100%
rename from modules/polybar/default.nix
rename to modules/desktop/polybar/default.nix
diff --git a/modules/polybar/modules.ini b/modules/desktop/polybar/modules.ini
similarity index 100%
rename from modules/polybar/modules.ini
rename to modules/desktop/polybar/modules.ini
diff --git a/modules/agenix.nix b/modules/services/agenix.nix
similarity index 100%
rename from modules/agenix.nix
rename to modules/services/agenix.nix
diff --git a/modules/services/default.nix b/modules/services/default.nix
new file mode 100644
index 0000000..97aba6e
--- /dev/null
+++ b/modules/services/default.nix
@@ -0,0 +1,15 @@
+{ config, lib, pkgs, ... }:
+
+{
+  imports = [
+    ./dunst
+    ./emacs
+    ./agenix.nix
+    ./diskstation.nix
+    ./picom.nix
+  ];
+
+  home-manager.users.moritz.services = {
+      kdeconnect.enable = true;
+  };
+}
diff --git a/modules/diskstation.nix b/modules/services/diskstation.nix
similarity index 100%
rename from modules/diskstation.nix
rename to modules/services/diskstation.nix
diff --git a/modules/dunst/default.nix b/modules/services/dunst/default.nix
similarity index 100%
rename from modules/dunst/default.nix
rename to modules/services/dunst/default.nix
diff --git a/modules/dunst/dunstrc b/modules/services/dunst/dunstrc
similarity index 100%
rename from modules/dunst/dunstrc
rename to modules/services/dunst/dunstrc
diff --git a/modules/emacs/default.nix b/modules/services/emacs/default.nix
similarity index 100%
rename from modules/emacs/default.nix
rename to modules/services/emacs/default.nix
diff --git a/modules/emacs/doom/config.el b/modules/services/emacs/doom/config.el
similarity index 100%
rename from modules/emacs/doom/config.el
rename to modules/services/emacs/doom/config.el
diff --git a/modules/emacs/doom/custom.el b/modules/services/emacs/doom/custom.el
similarity index 100%
rename from modules/emacs/doom/custom.el
rename to modules/services/emacs/doom/custom.el
diff --git a/modules/emacs/doom/init.el b/modules/services/emacs/doom/init.el
similarity index 100%
rename from modules/emacs/doom/init.el
rename to modules/services/emacs/doom/init.el
diff --git a/modules/emacs/doom/packages.el b/modules/services/emacs/doom/packages.el
similarity index 100%
rename from modules/emacs/doom/packages.el
rename to modules/services/emacs/doom/packages.el
diff --git a/modules/picom.nix b/modules/services/picom.nix
similarity index 100%
rename from modules/picom.nix
rename to modules/services/picom.nix