diff --git a/options/common/default.nix b/options/default.nix
similarity index 56%
rename from options/common/default.nix
rename to options/default.nix
index b473cd7..b57105b 100644
--- a/options/common/default.nix
+++ b/options/default.nix
@@ -1,8 +1,11 @@
-{ lib, ... }:
+{ ... }:
 {
   imports = [
     ./programs.nix
     ./file.nix
+    ./environment.nix
+    ./programs.nix
+    ./hardware.nix
   ];
 
   options.device = {
@@ -12,5 +15,11 @@
       default = "desktop";
       description = "Flake name for quick rebuild";
     };
+
+    cursors = lib.mkOption {
+      type = lib.types.str;
+      default = "aemeath";
+      description = "Cursor theme to use for the desktop";
+    };
   };
 }
diff --git a/options/desktop/default.nix b/options/desktop/default.nix
deleted file mode 100644
index 9bd723d..0000000
--- a/options/desktop/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, ... }:
-{
-  imports = [
-    ../common/default.nix
-
-    ./environment.nix
-    ./programs.nix
-    ./hardware.nix
-  ];
-
-  options.device = {
-    cursors = lib.mkOption {
-      type = lib.types.str;
-      default = "aemeath";
-      description = "Cursor theme to use for the desktop";
-    };
-  };
-}
diff --git a/options/desktop/programs.nix b/options/desktop/programs.nix
deleted file mode 100644
index a2581fb..0000000
--- a/options/desktop/programs.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, ... }: {
-    options.device.programs = {
-        terminal = lib.mkOption {
-            type = lib.types.str;
-            default = "ghostty";
-            description = "Terminal";
-        };
-
-        nixcord.enable = lib.mkEnableOption "nixcord";
-        tmux.enable = lib.mkEnableOption "tmux";
-        starship.enable = lib.mkEnableOption "starship";
-        fastfetch.enable = lib.mkEnableOption "fastfetch";
-        steam.enable = lib.mkEnableOption "steam";
-        
-        obs-studio.enable = lib.mkEnableOption "Obs Studio";
-        cider-2.enable = lib.mkEnableOption "Cider 2";
-    };
-}
\ No newline at end of file
diff --git a/options/desktop/environment.nix b/options/environment.nix
similarity index 100%
rename from options/desktop/environment.nix
rename to options/environment.nix
diff --git a/options/common/file.nix b/options/file.nix
similarity index 100%
rename from options/common/file.nix
rename to options/file.nix
diff --git a/options/desktop/hardware.nix b/options/hardware.nix
similarity index 100%
rename from options/desktop/hardware.nix
rename to options/hardware.nix
diff --git a/options/common/programs.nix b/options/programs.nix
similarity index 86%
rename from options/common/programs.nix
rename to options/programs.nix
index 46e1afa..eea99d3 100644
--- a/options/common/programs.nix
+++ b/options/programs.nix
@@ -1,5 +1,22 @@
 { lib, pkgs, ... }:
 {
+  options.device.programs = {
+    terminal = lib.mkOption {
+      type = lib.types.str;
+      default = "ghostty";
+      description = "Terminal";
+    };
+
+    nixcord.enable = lib.mkEnableOption "nixcord";
+    tmux.enable = lib.mkEnableOption "tmux";
+    starship.enable = lib.mkEnableOption "starship";
+    fastfetch.enable = lib.mkEnableOption "fastfetch";
+    steam.enable = lib.mkEnableOption "steam";
+
+    obs-studio.enable = lib.mkEnableOption "Obs Studio";
+    cider-2.enable = lib.mkEnableOption "Cider 2";
+  };
+
   options.programs = {
     wget = {
       enable = lib.mkEnableOption "wget";
diff --git a/options/server/default.nix b/options/server/default.nix
deleted file mode 100644
index 95fbfff..0000000
--- a/options/server/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-{
-  imports = [ ../common/default.nix ];
-  options.device = { };
-}