diff --git a/hosts/nixos-test/default.nix b/hosts/nixos-test/default.nix
index 66cd68b..40ca3c9 100644
--- a/hosts/nixos-test/default.nix
+++ b/hosts/nixos-test/default.nix
@@ -47,6 +47,15 @@
 
     # };
 
+    desktop = {
+      plasma.enable = true;
+    };
+
+    server = {
+      docker.enable = true;
+      openssh.enable = true;
+    };
+
     system = {
       bluetooth.enable = true;
       gamingKernel.enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index 855575f..5e136d4 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -3,8 +3,8 @@
 {
   imports = [
     # ./cli
-    # ./desktop
-    # ./server
+    ./desktop
+    ./server
     ./system
   ];
 }
\ No newline at end of file
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index ff5a81f..648d9d9 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./gnome
-    ./hyprland
+    # ./hyprland
     ./plasma
   ];
 }
\ No newline at end of file
diff --git a/modules/desktop/plasma/default.nix b/modules/desktop/plasma/default.nix
index 4f48b4c..295659e 100644
--- a/modules/desktop/plasma/default.nix
+++ b/modules/desktop/plasma/default.nix
@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.system.plasma;
+  cfg = config.modules.desktop.plasma;
 in
 {
-  options.modules.system.plasma = {
+  options.modules.desktop.plasma = {
     enable = mkEnableOption ''
       Enable plasma with my custom configurations
     '';
@@ -36,7 +36,7 @@ in
 
     # Uncomment when kwin is available in nixpkgs and NVIDIA 555
     nixpkgs.overlays = [
-      (import ../overlays/kwin)
+      (import ../../../overlays/kwin)
     ];
   };
 }
\ No newline at end of file
diff --git a/modules/home/chromium/default.nix b/modules/home/apps/chromium/default.nix
similarity index 100%
rename from modules/home/chromium/default.nix
rename to modules/home/apps/chromium/default.nix
diff --git a/modules/home/flatpak/default.nix b/modules/home/apps/flatpak/default.nix
similarity index 100%
rename from modules/home/flatpak/default.nix
rename to modules/home/apps/flatpak/default.nix
diff --git a/modules/home/jetbrainsToolbox/default.nix b/modules/home/apps/jetbrainsToolbox/default.nix
similarity index 100%
rename from modules/home/jetbrainsToolbox/default.nix
rename to modules/home/apps/jetbrainsToolbox/default.nix
diff --git a/modules/home/kitty/default.nix b/modules/home/apps/kitty/default.nix
similarity index 100%
rename from modules/home/kitty/default.nix
rename to modules/home/apps/kitty/default.nix
diff --git a/modules/home/vscode/default.nix b/modules/home/apps/vscode/default.nix
similarity index 100%
rename from modules/home/vscode/default.nix
rename to modules/home/apps/vscode/default.nix
diff --git a/modules/cli/atuin/default.nix b/modules/home/cli/atuin/default.nix
similarity index 100%
rename from modules/cli/atuin/default.nix
rename to modules/home/cli/atuin/default.nix
diff --git a/modules/cli/default.nix b/modules/home/cli/default.nix
similarity index 100%
rename from modules/cli/default.nix
rename to modules/home/cli/default.nix
diff --git a/modules/cli/direnv/default.nix b/modules/home/cli/direnv/default.nix
similarity index 100%
rename from modules/cli/direnv/default.nix
rename to modules/home/cli/direnv/default.nix
diff --git a/modules/cli/git/default.nix b/modules/home/cli/git/default.nix
similarity index 100%
rename from modules/cli/git/default.nix
rename to modules/home/cli/git/default.nix
diff --git a/modules/cli/zsh/default.nix b/modules/home/cli/zsh/default.nix
similarity index 100%
rename from modules/cli/zsh/default.nix
rename to modules/home/cli/zsh/default.nix
diff --git a/modules/cli/zsh/p10k.zsh b/modules/home/cli/zsh/p10k.zsh
similarity index 100%
rename from modules/cli/zsh/p10k.zsh
rename to modules/home/cli/zsh/p10k.zsh
diff --git a/modules/home/default.nix b/modules/home/default.nix
index ff42f42..ef55d72 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -2,10 +2,5 @@
 
 {
   imports = [
-    ./chromium
-    ./flatpak
-    ./jetbrainsToolbox
-    ./kitty
-    ./vscode
   ];
 }
\ No newline at end of file