diff --git a/hosts/nixos/modules/programs.nix b/hosts/nixos/modules/programs.nix
deleted file mode 100644
index c000696..0000000
--- a/hosts/nixos/modules/programs.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  programs.zsh.enable = true;
-  programs.hyprland = {
-    enable = true;
-    withUWSM = true;
-    xwayland.enable = true;
-  };
-  programs.thunar = {
-    enable = true;
-    plugins = with pkgs.xfce; [
-      thunar-volman
-    ];
-  };
-  programs.xfconf.enable = true;
-  programs.ssh.startAgent = true;
-  programs.ydotool.enable = true;
-  programs.steam.enable = true;
-}
diff --git a/hosts/nixos/modules/programs/default.nix b/hosts/nixos/modules/programs/default.nix
new file mode 100644
index 0000000..d25ffef
--- /dev/null
+++ b/hosts/nixos/modules/programs/default.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./zsh.nix
+    ./hyprland.nix
+    ./thunar.nix
+    ./xfconf.nix
+    ./ssh.nix
+    ./ydotool.nix
+    ./steam.nix
+  ];
+}
diff --git a/hosts/nixos/modules/programs/hyprland.nix b/hosts/nixos/modules/programs/hyprland.nix
new file mode 100644
index 0000000..149751b
--- /dev/null
+++ b/hosts/nixos/modules/programs/hyprland.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+    xwayland.enable = true;
+  };
+}
diff --git a/hosts/nixos/modules/programs/ssh.nix b/hosts/nixos/modules/programs/ssh.nix
new file mode 100644
index 0000000..6baa3ed
--- /dev/null
+++ b/hosts/nixos/modules/programs/ssh.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.ssh.startAgent = true;
+}
diff --git a/hosts/nixos/modules/programs/steam.nix b/hosts/nixos/modules/programs/steam.nix
new file mode 100644
index 0000000..781e12e
--- /dev/null
+++ b/hosts/nixos/modules/programs/steam.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.steam.enable = true;
+}
diff --git a/hosts/nixos/modules/programs/thunar.nix b/hosts/nixos/modules/programs/thunar.nix
new file mode 100644
index 0000000..0cdb885
--- /dev/null
+++ b/hosts/nixos/modules/programs/thunar.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+  programs.thunar = {
+    enable = true;
+    plugins = with pkgs.xfce; [
+      thunar-volman
+    ];
+  };
+  services.gvfs.enable = true; # Mount, trash, and other functionalities
+  services.tumbler.enable = true; # Thumbnail support for images 
+}
diff --git a/hosts/nixos/modules/programs/xfconf.nix b/hosts/nixos/modules/programs/xfconf.nix
new file mode 100644
index 0000000..e529aa8
--- /dev/null
+++ b/hosts/nixos/modules/programs/xfconf.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.xfconf.enable = true;
+}
diff --git a/hosts/nixos/modules/programs/ydotool.nix b/hosts/nixos/modules/programs/ydotool.nix
new file mode 100644
index 0000000..2731a67
--- /dev/null
+++ b/hosts/nixos/modules/programs/ydotool.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.ydotool.enable = true;
+}
diff --git a/hosts/nixos/modules/programs/zsh.nix b/hosts/nixos/modules/programs/zsh.nix
new file mode 100644
index 0000000..9ac7948
--- /dev/null
+++ b/hosts/nixos/modules/programs/zsh.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, ... }:
+
+{
+  programs.zsh.enable = true;
+}
diff --git a/hosts/nixos/modules/services.nix b/hosts/nixos/modules/services.nix
deleted file mode 100644
index ea1ebc1..0000000
--- a/hosts/nixos/modules/services.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  services.xserver = {
-    xkb.layout = "us";
-    videoDrivers = [ "nvidia" ];
-  };
-
-  services.gvfs.enable = true; # Mount, trash, and other functionalities
-  services.tumbler.enable = true; # Thumbnail support for images 
-
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session";
-       user = "greeter";
-      }; 
-    };
-  };
-  services.tailscale = {
-    enable = true;
-    authKeyFile = config.sops.secrets."tailscale/authkey".path;
-  };
-  services.flatpak = {
-    enable = true;
-    packages = [
-      "org.prismlauncher.PrismLauncher"
-      "org.vinegarhq.Sober"
-      "org.vinegarhq.Vinegar"
-      "com.spotify.Client"
-    ];
-    overrides = {
-      "org.prismlauncher.PrismLauncher".Context = {
-        filesystems = [
-          "home"
-        ];
-      };
-      "org.vinegarhq.Sober".Context = {
-        filesystems = [
-          "xdg-run/app/com.discordapp.Discord:create"
-          "xdg-run/discord-ipc-0"
-        ];
-      };
-    };
-  };
-}
diff --git a/hosts/nixos/modules/services/default.nix b/hosts/nixos/modules/services/default.nix
new file mode 100644
index 0000000..a293f2c
--- /dev/null
+++ b/hosts/nixos/modules/services/default.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./xserver.nix
+    ./greetd.nix
+    ./tailscale.nix
+    ./flatpak.nix
+  ];
+}
diff --git a/hosts/nixos/modules/services/flatpak.nix b/hosts/nixos/modules/services/flatpak.nix
new file mode 100644
index 0000000..e7f358f
--- /dev/null
+++ b/hosts/nixos/modules/services/flatpak.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, ... }:
+
+{
+  services.flatpak = {
+    enable = true;
+    packages = [
+      "org.prismlauncher.PrismLauncher"
+      "org.vinegarhq.Sober"
+      "org.vinegarhq.Vinegar"
+      "com.spotify.Client"
+    ];
+    overrides = {
+      "org.prismlauncher.PrismLauncher".Context = {
+        filesystems = [
+          "home"
+        ];
+      };
+      "org.vinegarhq.Sober".Context = {
+        filesystems = [
+          "xdg-run/app/com.discordapp.Discord:create"
+          "xdg-run/discord-ipc-0"
+        ];
+      };
+    };
+  };
+}
diff --git a/hosts/nixos/modules/services/greetd.nix b/hosts/nixos/modules/services/greetd.nix
new file mode 100644
index 0000000..795f7ef
--- /dev/null
+++ b/hosts/nixos/modules/services/greetd.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+{
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session";
+       user = "greeter";
+      }; 
+    };
+  };
+}
diff --git a/hosts/nixos/modules/services/tailscale.nix b/hosts/nixos/modules/services/tailscale.nix
new file mode 100644
index 0000000..a8e243a
--- /dev/null
+++ b/hosts/nixos/modules/services/tailscale.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  sops.secrets."tailscale/authkey" = { };
+
+  services.tailscale = {
+    enable = true;
+    authKeyFile = config.sops.secrets."tailscale/authkey".path;
+  };
+}
diff --git a/hosts/nixos/modules/services/xserver.nix b/hosts/nixos/modules/services/xserver.nix
new file mode 100644
index 0000000..29c43f6
--- /dev/null
+++ b/hosts/nixos/modules/services/xserver.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+  services.xserver = {
+    xkb.layout = "us";
+    videoDrivers = [ "nvidia" ];
+  };
+}
diff --git a/hosts/nixos/modules/sops.nix b/hosts/nixos/modules/sops.nix
index 7b1a78d..b125b37 100644
--- a/hosts/nixos/modules/sops.nix
+++ b/hosts/nixos/modules/sops.nix
@@ -5,6 +5,4 @@
   sops.defaultSopsFormat = "yaml";
 
   sops.age.keyFile = "/home/toast/.config/sops/age/keys.txt";
-
-  sops.secrets."tailscale/authkey" = { };
 }