diff --git a/system/default.nix b/system/default.nix
index eec726a..4a8f7b3 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -3,22 +3,19 @@
   imports = [
     ./accounts
     ./devices
+    ./modules
+    ./nix
     ./programs
     ./secrets
     ./services
-    ./settings
   ];
 
-  options.system = with lib; {
-    server.enable = mkEnableOption "Enable server apps and services";
+  networking = {
+    hostName = "rubble";
+    hostId = "e0b1fcef";
   };
 
-  config = {
-    networking = {
-      hostName = "rubble";
-      hostId = "e0b1fcef";
-    };
-    system.stateVersion = "24.11";
-    nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-  };
+  time.timeZone = "America/Toronto";
+  system.stateVersion = "24.11";
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
 }
diff --git a/system/settings/modules/default.nix b/system/modules/default.nix
similarity index 100%
rename from system/settings/modules/default.nix
rename to system/modules/default.nix
diff --git a/system/settings/nix/default.nix b/system/nix/default.nix
similarity index 100%
rename from system/settings/nix/default.nix
rename to system/nix/default.nix
diff --git a/system/services/server/default.nix b/system/services/server/default.nix
index ba01e56..4b92679 100644
--- a/system/services/server/default.nix
+++ b/system/services/server/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
 {
   imports = [
     ./cfdyndns
@@ -10,4 +10,8 @@
     ./vaultwarden
     ./webserver
   ];
+
+  options.system = with lib; {
+    server.enable = mkEnableOption "Enable server apps and services";
+  };
 }
diff --git a/system/settings/default.nix b/system/settings/default.nix
deleted file mode 100644
index d95aa9e..0000000
--- a/system/settings/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./modules
-    ./nix
-    ./timezone
-  ];
-}
diff --git a/system/settings/timezone/default.nix b/system/settings/timezone/default.nix
deleted file mode 100644
index f0b23fa..0000000
--- a/system/settings/timezone/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  time.timeZone = "America/Toronto";
-}