diff --git a/nixosConfigurations/hosts/mini-pc.nix b/nixosConfigurations/hosts/mini-pc.nix
index fc1ca82..bbb9e29 100755
--- a/nixosConfigurations/hosts/mini-pc.nix
+++ b/nixosConfigurations/hosts/mini-pc.nix
@@ -20,14 +20,10 @@ let
         ./hardware/mini-pc.nix
         ./hardware/logitech.nix
         self.nixosModules.default
-        self.homeConfigurations.default.nixosModule
 
-        sops-nix.nixosModules.sops
-        self.nixosModules.server.open-webui
-        self.nixosModules.software.wine
-        self.nixosModules.software.beets
+#         self.nixosModules.software.wine
+#         self.nixosModules.software.beets
         #self.nixosModules.extra.self.fingerprint
-        self.nixosModules.desktop
         # self.homeConfigurations.main.nixosModule
         # self.homeConfigurations.root.nixosModule
       ];
diff --git a/nixosModules/base.nix b/nixosModules/base.nix
index b6490aa..c961974 100755
--- a/nixosModules/base.nix
+++ b/nixosModules/base.nix
@@ -16,6 +16,9 @@
 
     home-manager.nixosModules.home-manager # home-manager module
     nix-index-database.nixosModules.nix-index # nix-index module
+    grub2-themes.nixosModules.default # grub2 themes module
+    sops-nix.nixosModules.sops
+    self.homeConfigurations.default.nixosModule
   ];
   _module.args = {
     inputs = inputs;
diff --git a/nixosModules/primary/desktop/default.nix b/nixosModules/desktop/default.nix
similarity index 95%
rename from nixosModules/primary/desktop/default.nix
rename to nixosModules/desktop/default.nix
index a3300d0..c2e7ea1 100755
--- a/nixosModules/primary/desktop/default.nix
+++ b/nixosModules/desktop/default.nix
@@ -2,14 +2,12 @@
   config,
   lib,
   pkgs,
-  inputs,
   ...
 }:
 {
   imports = [
     ./environment
     ./theming.nix
-    inputs.grub2-themes.nixosModules.default # grub2 themes module
   ];
 
   boot = {
diff --git a/nixosModules/primary/desktop/environment/bspwm.nix b/nixosModules/desktop/environment/bspwm.nix
similarity index 100%
rename from nixosModules/primary/desktop/environment/bspwm.nix
rename to nixosModules/desktop/environment/bspwm.nix
diff --git a/nixosModules/primary/desktop/environment/deepin.nix b/nixosModules/desktop/environment/deepin.nix
similarity index 100%
rename from nixosModules/primary/desktop/environment/deepin.nix
rename to nixosModules/desktop/environment/deepin.nix
diff --git a/nixosModules/primary/desktop/environment/default.nix b/nixosModules/desktop/environment/default.nix
similarity index 100%
rename from nixosModules/primary/desktop/environment/default.nix
rename to nixosModules/desktop/environment/default.nix
diff --git a/nixosModules/primary/desktop/environment/gnome.nix b/nixosModules/desktop/environment/gnome.nix
similarity index 100%
rename from nixosModules/primary/desktop/environment/gnome.nix
rename to nixosModules/desktop/environment/gnome.nix
diff --git a/nixosModules/primary/desktop/environment/kde.nix b/nixosModules/desktop/environment/kde.nix
similarity index 100%
rename from nixosModules/primary/desktop/environment/kde.nix
rename to nixosModules/desktop/environment/kde.nix
diff --git a/nixosModules/primary/desktop/environment/xfce.nix b/nixosModules/desktop/environment/xfce.nix
similarity index 100%
rename from nixosModules/primary/desktop/environment/xfce.nix
rename to nixosModules/desktop/environment/xfce.nix
diff --git a/nixosModules/primary/desktop/theming.nix b/nixosModules/desktop/theming.nix
similarity index 100%
rename from nixosModules/primary/desktop/theming.nix
rename to nixosModules/desktop/theming.nix
diff --git a/nixosModules/primary/default.nix b/nixosModules/primary/default.nix
index e9f86dc..e343ffa 100755
--- a/nixosModules/primary/default.nix
+++ b/nixosModules/primary/default.nix
@@ -1,10 +1,9 @@
 {
-  config,
   lib,
   ...
 }:
 {
   imports = [
-    ./desktop
+    ../desktop
   ];
 }