diff --git a/nixosModules/services/system/default.nix b/nixosModules/automatic/default.nix
similarity index 100%
rename from nixosModules/services/system/default.nix
rename to nixosModules/automatic/default.nix
diff --git a/nixosModules/default.nix b/nixosModules/default.nix
index a1d9d7b..b70e50c 100644
--- a/nixosModules/default.nix
+++ b/nixosModules/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./apps
+    ./automatic
     ./services
   ];
 }
diff --git a/nixosModules/services/networking/bluetooth/default.nix b/nixosModules/services/bluetooth/service.nix
similarity index 75%
rename from nixosModules/services/networking/bluetooth/default.nix
rename to nixosModules/services/bluetooth/service.nix
index 30bed32..646f741 100644
--- a/nixosModules/services/networking/bluetooth/default.nix
+++ b/nixosModules/services/bluetooth/service.nix
@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = {
-    bluetooth.enable = lib.mkEnableOption "Enables Bluetooth with blueman";
+  options.bluetooth = {
+    enable = lib.mkEnableOption "Enables Bluetooth with blueman";
   };
 
   config = lib.mkIf config.bluetooth.enable {
diff --git a/nixosModules/services/default.nix b/nixosModules/services/default.nix
index 128d32b..5718b40 100644
--- a/nixosModules/services/default.nix
+++ b/nixosModules/services/default.nix
@@ -1,12 +1,6 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./graphics
-    ./networking
-    ./pipewire
-    ./polkit
-    ./sops-nix
-    ./system
-  ];
+{ lib, ... }: let
+  fs = lib.fileset;
+  appFilter = {name, ...}: name == "service.nix";
+in {
+  imports = fs.toList (fs.fileFilter appFilter ./.);
 }
diff --git a/nixosModules/services/graphics/display_manager/default.nix b/nixosModules/services/displaymanager/service.nix
similarity index 83%
rename from nixosModules/services/graphics/display_manager/default.nix
rename to nixosModules/services/displaymanager/service.nix
index 3e4dab2..1110828 100644
--- a/nixosModules/services/graphics/display_manager/default.nix
+++ b/nixosModules/services/displaymanager/service.nix
@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = {
-    tuigreet.enable = lib.mkEnableOption "enables tuigreet with greetd";
+  options.tuigreet = {
+    enable = lib.mkEnableOption "enables tuigreet with greetd";
   };
 
   config = lib.mkIf config.tuigreet.enable {
diff --git a/nixosModules/services/graphics/default.nix b/nixosModules/services/graphics/default.nix
deleted file mode 100644
index ec5ce31..0000000
--- a/nixosModules/services/graphics/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./display_manager
-    ./nvidia
-    ./wayland_compositors
-    ./tabletdrivers
-  ];
-}
diff --git a/nixosModules/services/networking/default.nix b/nixosModules/services/networking/default.nix
deleted file mode 100644
index 0da82d9..0000000
--- a/nixosModules/services/networking/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./bluetooth
-    ./wireless
-  ];
-}
diff --git a/nixosModules/services/graphics/nvidia/default.nix b/nixosModules/services/nvidia/service.nix
similarity index 91%
rename from nixosModules/services/graphics/nvidia/default.nix
rename to nixosModules/services/nvidia/service.nix
index de39b58..2cac182 100644
--- a/nixosModules/services/graphics/nvidia/default.nix
+++ b/nixosModules/services/nvidia/service.nix
@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = {
-    nvidia.enable = lib.mkEnableOption
+  options.nvidia = {
+    enable = lib.mkEnableOption
       "Enables nvidia with proprietary drivers";
   };
 
diff --git a/nixosModules/services/pipewire/default.nix b/nixosModules/services/pipewire/service.nix
similarity index 80%
rename from nixosModules/services/pipewire/default.nix
rename to nixosModules/services/pipewire/service.nix
index 20387b6..1129a34 100644
--- a/nixosModules/services/pipewire/default.nix
+++ b/nixosModules/services/pipewire/service.nix
@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = {
-    pipewire.enable = lib.mkEnableOption "Enables pipewire and pulsemixer";
+  options.pipewire = {
+    enable = lib.mkEnableOption "Enables pipewire and pulsemixer";
   };
 
   config = lib.mkIf config.pipewire.enable {
diff --git a/nixosModules/services/polkit/default.nix b/nixosModules/services/polkit/service.nix
similarity index 69%
rename from nixosModules/services/polkit/default.nix
rename to nixosModules/services/polkit/service.nix
index 07f03f8..36c77a5 100644
--- a/nixosModules/services/polkit/default.nix
+++ b/nixosModules/services/polkit/service.nix
@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = {
-    polkit.enable = lib.mkEnableOption "Enables polkit with kde handler";
+  options.polkit = {
+    enable = lib.mkEnableOption "Enables polkit with kde handler";
   };
 
   config = lib.mkIf config.polkit.enable {
diff --git a/nixosModules/services/sops-nix/default.nix b/nixosModules/services/sops-nix/service.nix
similarity index 100%
rename from nixosModules/services/sops-nix/default.nix
rename to nixosModules/services/sops-nix/service.nix
diff --git a/nixosModules/services/graphics/tabletdrivers/default.nix b/nixosModules/services/tabletdrivers/service.nix
similarity index 81%
rename from nixosModules/services/graphics/tabletdrivers/default.nix
rename to nixosModules/services/tabletdrivers/service.nix
index 6afecf7..f1020bd 100644
--- a/nixosModules/services/graphics/tabletdrivers/default.nix
+++ b/nixosModules/services/tabletdrivers/service.nix
@@ -1,8 +1,8 @@
 { config, pkgs, lib, ... }:
 
 {
-  options = {
-    tablet.enable = lib.mkEnableOption
+  options.tablet = {
+    enable = lib.mkEnableOption
       "Enables tablet support";
   };
 
diff --git a/nixosModules/services/graphics/wayland_compositors/default.nix b/nixosModules/services/waylandcompositors/service.nix
similarity index 57%
rename from nixosModules/services/graphics/wayland_compositors/default.nix
rename to nixosModules/services/waylandcompositors/service.nix
index 977ebb2..779a8fe 100644
--- a/nixosModules/services/graphics/wayland_compositors/default.nix
+++ b/nixosModules/services/waylandcompositors/service.nix
@@ -1,9 +1,9 @@
-{ inputs, config, pkgs, lib, ... }:
+{ inputs, config, lib, ... }:
 
 {
 
-  options = {
-    hyprland.enable = lib.mkEnableOption "Enables hyprland";
+  options.hyprland = {
+    enable = lib.mkEnableOption "Enables hyprland";
   };
 
   imports = [
@@ -13,7 +13,9 @@
   config = {
     nix.settings = {
       substituters = [ "https://hyprland.cachix.org" ];
-      trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ];
+      trusted-public-keys = [ 
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" 
+      ];
       experimental-features = [ "nix-command" "flakes" ];
     };
     programs.hyprland.enable = lib.mkIf config.hyprland.enable true;
diff --git a/nixosModules/services/networking/wireless/default.nix b/nixosModules/services/wireless/service.nix
similarity index 70%
rename from nixosModules/services/networking/wireless/default.nix
rename to nixosModules/services/wireless/service.nix
index a916a71..bf941c0 100644
--- a/nixosModules/services/networking/wireless/default.nix
+++ b/nixosModules/services/wireless/service.nix
@@ -1,12 +1,10 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, ... }:
 
 {
-  options = {
-    wireless = {
-      enable = lib.mkEnableOption "Enables wireless";
-      networks = lib.mkOption { default = {}; };
-      secretsFile = lib.mkOption {};
-    };
+  options.wireless = {
+    enable = lib.mkEnableOption "Enables wireless";
+    networks = lib.mkOption { default = {}; };
+    secretsFile = lib.mkOption {};
   };
 
   config = lib.mkIf config.wireless.enable {