diff --git a/modules/system/backups.nix b/modules/system/backups/default.nix
similarity index 100%
rename from modules/system/backups.nix
rename to modules/system/backups/default.nix
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 3024584..c5f77f4 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -1,32 +1,29 @@
-{ pkgs, config, lib, ... }:
-
 {
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
   imports = [
-    ./ssh.nix
-    ./backups.nix
-    ./sops.nix
-    ./docker.nix
-    ./podman.nix
-    ./tailscale.nix
-    ./vpns.nix
-    ./vpn-confinement.nix
-    ./syncthing.nix
-    ./nvidia.nix
+    ./ssh
+    ./backups
+    ./sops
+    ./docker
+    ./podman
+    ./tailscale
+    ./vpns
+    ./vpn-confinement
+    ./syncthing
+    ./nvidia
   ];
 
-  modules.system.ssh.enable = lib.mkDefault true;
-  modules.system.backups.enable = lib.mkDefault true;
-  modules.system.sops.enable = lib.mkDefault true;
-  modules.system.docker.enable = lib.mkDefault false;
-  modules.system.tailscale.enable = lib.mkDefault true;
-  modules.system.vpns.enable = lib.mkDefault false;
-  modules.system.vpn-confinement.enable = lib.mkDefault false;
-  modules.system.syncthing.enable = lib.mkDefault false;
-  modules.system.nvidia.enable = lib.mkDefault false;
-
-
-
-#  modules.system.backups.baks = {
-#    ${service} = { paths = [ cfg.data_dir ]; };
-#  };
+  system.ssh.enable = lib.mkDefault true;
+  system.backups.enable = lib.mkDefault true;
+  system.sops.enable = lib.mkDefault true;
+  system.docker.enable = lib.mkDefault false;
+  system.tailscale.enable = lib.mkDefault true;
+  system.vpns.enable = lib.mkDefault false;
+  system.vpn-confinement.enable = lib.mkDefault false;
+  system.syncthing.enable = lib.mkDefault false;
+  system.nvidia.enable = lib.mkDefault false;
 }
diff --git a/modules/system/docker.nix b/modules/system/docker/default.nix
similarity index 100%
rename from modules/system/docker.nix
rename to modules/system/docker/default.nix
diff --git a/modules/system/home-manager.nix b/modules/system/home-manager/default.nix
similarity index 100%
rename from modules/system/home-manager.nix
rename to modules/system/home-manager/default.nix
diff --git a/modules/system/nvidia.nix b/modules/system/nvidia/default.nix
similarity index 100%
rename from modules/system/nvidia.nix
rename to modules/system/nvidia/default.nix
diff --git a/modules/system/podman.nix b/modules/system/podman/default.nix
similarity index 100%
rename from modules/system/podman.nix
rename to modules/system/podman/default.nix
diff --git a/modules/system/sops.nix b/modules/system/sops/default.nix
similarity index 100%
rename from modules/system/sops.nix
rename to modules/system/sops/default.nix
diff --git a/modules/system/ssh.nix b/modules/system/ssh/default.nix
similarity index 100%
rename from modules/system/ssh.nix
rename to modules/system/ssh/default.nix
diff --git a/modules/system/syncthing.nix b/modules/system/syncthing/default.nix
similarity index 77%
rename from modules/system/syncthing.nix
rename to modules/system/syncthing/default.nix
index 9f4a1fe..d1f29ee 100644
--- a/modules/system/syncthing.nix
+++ b/modules/system/syncthing/default.nix
@@ -6,11 +6,9 @@ in
 {
   options.system.syncthing = {
     enable = lib.mkEnableOption "enables syncthing";
+  };
 
   config = lib.mkIf cfg.enable {
-    
-#    systemd.tmpfiles.rules = lib.optionals (cfg.mode == "server") ["d /var/lib/syncthing 0775 blake blake -"];
-
     services.syncthing = {
       enable = true;
 #      user = "blake";
diff --git a/modules/system/tailscale.nix b/modules/system/tailscale/default.nix
similarity index 100%
rename from modules/system/tailscale.nix
rename to modules/system/tailscale/default.nix
diff --git a/modules/system/vpn-confinement.nix b/modules/system/vpn-confinement/default.nix
similarity index 100%
rename from modules/system/vpn-confinement.nix
rename to modules/system/vpn-confinement/default.nix
diff --git a/modules/system/vpns.nix b/modules/system/vpns/default.nix
similarity index 100%
rename from modules/system/vpns.nix
rename to modules/system/vpns/default.nix