diff --git a/home/common/bash.nix b/home/base/bash.nix
similarity index 100%
rename from home/common/bash.nix
rename to home/base/bash.nix
diff --git a/home/common/core.nix b/home/base/core.nix
similarity index 100%
rename from home/common/core.nix
rename to home/base/core.nix
diff --git a/home/common/default.nix b/home/base/default.nix
similarity index 100%
rename from home/common/default.nix
rename to home/base/default.nix
diff --git a/home/common/development.nix b/home/base/development.nix
similarity index 100%
rename from home/common/development.nix
rename to home/base/development.nix
diff --git a/home/common/git.nix b/home/base/git.nix
similarity index 100%
rename from home/common/git.nix
rename to home/base/git.nix
diff --git a/home/common/media.nix b/home/base/media.nix
similarity index 100%
rename from home/common/media.nix
rename to home/base/media.nix
diff --git a/home/common/nushell/config.nu b/home/base/nushell/config.nu
similarity index 100%
rename from home/common/nushell/config.nu
rename to home/base/nushell/config.nu
diff --git a/home/common/nushell/default.nix b/home/base/nushell/default.nix
similarity index 100%
rename from home/common/nushell/default.nix
rename to home/base/nushell/default.nix
diff --git a/home/common/starship.nix b/home/base/starship.nix
similarity index 100%
rename from home/common/starship.nix
rename to home/base/starship.nix
diff --git a/home/darwin/default.nix b/home/darwin/default.nix
index b5a0c8f1..cfc4f955 100644
--- a/home/darwin/default.nix
+++ b/home/darwin/default.nix
@@ -2,13 +2,13 @@
 
 {
   imports = [
-    ../common/nushell
+    ../base/nushell
     
-    ../common/core.nix
-    ../common/git.nix
-    ../common/development.nix
-    ../common/media.nix
-    ../common/starship.nix
+    ../base/core.nix
+    ../base/git.nix
+    ../base/development.nix
+    ../base/media.nix
+    ../base/starship.nix
     
     ./alacritty
     ./core.nix
diff --git a/home/linux/common/alacritty/alacritty.yml b/home/linux/base/alacritty/alacritty.yml
similarity index 100%
rename from home/linux/common/alacritty/alacritty.yml
rename to home/linux/base/alacritty/alacritty.yml
diff --git a/home/linux/common/alacritty/default.nix b/home/linux/base/alacritty/default.nix
similarity index 100%
rename from home/linux/common/alacritty/default.nix
rename to home/linux/base/alacritty/default.nix
diff --git a/home/linux/common/alacritty/theme_github_dark.yml b/home/linux/base/alacritty/theme_github_dark.yml
similarity index 100%
rename from home/linux/common/alacritty/theme_github_dark.yml
rename to home/linux/base/alacritty/theme_github_dark.yml
diff --git a/home/linux/common/development.nix b/home/linux/base/development.nix
similarity index 100%
rename from home/linux/common/development.nix
rename to home/linux/base/development.nix
diff --git a/home/linux/common/shell.nix b/home/linux/base/shell.nix
similarity index 100%
rename from home/linux/common/shell.nix
rename to home/linux/base/shell.nix
diff --git a/home/linux/common/ssh.nix b/home/linux/base/ssh.nix
similarity index 100%
rename from home/linux/common/ssh.nix
rename to home/linux/base/ssh.nix
diff --git a/home/linux/common/system-tools.nix b/home/linux/base/system-tools.nix
similarity index 100%
rename from home/linux/common/system-tools.nix
rename to home/linux/base/system-tools.nix
diff --git a/home/linux/common/xdg.nix b/home/linux/base/xdg.nix
similarity index 100%
rename from home/linux/common/xdg.nix
rename to home/linux/base/xdg.nix
diff --git a/home/linux/wayland.nix b/home/linux/wayland.nix
index eb58f9ed..77a23122 100644
--- a/home/linux/wayland.nix
+++ b/home/linux/wayland.nix
@@ -2,19 +2,19 @@
 
 {
   imports = [
-    ../common
+    ../base
 
     ./hyprland
 
     ./fcitx5
     ./desktop
 
-    ./common/alacritty
-    ./common/development.nix
-    ./common/shell.nix
-    ./common/ssh.nix
-    ./common/system-tools.nix
-    ./common/xdg.nix
+    ./base/alacritty
+    ./base/development.nix
+    ./base/shell.nix
+    ./base/ssh.nix
+    ./base/system-tools.nix
+    ./base/xdg.nix
   ];
 
   # Home Manager needs a bit of information about you and the
diff --git a/home/linux/x11.nix b/home/linux/x11.nix
index caceb331..86b088c4 100644
--- a/home/linux/x11.nix
+++ b/home/linux/x11.nix
@@ -2,19 +2,19 @@
 
 {
   imports = [
-    ../common
+    ../base
 
     ./i3
 
     ./fcitx5
     ./desktop
 
-    ./common/alacritty
-    ./common/development.nix
-    ./common/shell.nix
-    ./common/ssh.nix
-    ./common/system-tools.nix
-    ./common/xdg.nix
+    ./base/alacritty
+    ./base/development.nix
+    ./base/shell.nix
+    ./base/ssh.nix
+    ./base/system-tools.nix
+    ./base/xdg.nix
   ];
 
   # Home Manager needs a bit of information about you and the