diff --git a/overlays/default.nix b/extras/overlays.nix
similarity index 71%
rename from overlays/default.nix
rename to extras/overlays.nix
index f653fe4..bf2d243 100644
--- a/overlays/default.nix
+++ b/extras/overlays.nix
@@ -1,10 +1,9 @@
 # This file defines overlays
 {inputs, ...}: {
   # This one brings our custom packages from the 'pkgs' directory
-  additions = final: _prev: import ../pkgs {pkgs = final;};
+  additions = final: _prev: import ./pkgs {pkgs = final;};
 
   # This one contains whatever you want to overlay
-  # https://nixos.wiki/wiki/Overlays
   selfsuper = (self: super: {
     mpv = super.mpv.override {
       scripts = with self.mpvScripts; [mpris sponsorblock thumbnail];
@@ -12,14 +11,9 @@
   });
   
   finalprev = (final: prev: {
-    # Patches go here
-  });
-
-  # Unstable nixpkgs
-  unstable-packages = final: _prev: {
     unstable = import inputs.nixpkgs-unstable {
       system = final.system;
       config.allowUnfree = true;
     };
-  };
+  });
 }
diff --git a/pkgs/default.nix b/extras/pkgs/default.nix
similarity index 100%
rename from pkgs/default.nix
rename to extras/pkgs/default.nix
diff --git a/pkgs/xash/change-zip-date.patch b/extras/pkgs/xash/change-zip-date.patch
similarity index 100%
rename from pkgs/xash/change-zip-date.patch
rename to extras/pkgs/xash/change-zip-date.patch
diff --git a/pkgs/xash/hlsdk.nix b/extras/pkgs/xash/hlsdk.nix
similarity index 100%
rename from pkgs/xash/hlsdk.nix
rename to extras/pkgs/xash/hlsdk.nix
diff --git a/pkgs/xash/xash3d.nix b/extras/pkgs/xash/xash3d.nix
similarity index 100%
rename from pkgs/xash/xash3d.nix
rename to extras/pkgs/xash/xash3d.nix
diff --git a/flake.nix b/flake.nix
index c1361de..6575ab2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,10 +37,10 @@
   in rec {
     # Your custom packages
     # Accessible through 'nix build', 'nix shell', etc
-    packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
+    packages = forAllSystems (system: import ./extras/pkgs nixpkgs.legacyPackages.${system});
 
     # Your custom packages and modifications, exported as overlays
-    overlays = import ./overlays {inherit inputs;};
+    overlays = import ./extras/overlays.nix {inherit inputs;};
 
     # Secrets defined so they can be accessed globally
     secrets = import ./secrets.nix;
diff --git a/system/base.nix b/system/base.nix
index 441f1e3..66f5511 100644
--- a/system/base.nix
+++ b/system/base.nix
@@ -12,7 +12,6 @@
       outputs.overlays.additions
       outputs.overlays.selfsuper
       outputs.overlays.finalprev
-      outputs.overlays.unstable-packages
     ];
 
     # Configure your nixpkgs instance