diff --git a/nix-conf/home/djmuk1.nix b/nix-conf/home/djmuk1.nix
index fa918f6..54b1171 100644
--- a/nix-conf/home/djmuk1.nix
+++ b/nix-conf/home/djmuk1.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   imports = [ 
-    ./linux-server.nix
+    ./includes/linux-server.nix
   ];
 
   # Let Home Manager install and manage itself.
diff --git a/nix-conf/home/egalmoth.nix b/nix-conf/home/egalmoth.nix
index c7e3827..6e41320 100644
--- a/nix-conf/home/egalmoth.nix
+++ b/nix-conf/home/egalmoth.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   imports = [ 
-    ./linux-dev.nix
+    ./includes/linux-dev.nix
   ];
 
   # Let Home Manager install and manage itself.
diff --git a/nix-conf/home/clojure.nix b/nix-conf/home/includes/clojure.nix
similarity index 100%
rename from nix-conf/home/clojure.nix
rename to nix-conf/home/includes/clojure.nix
diff --git a/nix-conf/home/common.nix b/nix-conf/home/includes/common.nix
similarity index 100%
rename from nix-conf/home/common.nix
rename to nix-conf/home/includes/common.nix
diff --git a/nix-conf/home/darwin.nix b/nix-conf/home/includes/darwin.nix
similarity index 100%
rename from nix-conf/home/darwin.nix
rename to nix-conf/home/includes/darwin.nix
diff --git a/nix-conf/home/dev-common.nix b/nix-conf/home/includes/dev-common.nix
similarity index 100%
rename from nix-conf/home/dev-common.nix
rename to nix-conf/home/includes/dev-common.nix
diff --git a/nix-conf/home/linux-dev.nix b/nix-conf/home/includes/linux-dev.nix
similarity index 100%
rename from nix-conf/home/linux-dev.nix
rename to nix-conf/home/includes/linux-dev.nix
diff --git a/nix-conf/home/linux-server.nix b/nix-conf/home/includes/linux-server.nix
similarity index 100%
rename from nix-conf/home/linux-server.nix
rename to nix-conf/home/includes/linux-server.nix
diff --git a/nix-conf/home/zsh.nix b/nix-conf/home/includes/zsh.nix
similarity index 100%
rename from nix-conf/home/zsh.nix
rename to nix-conf/home/includes/zsh.nix
diff --git a/nix-conf/home/otm.nix b/nix-conf/home/otm.nix
index f471588..abb7efa 100644
--- a/nix-conf/home/otm.nix
+++ b/nix-conf/home/otm.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 {
   imports = [ 
-    ./darwin.nix
+    ./includes/darwin.nix
   ];
 
   # Let Home Manager install and manage itself.