diff --git a/configuration.nix b/configuration/common.nix
similarity index 65%
rename from configuration.nix
rename to configuration/common.nix
index a227487c07185932fe007134b60559c575e33296..2042679c14436963dcc56c961941eb1a1b94b241 100644
--- a/configuration.nix
+++ b/configuration/common.nix
@@ -8,13 +8,13 @@ final: prev: {
 
   hopenssl = prev.hopenssl.override { openssl = pkgs.openssl_1_1; };
 
-  libsodium = prev.callPackage ./pkgs/libsodium.nix { inherit (pkgs) libsodium; };
+  libsodium = prev.callPackage ../pkgs/libsodium.nix { inherit (pkgs) libsodium; };
 
   saltine = addPkgconfigDepend prev.saltine pkgs.libsodium;
 
-  splitmix = prev.callPackage ./pkgs/splitmix.nix { inherit (pkgs) testu01; };
+  splitmix = prev.callPackage ../pkgs/splitmix.nix { inherit (pkgs) testu01; };
 
-  text-icu = prev.callPackage ./pkgs/text-icu.nix { icu-i18n = pkgs.icu; };
+  text-icu = prev.callPackage ../pkgs/text-icu.nix { icu-i18n = pkgs.icu; };
 
   sdl2-image = addPkgconfigDepends prev.sdl2-image [ pkgs.libtiff pkgs.libdeflate pkgs.libwebp ];
 
@@ -22,5 +22,5 @@ final: prev: {
 
   X11-xft = addPkgconfigDepends prev.X11-xft [ pkgs.expat pkgs.xorg.libXau pkgs.xorg.libXdmcp ];
 
-  zlib = prev.callPackage ./pkgs/zlib.nix { inherit (pkgs) zlib; };
+  zlib = prev.callPackage ../pkgs/zlib.nix { inherit (pkgs) zlib; };
 }
diff --git a/configuration-darwin.nix b/configuration/darwin.nix
similarity index 100%
rename from configuration-darwin.nix
rename to configuration/darwin.nix
diff --git a/configuration-ghc.nix b/configuration/ghc.nix
similarity index 100%
rename from configuration-ghc.nix
rename to configuration/ghc.nix
diff --git a/flake.nix b/flake.nix
index bbcda025bd1a7102eae5056fa9afdeebe789fde4..2ab6e98ebd513355c3af7fec84dc595cd1c07da2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -31,10 +31,10 @@
 
           legacyPackages = pkgs.callPackage (nixpkgs + /pkgs/development/haskell-modules) {
             buildHaskellPackages = pkgs.haskell.packages.ghc944;
-            compilerConfig = pkgs.callPackage ./configuration-ghc.nix { inherit haskellLib; };
+            compilerConfig = pkgs.callPackage ./configuration/ghc.nix { inherit haskellLib; };
             configurationArm = { pkgs, haskellLib }: self: super: { };
-            configurationCommon = import ./configuration.nix;
-            configurationDarwin = import ./configuration-darwin.nix;
+            configurationCommon = import ./configuration/common.nix;
+            configurationDarwin = import ./configuration/darwin.nix;
             configurationNix = { pkgs, haskellLib }: self: super: { };
             ghc = pkgs.haskell.compiler.ghc944;
             inherit haskellLib;