diff --git a/modules/appimage/default.nix b/modules/appimage/default.nix
new file mode 100644
index 0000000..b1ebddd
--- /dev/null
+++ b/modules/appimage/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  boot.binfmt.registrations.appimage = {
+    wrapInterpreterInShell = false;
+    interpreter = "${pkgs.appimage-run}/bin/appimage-run";
+    recognitionType = "magic";
+    offset = 0;
+    mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
+    magicOrExtension = ''\x7fELF....AI\x02'';
+  };
+}
diff --git a/modules/blue/default.nix b/modules/blue/default.nix
new file mode 100644
index 0000000..e43b1ea
--- /dev/null
+++ b/modules/blue/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  services.blueman.enable = true;
+  hardware.bluetooth.enable = true;
+}
diff --git a/modules/default.nix b/modules/default.nix
index abb7293..f3e912b 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -7,5 +7,10 @@
     ./misc
     ./gdm
     ./stylix
+    ./blue
+    ./services
+    ./syncthing
+    ./gpg
+    ./appimage
   ];
 }
diff --git a/modules/gpg/default.nix b/modules/gpg/default.nix
new file mode 100644
index 0000000..c8201ba
--- /dev/null
+++ b/modules/gpg/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  services.pcscd.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryPackage = pkgs.pinentry-curses;
+    enableSSHSupport = true;
+  };
+}
diff --git a/modules/misc/default.nix b/modules/misc/default.nix
index 763828a..a077680 100644
--- a/modules/misc/default.nix
+++ b/modules/misc/default.nix
@@ -1,63 +1,28 @@
 { inputs, pkgs, ... }:
 
 {
-  services.blueman.enable = true;
-  hardware.bluetooth.enable = true;
-  virtualisation.docker.rootless.enable = true;
-  virtualisation.docker.enable = true;
-  nixpkgs.config.allowUnfree = true;
-  programs.steam.enable = true;
-  services = {
-    syncthing = {
-        enable = true;
-        user = "joy";
-        dataDir = "/home/joy/";
-        configDir = "/home/joy/.config/syncthing";  
-    };
-  };
-
-services.pcscd.enable = true;
-programs.gnupg.agent = {
-   enable = true;
-   pinentryPackage = pkgs.pinentry-curses;
-   enableSSHSupport = true;
-};
-
-programs.hyprland.enable = true;
-  users.defaultUserShell = pkgs.zsh;
-  programs.zsh.enable = true; 
-    
-    home-manager = {
+  home-manager = {
     extraSpecialArgs = {inherit inputs;};
     users = {
       "joy" = import ./../../home;
     };
   };
-
   users.users.joy = {
     isNormalUser = true;
     description = "joy";
     extraGroups = [ "wheel" "docker" ];
-};  
+  };  
+ 
+  virtualisation.docker.rootless.enable = true;
+  virtualisation.docker.enable = true;
+  nixpkgs.config.allowUnfree = true;
+  programs.steam.enable = true;
+  programs.hyprland.enable = true;
+  users.defaultUserShell = pkgs.zsh;
+  programs.zsh.enable = true; 
   nix.settings.experimental-features = [ "nix-command" "flakes"];
-  
-  time.timeZone = "Europe/Zurich";
-
-  services.devmon.enable = true;
-  services.udisks2.enable = true;
-  services.gvfs.enable = true;
-
   programs.nix-ld.enable = true;
-
-  boot.binfmt.registrations.appimage = {
-    wrapInterpreterInShell = false;
-    interpreter = "${pkgs.appimage-run}/bin/appimage-run";
-    recognitionType = "magic";
-    offset = 0;
-    mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
-    magicOrExtension = ''\x7fELF....AI\x02'';
-  };
-
+  time.timeZone = "Europe/Zurich";
   system.stateVersion = "23.11";
  
 }
diff --git a/modules/services/default.nix b/modules/services/default.nix
new file mode 100644
index 0000000..c954632
--- /dev/null
+++ b/modules/services/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  services.devmon.enable = true;
+  services.udisks2.enable = true;
+  services.gvfs.enable = true;
+}
diff --git a/modules/syncthing/default.nix b/modules/syncthing/default.nix
new file mode 100644
index 0000000..1cc7d49
--- /dev/null
+++ b/modules/syncthing/default.nix
@@ -0,0 +1,12 @@
+{ ... }:
+
+{
+  services = {
+  syncthing = {
+    enable = true;
+    user = "joy";
+    dataDir = "/home/joy/";
+    configDir = "/home/joy/.config/syncthing";  
+    };
+  };
+}