diff --git a/nix/sourcemod/plugins/curl.nix b/nix/sourcemod/addons/curl.nix
similarity index 100%
rename from nix/sourcemod/plugins/curl.nix
rename to nix/sourcemod/addons/curl.nix
diff --git a/nix/sourcemod/addons/overlay.nix b/nix/sourcemod/addons/overlay.nix
new file mode 100644
index 0000000..9d5bf25
--- /dev/null
+++ b/nix/sourcemod/addons/overlay.nix
@@ -0,0 +1,5 @@
+final: prev: {
+  sourcemod-addon-curl = final.callPackage ./curl.nix {};
+  sourcemod-addon-steamworks = final.callPackage ./steamworks.nix {};
+  sourcemod-addon-socket = final.callPackage ./socket.nix {};
+}
diff --git a/nix/sourcemod/plugins/socket.nix b/nix/sourcemod/addons/socket.nix
similarity index 100%
rename from nix/sourcemod/plugins/socket.nix
rename to nix/sourcemod/addons/socket.nix
diff --git a/nix/sourcemod/plugins/steamworks.nix b/nix/sourcemod/addons/steamworks.nix
similarity index 100%
rename from nix/sourcemod/plugins/steamworks.nix
rename to nix/sourcemod/addons/steamworks.nix
diff --git a/nix/sourcemod/includes/overlay.nix b/nix/sourcemod/includes/overlay.nix
new file mode 100644
index 0000000..1e50167
--- /dev/null
+++ b/nix/sourcemod/includes/overlay.nix
@@ -0,0 +1,5 @@
+final: prev: {
+  sourcemod-include-library = final.callPackage ./sourcemod-include-library.nix {};
+  sourcemod-include-curl = final.callPackage ./curl.nix {};
+  sourcemod-include-steamworks = final.callPackage ./steamworks.nix {};
+}
diff --git a/nix/sourcemod/overlay.nix b/nix/sourcemod/overlay.nix
index 3aa39d2..5ea037f 100644
--- a/nix/sourcemod/overlay.nix
+++ b/nix/sourcemod/overlay.nix
@@ -16,8 +16,7 @@ final: prev:
   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 {};
 }
-// (import ./plugins/overlay.nix) final prev
+// ((import ./addons/overlay.nix) final prev)
+// ((import ./includes/overlay.nix) final prev)
+// ((import ./plugins/overlay.nix) final prev)
diff --git a/nix/sourcemod/plugins/overlay.nix b/nix/sourcemod/plugins/overlay.nix
index 1e59175..91e067f 100644
--- a/nix/sourcemod/plugins/overlay.nix
+++ b/nix/sourcemod/plugins/overlay.nix
@@ -2,9 +2,6 @@ final: prev: {
   mkSourcemodPlugin = final.callPackage ./builder/plugin.nix {};
   mkSpirePlugin = final.callPackage ./builder/spire-plugin.nix {};
   mkF2Plugin = final.callPackage ./builder/f2-plugin.nix {};
-  sourcemod-addon-curl = final.callPackage ./curl.nix {};
-  sourcemod-addon-steamworks = final.callPackage ./steamworks.nix {};
-  sourcemod-addon-socket = final.callPackage ./socket.nix {};
   sourcemod-plugin-soap-tf2dm = final.callPackage ./soap-tf2dm.nix {};
   sourcemod-plugin-progressive-ruleset-timer = final.callPackage ./progressive-ruleset-timer.nix {};
   sourcemod-plugin-tf2-comp-fixes = final.callPackage ./tf2-comp-fixes.nix {};