diff --git a/nix/default.nix b/nix/default.nix
index 5aaaf7621..a5df6aa72 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -10,9 +10,9 @@ let
 in rec {
   inherit (rust) cargo rustc;
   inherit (callPackage ./pkgs/python3Packages.nix {}) migen misoc;
-  binutils-or1k = callPackage ./binutils-or1k.nix {};
-  llvm-or1k = callPackage ./llvm-or1k.nix { inherit llvm-src; };
-  llvmlite = callPackage ./llvmlite.nix { inherit llvm-or1k; };
-  artiq = callPackage ./artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite; };
+  binutils-or1k = callPackage ./pkgs/binutils-or1k.nix {};
+  llvm-or1k = callPackage ./pkgs/llvm-or1k.nix { inherit llvm-src; };
+  llvmlite = callPackage ./pkgs/llvmlite.nix { inherit llvm-or1k; };
+  artiq = callPackage ./pkgs/artiq.nix { inherit binutils-or1k; inherit llvm-or1k; inherit llvmlite; };
   openocd = callPackage ./pkgs/openocd.nix {};
 }
diff --git a/nix/artiq.nix b/nix/pkgs/artiq.nix
similarity index 99%
rename from nix/artiq.nix
rename to nix/pkgs/artiq.nix
index c959c8a17..e5ee192da 100644
--- a/nix/artiq.nix
+++ b/nix/pkgs/artiq.nix
@@ -66,7 +66,7 @@ in
 
 python3Packages.buildPythonPackage rec {
   name = "artiq";
-  src = ./..;
+  src = ./../..;
   propagatedBuildInputs = with python3Packages; [ binutils-or1k llvm-or1k llvmlite levenshtein pyqtgraph-qt5 aiohttp pygit2 pythonparser numpy dateutil quamash scipy prettytable pyserial asyncserial h5py cython regex qt5Full pyqt5 ];
   doCheck = false;
   meta = with stdenv.lib; {
diff --git a/nix/binutils-or1k.nix b/nix/pkgs/binutils-or1k.nix
similarity index 100%
rename from nix/binutils-or1k.nix
rename to nix/pkgs/binutils-or1k.nix
diff --git a/nix/llvm-or1k.nix b/nix/pkgs/llvm-or1k.nix
similarity index 100%
rename from nix/llvm-or1k.nix
rename to nix/pkgs/llvm-or1k.nix
diff --git a/nix/llvmlite.nix b/nix/pkgs/llvmlite.nix
similarity index 100%
rename from nix/llvmlite.nix
rename to nix/pkgs/llvmlite.nix