diff --git a/flake.nix b/flake.nix
index 2c4247b..8c83c52 100755
--- a/flake.nix
+++ b/flake.nix
@@ -70,10 +70,8 @@
               ++ [
                 ./hosts/nixos/overlays.nix
                 home-manager.nixosModules.home-manager
-                (import-tree ./hosts/common)
 
-                (import-tree ./modules/home/common)
-                (import-tree ./modules/home/nixos)
+                (import-tree ./hosts/common)
                 (import-tree ./hosts/nixos/home/users)
               ];
             };
diff --git a/hosts/common/nix.nix b/hosts/common/nix.nix
index 19b8aba..7a7c781 100644
--- a/hosts/common/nix.nix
+++ b/hosts/common/nix.nix
@@ -1,7 +1,5 @@
 { ... }:
 {
-  system.primaryUser = "alistreaza";
-
   nix = {
     settings = {
       experimental-features = "nix-command flakes";
diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/alistreaza.nix
index 1596521..ec5a0cb 100644
--- a/hosts/darwin/home/alistreaza.nix
+++ b/hosts/darwin/home/alistreaza.nix
@@ -11,11 +11,11 @@
     };
 
     # Shell apps
-    user.shell.zsh.enable = true;
-    user.shell.git.enable = true;
-    user.shell.neovim.enable = true;
-    user.shell.nh.enable = true;
-    user.shell.devenv.enable = true;
+    home.shell.zsh.enable = true;
+    home.shell.git.enable = true;
+    home.shell.neovim.enable = true;
+    home.shell.nh.enable = true;
+    home.shell.devenv.enable = true;
 
     # No Home Application Folders
     targets.darwin.linkApps.enable = false;
diff --git a/hosts/darwin/system/os.nix b/hosts/darwin/system/os.nix
index 1fb0688..765ac8b 100644
--- a/hosts/darwin/system/os.nix
+++ b/hosts/darwin/system/os.nix
@@ -1,5 +1,6 @@
 { ... }:
 {
+  system.primaryUser = "alistreaza";
   nixpkgs.hostPlatform = "aarch64-darwin";
 
   # Homebrew apps
diff --git a/hosts/nixos/home/users/alistreaza.nix b/hosts/nixos/home/users/alistreaza.nix
index fb23ff7..b91190a 100644
--- a/hosts/nixos/home/users/alistreaza.nix
+++ b/hosts/nixos/home/users/alistreaza.nix
@@ -2,8 +2,8 @@
 {
   home-manager.users.alistreaza = {
     imports = [
-      (import-tree ../../../modules/home/common)
-      (import-tree ../../../modules/home/nixos)
+      (import-tree ../../../../modules/home/common)
+      (import-tree ../../../../modules/home/nixos)
       (import-tree ../partials)
     ];
 
@@ -13,27 +13,28 @@
     };
 
     # Shell apps
-    user.shell.zsh.enable = true;
-    user.shell.git.enable = true;
-    user.shell.neovim.enable = true;
-    user.shell.nh.enable = true;
-    user.shell.devenv.enable = true;
+    home.shell.zsh.enable = true;
+    home.shell.git.enable = true;
+    home.shell.neovim.enable = true;
+    home.shell.nh.enable = true;
+    home.shell.devenv.enable = true;
 
     # Code editor
-    user.ide.zed.enable = true;
+    home.ide.zed.enable = true;
 
     # IDE Jetbrains
-    user.ide.jetbrains.idea.enable = false;
-    user.ide.jetbrains.pycharm.enable = false;
-    user.ide.jetbrains.phpstorm.enable = false;
-    user.ide.jetbrains.rustrover.enable = false;
+    home.ide.jetbrains.idea.enable = true;
+    home.ide.jetbrains.pycharm.enable = true;
+    home.ide.jetbrains.phpstorm.enable = true;
+    home.ide.jetbrains.rustrover.enable = true;
+    home.ide.jetbrains.goland.enable = true;
 
     # IDE Data Jetbrains
-    user.ide.jetbrains.datagrip.enable = false;
-    user.ide.jetbrains.dataspell.enable = false;
+    home.ide.jetbrains.datagrip.enable = true;
+    home.ide.jetbrains.dataspell.enable = true;
 
     # Markdown Editor
-    user.editor.obsidian.enable = false;
+    home.md.obsidian.enable = true;
 
     # The state version is required and should stay at the version you
     # originally installed.
diff --git a/hosts/nixos/system/partials/zsh.nix b/hosts/nixos/system/partials/zsh.nix
new file mode 100644
index 0000000..dbde0ef
--- /dev/null
+++ b/hosts/nixos/system/partials/zsh.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  programs.zsh = {
+    enable = true;
+  };
+}
diff --git a/modules/home/common/devenv.nix b/modules/home/common/env.nix
similarity index 75%
rename from modules/home/common/devenv.nix
rename to modules/home/common/env.nix
index 9e5c7b0..73988b3 100644
--- a/modules/home/common/devenv.nix
+++ b/modules/home/common/env.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.shell.devenv;
+  cfg = config.home.shell.devenv;
 in
 {
-  options.user.shell.devenv = {
+  options.home.shell.devenv = {
     enable = mkEnableOption "System devenv service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/common/git.nix b/modules/home/common/git.nix
index 98fe1d7..6853e90 100644
--- a/modules/home/common/git.nix
+++ b/modules/home/common/git.nix
@@ -5,10 +5,10 @@
 }:
 with lib;
 let
-  cfg = config.user.shell.git;
+  cfg = config.home.shell.git;
 in
 {
-  options.user.shell.git = {
+  options.home.shell.git = {
     enable = mkEnableOption "Zen Editor options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/common/neovim.nix b/modules/home/common/neovim.nix
index cf66cea..93652ea 100644
--- a/modules/home/common/neovim.nix
+++ b/modules/home/common/neovim.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.user.shell.neovim;
+  cfg = config.home.shell.neovim;
 in
 {
-  options.user.shell.neovim = {
+  options.home.shell.neovim = {
     enable = mkEnableOption "System neovim service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/common/nh.nix b/modules/home/common/nh.nix
index ed258c5..ce2ca27 100644
--- a/modules/home/common/nh.nix
+++ b/modules/home/common/nh.nix
@@ -1,10 +1,10 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.user.shell.nh;
+  cfg = config.home.shell.nh;
 in
 {
-  options.user.shell.nh = {
+  options.home.shell.nh = {
     enable = mkEnableOption "System nh service";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/common/zsh.nix b/modules/home/common/zsh.nix
index bff3947..bedc245 100644
--- a/modules/home/common/zsh.nix
+++ b/modules/home/common/zsh.nix
@@ -1,16 +1,15 @@
 { lib, config, ... }:
 with lib;
 let
-  cfg = config.user.shell.zsh;
+  cfg = config.home.shell.zsh;
 in
 {
-  options.user.shell.zsh = {
+  options.home.shell.zsh = {
     enable = mkEnableOption "System zsh service";
   };
   config = mkIf cfg.enable {
 
     programs.zsh = {
-      enable = true;
       enableCompletion = true;
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
diff --git a/modules/home/nixos/jetbrains/clion.nix b/modules/home/nixos/jetbrains/clion.nix
index e2d6368..ff9b3bd 100644
--- a/modules/home/nixos/jetbrains/clion.nix
+++ b/modules/home/nixos/jetbrains/clion.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.clion;
+  cfg = config.home.ide.jetbrains.clion;
 in
 {
-  options.user.ide.jetbrains.clion = {
+  options.home.ide.jetbrains.clion = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/datagrip.nix b/modules/home/nixos/jetbrains/datagrip.nix
index e65ff14..94c4391 100644
--- a/modules/home/nixos/jetbrains/datagrip.nix
+++ b/modules/home/nixos/jetbrains/datagrip.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.datagrip;
+  cfg = config.home.ide.jetbrains.datagrip;
 in
 {
-  options.user.ide.jetbrains.datagrip = {
+  options.home.ide.jetbrains.datagrip = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/dataspell.nix b/modules/home/nixos/jetbrains/dataspell.nix
index 0ec2963..ed47a25 100644
--- a/modules/home/nixos/jetbrains/dataspell.nix
+++ b/modules/home/nixos/jetbrains/dataspell.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.dataspell;
+  cfg = config.home.ide.jetbrains.dataspell;
 in
 {
-  options.user.ide.jetbrains.dataspell = {
+  options.home.ide.jetbrains.dataspell = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/goland.nix b/modules/home/nixos/jetbrains/goland.nix
index 7058412..b8cafc9 100644
--- a/modules/home/nixos/jetbrains/goland.nix
+++ b/modules/home/nixos/jetbrains/goland.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.goland;
+  cfg = config.home.ide.jetbrains.goland;
 in
 {
-  options.user.ide.jetbrains.goland = {
+  options.home.ide.jetbrains.goland = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/idea.nix b/modules/home/nixos/jetbrains/idea.nix
index b8f200c..37da7ee 100644
--- a/modules/home/nixos/jetbrains/idea.nix
+++ b/modules/home/nixos/jetbrains/idea.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.idea;
+  cfg = config.home.ide.jetbrains.idea;
 in
 {
-  options.user.ide.jetbrains.idea = {
+  options.home.ide.jetbrains.idea = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/phpstorm.nix b/modules/home/nixos/jetbrains/phpstorm.nix
index 0c72d7d..51785af 100644
--- a/modules/home/nixos/jetbrains/phpstorm.nix
+++ b/modules/home/nixos/jetbrains/phpstorm.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.phpstorm;
+  cfg = config.home.ide.jetbrains.phpstorm;
 in
 {
-  options.user.ide.jetbrains.phpstorm = {
+  options.home.ide.jetbrains.phpstorm = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/pycharm.nix b/modules/home/nixos/jetbrains/pycharm.nix
index 1c58980..a1391c2 100644
--- a/modules/home/nixos/jetbrains/pycharm.nix
+++ b/modules/home/nixos/jetbrains/pycharm.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.pycharm;
+  cfg = config.home.ide.jetbrains.pycharm;
 in
 {
-  options.user.ide.jetbrains.pycharm = {
+  options.home.ide.jetbrains.pycharm = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/rider.nix b/modules/home/nixos/jetbrains/rider.nix
index f0d41a4..de69e34 100644
--- a/modules/home/nixos/jetbrains/rider.nix
+++ b/modules/home/nixos/jetbrains/rider.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.rider;
+  cfg = config.home.ide.jetbrains.rider;
 in
 {
-  options.user.ide.jetbrains.rider = {
+  options.home.ide.jetbrains.rider = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/rubymine.nix b/modules/home/nixos/jetbrains/rubymine.nix
index b2091ed..56d5040 100644
--- a/modules/home/nixos/jetbrains/rubymine.nix
+++ b/modules/home/nixos/jetbrains/rubymine.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.rubymine;
+  cfg = config.home.ide.jetbrains.rubymine;
 in
 {
-  options.user.ide.jetbrains.rubymine = {
+  options.home.ide.jetbrains.rubymine = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/rustrover.nix b/modules/home/nixos/jetbrains/rustrover.nix
index 9cf5375..3e17982 100644
--- a/modules/home/nixos/jetbrains/rustrover.nix
+++ b/modules/home/nixos/jetbrains/rustrover.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.rustrover;
+  cfg = config.home.ide.jetbrains.rustrover;
 in
 {
-  options.user.ide.jetbrains.rustrover = {
+  options.home.ide.jetbrains.rustrover = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/jetbrains/webstorm.nix b/modules/home/nixos/jetbrains/webstorm.nix
index 6c8aeb2..b6e7e89 100644
--- a/modules/home/nixos/jetbrains/webstorm.nix
+++ b/modules/home/nixos/jetbrains/webstorm.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.jetbrains.webstorm;
+  cfg = config.home.ide.jetbrains.webstorm;
 in
 {
-  options.user.ide.jetbrains.webstorm = {
+  options.home.ide.jetbrains.webstorm = {
     enable = mkEnableOption "JetBrains options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/obsidian.nix b/modules/home/nixos/obsidian.nix
index 364c1ec..6e723ce 100644
--- a/modules/home/nixos/obsidian.nix
+++ b/modules/home/nixos/obsidian.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.editor.obsidian;
+  cfg = config.home.md.obsidian;
 in
 {
-  options.user.editor.obsidian = {
+  options.home.md.obsidian = {
     enable = mkEnableOption "Obsidian options";
   };
   config = mkIf cfg.enable {
diff --git a/modules/home/nixos/zed.nix b/modules/home/nixos/zed.nix
index 460168c..06cc209 100644
--- a/modules/home/nixos/zed.nix
+++ b/modules/home/nixos/zed.nix
@@ -6,10 +6,10 @@
 }:
 with lib;
 let
-  cfg = config.user.ide.zed;
+  cfg = config.home.ide.zed;
 in
 {
-  options.user.ide.zed = {
+  options.home.ide.zed = {
     enable = mkEnableOption "Zen Editor options";
   };
   config = mkIf cfg.enable {