diff --git a/home/adam/home.nix b/home/adam/home.nix
index 83dc180a..2f5ce907 100644
--- a/home/adam/home.nix
+++ b/home/adam/home.nix
@@ -9,7 +9,10 @@
 }:
 {
   # You can import other home-manager modules here
-  imports = [ ../modules/adam.nix ];
+  imports = [
+    ../core/adam.nix
+    ../extra/adam.nix
+  ];
 
   nixpkgs = {
     # You can add overlays here
diff --git a/home/cnst/home.nix b/home/cnst/home.nix
index 0b388c43..fcff5499 100644
--- a/home/cnst/home.nix
+++ b/home/cnst/home.nix
@@ -9,7 +9,10 @@
 }:
 {
   # You can import other home-manager modules here
-  imports = [ ../modules/cnst.nix ];
+  imports = [
+    ../core/cnst.nix
+    ../extra/cnst.nix
+  ];
 
   nixpkgs = {
     # You can add overlays here
diff --git a/home/modules/adam.nix b/home/core/adam.nix
similarity index 93%
rename from home/modules/adam.nix
rename to home/core/adam.nix
index 692a16bb..9341b752 100644
--- a/home/modules/adam.nix
+++ b/home/core/adam.nix
@@ -1,11 +1,8 @@
 { pkgs, ... }:
 {
   imports = [
-    ./zellij
-    ./firefox
     ./git
     ./hypr
-    ./neovim
     ./shell/adam.nix
     ./appearance
   ];
diff --git a/home/modules/appearance/default.nix b/home/core/appearance/default.nix
similarity index 100%
rename from home/modules/appearance/default.nix
rename to home/core/appearance/default.nix
diff --git a/home/modules/appearance/gtk.nix b/home/core/appearance/gtk.nix
similarity index 100%
rename from home/modules/appearance/gtk.nix
rename to home/core/appearance/gtk.nix
diff --git a/home/modules/cnst.nix b/home/core/cnst.nix
similarity index 93%
rename from home/modules/cnst.nix
rename to home/core/cnst.nix
index 149d486a..02b5aa36 100644
--- a/home/modules/cnst.nix
+++ b/home/core/cnst.nix
@@ -1,11 +1,8 @@
 { pkgs, ... }:
 {
   imports = [
-    ./zellij
-    ./firefox
     ./git
     ./hypr
-    ./neovim
     ./shell/cnst.nix
     ./appearance
   ];
diff --git a/home/modules/git/default.nix b/home/core/git/default.nix
similarity index 100%
rename from home/modules/git/default.nix
rename to home/core/git/default.nix
diff --git a/home/modules/hypr/default.nix b/home/core/hypr/default.nix
similarity index 100%
rename from home/modules/hypr/default.nix
rename to home/core/hypr/default.nix
diff --git a/home/modules/hypr/hyprland.conf b/home/core/hypr/hyprland.conf
similarity index 100%
rename from home/modules/hypr/hyprland.conf
rename to home/core/hypr/hyprland.conf
diff --git a/home/modules/shell/adam.nix b/home/core/shell/adam.nix
similarity index 100%
rename from home/modules/shell/adam.nix
rename to home/core/shell/adam.nix
diff --git a/home/modules/shell/cnst.nix b/home/core/shell/cnst.nix
similarity index 100%
rename from home/modules/shell/cnst.nix
rename to home/core/shell/cnst.nix
diff --git a/home/extra/adam.nix b/home/extra/adam.nix
new file mode 100644
index 00000000..e779841e
--- /dev/null
+++ b/home/extra/adam.nix
@@ -0,0 +1,36 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./zellij
+    ./firefox
+    ./neovim
+    ./mako
+  ];
+  home.packages = with pkgs; [
+    # Desktop
+    alacritty
+    wl-clipboard
+    keepassxc
+    ranger
+    webcord
+    xfce.thunar
+    xfce.thunar-volman
+    xfce.thunar-archive-plugin
+    gnome.file-roller
+    wireguard-tools
+    wpa_supplicant
+    ntfs3g
+    kdePackages.polkit-kde-agent-1
+    networkmanagerapplet
+    htop
+    btop
+    pamixer
+    qbittorrent
+    fastfetch
+    waybar
+    nwg-look
+    thefuck
+    calcurse
+    gnome.adwaita-icon-theme
+  ];
+}
diff --git a/home/extra/cnst.nix b/home/extra/cnst.nix
new file mode 100644
index 00000000..84c8e592
--- /dev/null
+++ b/home/extra/cnst.nix
@@ -0,0 +1,37 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./firefox
+    ./mako
+    ./neovim
+    ./zellij
+  ];
+  home.packages = with pkgs; [
+    # Desktop
+    alacritty
+    wl-clipboard
+    keepassxc
+    ranger
+    webcord
+    xfce.thunar
+    xfce.thunar-volman
+    xfce.thunar-archive-plugin
+    gnome.file-roller
+    wireguard-tools
+    wpa_supplicant
+    ntfs3g
+    kdePackages.polkit-kde-agent-1
+    networkmanagerapplet
+    htop
+    btop
+    pamixer
+    virt-manager
+    qbittorrent
+    fastfetch
+    waybar
+    nwg-look
+    thefuck
+    calcurse
+    gnome.adwaita-icon-theme
+  ];
+}
diff --git a/home/modules/firefox/default.nix b/home/extra/firefox/default.nix
similarity index 100%
rename from home/modules/firefox/default.nix
rename to home/extra/firefox/default.nix
diff --git a/home/modules/firefox/default.nixbak b/home/extra/firefox/default.nixbak
similarity index 100%
rename from home/modules/firefox/default.nixbak
rename to home/extra/firefox/default.nixbak
diff --git a/home/modules/mako/default.nix b/home/extra/mako/default.nix
similarity index 100%
rename from home/modules/mako/default.nix
rename to home/extra/mako/default.nix
diff --git a/home/modules/neovim/default.nix b/home/extra/neovim/default.nix
similarity index 100%
rename from home/modules/neovim/default.nix
rename to home/extra/neovim/default.nix
diff --git a/home/modules/zellij/default.nix b/home/extra/zellij/default.nix
similarity index 100%
rename from home/modules/zellij/default.nix
rename to home/extra/zellij/default.nix
diff --git a/hosts/common/default.nix b/hosts/common/default.nix
index 60271d6c..341ec6b8 100644
--- a/hosts/common/default.nix
+++ b/hosts/common/default.nix
@@ -9,7 +9,6 @@
   imports = [
     inputs.home-manager.nixosModules.home-manager
     ./adb.nix
-    ./neovim.nix
     ./zsh.nix
     ./adampad-pkgs.nix
     ./fonts.nix
diff --git a/hosts/common/neovim.nix b/hosts/common/neovim.nix
deleted file mode 100644
index 0828befb..00000000
--- a/hosts/common/neovim.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  programs.neovim = {
-    enable = true;
-    defaultEditor = true;
-  };
-}