diff --git a/modules/nixos/server/automatic-garbage-collection.nix b/modules/nixos/basics/automatic-garbage-collection.nix
similarity index 100%
rename from modules/nixos/server/automatic-garbage-collection.nix
rename to modules/nixos/basics/automatic-garbage-collection.nix
diff --git a/modules/nixos/server/btrfs-scrub.nix b/modules/nixos/basics/btrfs-scrub.nix
similarity index 100%
rename from modules/nixos/server/btrfs-scrub.nix
rename to modules/nixos/basics/btrfs-scrub.nix
diff --git a/modules/nixos/basics/default.nix b/modules/nixos/basics/default.nix
index 30ea03b..383018d 100644
--- a/modules/nixos/basics/default.nix
+++ b/modules/nixos/basics/default.nix
@@ -1,9 +1,13 @@
 {
   imports = [
-    ./zerotier.nix
-    ./tailscale.nix
+    ./automatic-garbage-collection.nix
+    ./btrfs-scrub.nix
     ./distributed.nix
-    ./remote-deploy.nix
     ./extended-registry.nix
+    ./fstrim.nix
+    ./fwupd.nix
+    ./remote-deploy.nix
+    ./tailscale.nix
+    ./zerotier.nix
   ];
 }
diff --git a/modules/nixos/server/fstrim.nix b/modules/nixos/basics/fstrim.nix
similarity index 100%
rename from modules/nixos/server/fstrim.nix
rename to modules/nixos/basics/fstrim.nix
diff --git a/modules/nixos/server/fwupd.nix b/modules/nixos/basics/fwupd.nix
similarity index 100%
rename from modules/nixos/server/fwupd.nix
rename to modules/nixos/basics/fwupd.nix
diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix
index 19bc6ea..33fa8a3 100644
--- a/modules/nixos/server/default.nix
+++ b/modules/nixos/server/default.nix
@@ -1,9 +1,5 @@
 {
   imports = [
-    ./fwupd.nix
-    ./fstrim.nix
-    ./btrfs-scrub.nix
     ./automatic-upgrade.nix
-    ./automatic-garbage-collection.nix
   ];
 }