diff --git a/home/base/automount.nix b/home/common/automount.nix
similarity index 100%
rename from home/base/automount.nix
rename to home/common/automount.nix
diff --git a/home/base/core.nix b/home/common/core.nix
similarity index 100%
rename from home/base/core.nix
rename to home/common/core.nix
diff --git a/home/base/default.nix b/home/common/default.nix
similarity index 100%
rename from home/base/default.nix
rename to home/common/default.nix
diff --git a/home/base/gnome/default.nix b/home/common/gnome/default.nix
similarity index 100%
rename from home/base/gnome/default.nix
rename to home/common/gnome/default.nix
diff --git a/home/base/mime.nix b/home/common/mime.nix
similarity index 100%
rename from home/base/mime.nix
rename to home/common/mime.nix
diff --git a/home/base/programs/browsers.nix b/home/common/programs/browsers.nix
similarity index 100%
rename from home/base/programs/browsers.nix
rename to home/common/programs/browsers.nix
diff --git a/home/base/programs/default.nix b/home/common/programs/default.nix
similarity index 100%
rename from home/base/programs/default.nix
rename to home/common/programs/default.nix
diff --git a/home/base/programs/git.nix b/home/common/programs/git.nix
similarity index 100%
rename from home/base/programs/git.nix
rename to home/common/programs/git.nix
diff --git a/home/base/programs/gnupg.nix b/home/common/programs/gnupg.nix
similarity index 100%
rename from home/base/programs/gnupg.nix
rename to home/common/programs/gnupg.nix
diff --git a/home/base/programs/miscellaneous.nix b/home/common/programs/miscellaneous.nix
similarity index 100%
rename from home/base/programs/miscellaneous.nix
rename to home/common/programs/miscellaneous.nix
diff --git a/home/base/programs/nezia-public-key.asc b/home/common/programs/nezia-public-key.asc
similarity index 100%
rename from home/base/programs/nezia-public-key.asc
rename to home/common/programs/nezia-public-key.asc
diff --git a/home/base/programs/nixvim/autocmds.nix b/home/common/programs/nixvim/autocmds.nix
similarity index 100%
rename from home/base/programs/nixvim/autocmds.nix
rename to home/common/programs/nixvim/autocmds.nix
diff --git a/home/base/programs/nixvim/core.nix b/home/common/programs/nixvim/core.nix
similarity index 100%
rename from home/base/programs/nixvim/core.nix
rename to home/common/programs/nixvim/core.nix
diff --git a/home/base/programs/nixvim/default.nix b/home/common/programs/nixvim/default.nix
similarity index 100%
rename from home/base/programs/nixvim/default.nix
rename to home/common/programs/nixvim/default.nix
diff --git a/home/base/programs/nixvim/keymaps.nix b/home/common/programs/nixvim/keymaps.nix
similarity index 100%
rename from home/base/programs/nixvim/keymaps.nix
rename to home/common/programs/nixvim/keymaps.nix
diff --git a/home/base/programs/nixvim/plugins/alpha.nix b/home/common/programs/nixvim/plugins/alpha.nix
similarity index 100%
rename from home/base/programs/nixvim/plugins/alpha.nix
rename to home/common/programs/nixvim/plugins/alpha.nix
diff --git a/home/base/programs/nixvim/plugins/lsp.nix b/home/common/programs/nixvim/plugins/lsp.nix
similarity index 100%
rename from home/base/programs/nixvim/plugins/lsp.nix
rename to home/common/programs/nixvim/plugins/lsp.nix
diff --git a/home/base/programs/nixvim/plugins/lualine.nix b/home/common/programs/nixvim/plugins/lualine.nix
similarity index 100%
rename from home/base/programs/nixvim/plugins/lualine.nix
rename to home/common/programs/nixvim/plugins/lualine.nix
diff --git a/home/base/programs/nixvim/plugins/misc.nix b/home/common/programs/nixvim/plugins/misc.nix
similarity index 100%
rename from home/base/programs/nixvim/plugins/misc.nix
rename to home/common/programs/nixvim/plugins/misc.nix
diff --git a/home/base/programs/nixvim/plugins/neo-tree.nix b/home/common/programs/nixvim/plugins/neo-tree.nix
similarity index 100%
rename from home/base/programs/nixvim/plugins/neo-tree.nix
rename to home/common/programs/nixvim/plugins/neo-tree.nix
diff --git a/home/base/programs/nixvim/plugins/project-nvim.nix b/home/common/programs/nixvim/plugins/project-nvim.nix
similarity index 100%
rename from home/base/programs/nixvim/plugins/project-nvim.nix
rename to home/common/programs/nixvim/plugins/project-nvim.nix
diff --git a/home/base/programs/nixvim/plugins/smart-splits.nix b/home/common/programs/nixvim/plugins/smart-splits.nix
similarity index 100%
rename from home/base/programs/nixvim/plugins/smart-splits.nix
rename to home/common/programs/nixvim/plugins/smart-splits.nix
diff --git a/home/base/programs/nixvim/plugins/telescope.nix b/home/common/programs/nixvim/plugins/telescope.nix
similarity index 100%
rename from home/base/programs/nixvim/plugins/telescope.nix
rename to home/common/programs/nixvim/plugins/telescope.nix
diff --git a/home/base/programs/nixvim/plugins/which-key.nix b/home/common/programs/nixvim/plugins/which-key.nix
similarity index 100%
rename from home/base/programs/nixvim/plugins/which-key.nix
rename to home/common/programs/nixvim/plugins/which-key.nix
diff --git a/home/base/programs/tmux.nix b/home/common/programs/tmux.nix
similarity index 100%
rename from home/base/programs/tmux.nix
rename to home/common/programs/tmux.nix
diff --git a/home/base/programs/wezterm.nix b/home/common/programs/wezterm.nix
similarity index 100%
rename from home/base/programs/wezterm.nix
rename to home/common/programs/wezterm.nix
diff --git a/home/base/shell/default.nix b/home/common/shell/default.nix
similarity index 100%
rename from home/base/shell/default.nix
rename to home/common/shell/default.nix
diff --git a/home/base/shell/direnv.nix b/home/common/shell/direnv.nix
similarity index 100%
rename from home/base/shell/direnv.nix
rename to home/common/shell/direnv.nix
diff --git a/home/base/shell/fish.nix b/home/common/shell/fish.nix
similarity index 100%
rename from home/base/shell/fish.nix
rename to home/common/shell/fish.nix
diff --git a/home/base/shell/zellij.nix b/home/common/shell/zellij.nix
similarity index 100%
rename from home/base/shell/zellij.nix
rename to home/common/shell/zellij.nix
diff --git a/home/base/shell/zoxide.nix b/home/common/shell/zoxide.nix
similarity index 100%
rename from home/base/shell/zoxide.nix
rename to home/common/shell/zoxide.nix
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index 73b336b..b688699 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../base
+    ../common
     ./gaming
   ];
 }
diff --git a/home/laptop/default.nix b/home/laptop/default.nix
index 82eadc4..abe71e0 100644
--- a/home/laptop/default.nix
+++ b/home/laptop/default.nix
@@ -2,6 +2,6 @@
 
 {
   imports = [
-    ../base
+    ../common
   ];
 }