diff --git a/nix/overlay.nix b/nix/overlay.nix
index 4f81515..7c54c32 100644
--- a/nix/overlay.nix
+++ b/nix/overlay.nix
@@ -1,16 +1,5 @@
-final: prev: {
-  hl2sdk = (import ./hl2sdk.nix) {
-    inherit (final) fetchFromGitHub lib;
-    inherit (final.stdenvNoCC) mkDerivation;
-  };
-  ambuild = final.python3Packages.callPackage ./ambuild.nix {};
-  metamod-source = final.callPackage ./metamod-source.nix {};
-  sourcemod = final.callPackage ./sourcemod.nix {};
-  sourcepawn = final.callPackage ./sourcepawn.nix {};
-  sourcemod-includes = final.callPackage ./includes/sourcemod-includes.nix {};
-  buildSourcePawnScript = final.callPackage ./build-sourcepawn-script.nix {};
-  sourcemod-include-library = final.callPackage ./includes/sourcemod-include-library.nix {};
-  sourcemod-include-curl = final.callPackage ./includes/curl.nix {};
-  sourcemod-include-steamworks = final.callPackage ./includes/steamworks.nix {};
+final: prev:
+{
   srcds-tf2 = final.callPackage ./srcds {};
 }
+// (import ./sourcemod/overlay.nix) final prev
diff --git a/nix/ambuild.nix b/nix/sourcemod/ambuild.nix
similarity index 100%
rename from nix/ambuild.nix
rename to nix/sourcemod/ambuild.nix
diff --git a/nix/build-sourcepawn-script.nix b/nix/sourcemod/build-sourcepawn-script.nix
similarity index 100%
rename from nix/build-sourcepawn-script.nix
rename to nix/sourcemod/build-sourcepawn-script.nix
diff --git a/nix/hl2sdk.nix b/nix/sourcemod/hl2sdk.nix
similarity index 100%
rename from nix/hl2sdk.nix
rename to nix/sourcemod/hl2sdk.nix
diff --git a/nix/includes/curl.nix b/nix/sourcemod/includes/curl.nix
similarity index 100%
rename from nix/includes/curl.nix
rename to nix/sourcemod/includes/curl.nix
diff --git a/nix/includes/sourcemod-include-library.nix b/nix/sourcemod/includes/sourcemod-include-library.nix
similarity index 100%
rename from nix/includes/sourcemod-include-library.nix
rename to nix/sourcemod/includes/sourcemod-include-library.nix
diff --git a/nix/includes/sourcemod-includes.nix b/nix/sourcemod/includes/sourcemod-includes.nix
similarity index 100%
rename from nix/includes/sourcemod-includes.nix
rename to nix/sourcemod/includes/sourcemod-includes.nix
diff --git a/nix/includes/steamworks.nix b/nix/sourcemod/includes/steamworks.nix
similarity index 100%
rename from nix/includes/steamworks.nix
rename to nix/sourcemod/includes/steamworks.nix
diff --git a/nix/metamod-source.nix b/nix/sourcemod/metamod-source.nix
similarity index 100%
rename from nix/metamod-source.nix
rename to nix/sourcemod/metamod-source.nix
diff --git a/nix/sourcemod/overlay.nix b/nix/sourcemod/overlay.nix
new file mode 100644
index 0000000..f7bd0a0
--- /dev/null
+++ b/nix/sourcemod/overlay.nix
@@ -0,0 +1,15 @@
+final: prev: {
+  hl2sdk = (import ./hl2sdk.nix) {
+    inherit (final) fetchFromGitHub lib;
+    inherit (final.stdenvNoCC) mkDerivation;
+  };
+  ambuild = final.python3Packages.callPackage ./ambuild.nix {};
+  metamod-source = final.callPackage ./metamod-source.nix {};
+  sourcemod = final.callPackage ./sourcemod.nix {};
+  sourcepawn = final.callPackage ./sourcepawn.nix {};
+  sourcemod-includes = final.callPackage ./includes/sourcemod-includes.nix {};
+  buildSourcePawnScript = final.callPackage ./build-sourcepawn-script.nix {};
+  sourcemod-include-library = final.callPackage ./includes/sourcemod-include-library.nix {};
+  sourcemod-include-curl = final.callPackage ./includes/curl.nix {};
+  sourcemod-include-steamworks = final.callPackage ./includes/steamworks.nix {};
+}
diff --git a/nix/sourcemod.nix b/nix/sourcemod/sourcemod.nix
similarity index 100%
rename from nix/sourcemod.nix
rename to nix/sourcemod/sourcemod.nix
diff --git a/nix/sourcepawn.nix b/nix/sourcemod/sourcepawn.nix
similarity index 100%
rename from nix/sourcepawn.nix
rename to nix/sourcemod/sourcepawn.nix