diff --git a/modules/system/default.nix b/modules/system/default.nix
index 761ac75..142b407 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -7,8 +7,8 @@
     ./audio.nix
     ./fonts.nix
     ./docker.nix
-    ../gnome
-    ../niri
+    ./gnome
+    ./niri
   ];
 
   # Allow packages from nixpkgs
@@ -18,12 +18,12 @@
 
   #Optimise nix store
   nix = {
-    optimise.automatic = true;
     gc = {
       automatic = true;
       dates = "weekly";
-      options = "--delete-older-than 30d";
+      options = "--delete-older-than 7d";
     };
+    settings.auto-optimise-store = true;
   };
 
   # Enable nix flakes
diff --git a/modules/gnome/default.nix b/modules/system/gnome/default.nix
similarity index 100%
rename from modules/gnome/default.nix
rename to modules/system/gnome/default.nix
diff --git a/modules/niri/default.nix b/modules/system/niri/default.nix
similarity index 100%
rename from modules/niri/default.nix
rename to modules/system/niri/default.nix