diff --git a/.envrc b/.envrc
index 59dfc5d..d208603 100644
--- a/.envrc
+++ b/.envrc
@@ -1,2 +1,2 @@
 use flake
-watch_file dev.nix
+watch_file parts/dev.nix
diff --git a/flake.nix b/flake.nix
index 96ad4f9..4d6aa06 100644
--- a/flake.nix
+++ b/flake.nix
@@ -55,9 +55,7 @@
       systems = ["x86_64-linux"];
 
       imports = [
-        ./ci.nix
-        ./dev.nix
-        ./deploy.nix
+        ./parts
         ./systems
       ];
     };
diff --git a/ci.nix b/parts/ci.nix
similarity index 93%
rename from ci.nix
rename to parts/ci.nix
index 64525f2..cc90dc2 100644
--- a/ci.nix
+++ b/parts/ci.nix
@@ -10,7 +10,7 @@
     ...
   }: {
     packages = let
-      overlay = lib.fix (final: (import ./exprs/overlay.nix final pkgs));
+      overlay = lib.fix (final: (import ../exprs/overlay.nix final pkgs));
 
       # do not include a package if it's not available on the system or if it's broken
       isValid = _: v:
diff --git a/parts/default.nix b/parts/default.nix
new file mode 100644
index 0000000..710279c
--- /dev/null
+++ b/parts/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./ci.nix
+    ./deploy.nix
+    ./dev.nix
+  ];
+}
diff --git a/deploy.nix b/parts/deploy.nix
similarity index 100%
rename from deploy.nix
rename to parts/deploy.nix
diff --git a/dev.nix b/parts/dev.nix
similarity index 100%
rename from dev.nix
rename to parts/dev.nix