diff --git a/modules/default.nix b/modules/default.nix
index 7f5d435..328d40d 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -4,13 +4,11 @@
     ./desktop
     ./networking
     ./services
+    ./systems
+    ./utils
     ./virtualisation
 
     # Files
     ./btrfs-autoscrub.nix
-    ./commons.nix
-    ./main-user.nix
-    ./audio.nix
-
   ];
 }
diff --git a/modules/audio.nix b/modules/desktop/audio.nix
similarity index 100%
rename from modules/audio.nix
rename to modules/desktop/audio.nix
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 0db6e34..9522c2c 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -1,5 +1,8 @@
 {
   imports = [
+    ./audio.nix
+    ./desktop-user.nix
+    ./esphome.nix
     ./gnome.nix
     ./plymouth.nix
     ./steam.nix
diff --git a/modules/main-user.nix b/modules/desktop/desktop-user.nix
similarity index 90%
rename from modules/main-user.nix
rename to modules/desktop/desktop-user.nix
index c6132a2..e784d4e 100644
--- a/modules/main-user.nix
+++ b/modules/desktop/desktop-user.nix
@@ -5,11 +5,11 @@
   ...
 }:
 let
-  cfg = config.mainUser;
+  cfg = config.desktopUser;
 in
 {
-  options.mainUser = {
-    enable = lib.mkEnableOption "Enable user module";
+  options.desktopUser = {
+    enable = lib.mkEnableOption "Enable desktop user module";
 
     userName = lib.mkOption {
       default = "pazpi";
@@ -56,7 +56,6 @@ in
         with pkgs;
         lib.mkIf cfg.flatpak [
           flatpak
-          gnome.gnome-software
         ];
     };
 
diff --git a/modules/esphome.nix b/modules/desktop/esphome.nix
similarity index 100%
rename from modules/esphome.nix
rename to modules/desktop/esphome.nix
diff --git a/modules/btrfs-autoscrub.nix b/modules/systems/btrfs-autoscrub.nix
similarity index 100%
rename from modules/btrfs-autoscrub.nix
rename to modules/systems/btrfs-autoscrub.nix
diff --git a/modules/systems/default.nix b/modules/systems/default.nix
new file mode 100644
index 0000000..e1ef8b6
--- /dev/null
+++ b/modules/systems/default.nix
@@ -0,0 +1,5 @@
+{
+    imports = [
+        ./btrfs-autoscrub.nix
+    ]
+}
\ No newline at end of file
diff --git a/modules/commons.nix b/modules/utils/commons.nix
similarity index 100%
rename from modules/commons.nix
rename to modules/utils/commons.nix
diff --git a/modules/utils/default.nix b/modules/utils/default.nix
new file mode 100644
index 0000000..cc507b8
--- /dev/null
+++ b/modules/utils/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./commons.nix
+  ];
+}