diff --git a/basil-tool.nix b/basil/basil-tool.nix
similarity index 100%
rename from basil-tool.nix
rename to basil/basil-tool.nix
diff --git a/basil.nix b/basil/basil.nix
similarity index 100%
rename from basil.nix
rename to basil/basil.nix
diff --git a/godbolt-basil.nix b/basil/godbolt-basil.nix
similarity index 100%
rename from godbolt-basil.nix
rename to basil/godbolt-basil.nix
diff --git a/basil/overlay.nix b/basil/overlay.nix
new file mode 100644
index 0000000..2f08444
--- /dev/null
+++ b/basil/overlay.nix
@@ -0,0 +1,20 @@
+let 
+  sbt-drv-repo = builtins.fetchTarball {
+    url = "https://github.com/zaninime/sbt-derivation/archive/master.tar.gz";
+  };
+  sbt-drv-overlay = import "${sbt-drv-repo}/overlay.nix";
+
+  overlay = final: prev: 
+    {
+      basil = (prev.callPackage ./basil.nix {})
+        # .overrideAttrs { src = prev.lib.cleanSource ~/progs/basil; }
+        ;
+
+      godbolt-basil = (prev.callPackage ./godbolt-basil.nix {});
+      basil-tool = prev.callPackage ./basil-tool.nix {};
+
+      jre = final.temurin-jre-bin-17;
+      jdk = final.temurin-bin-17;
+    };
+in final: prev: 
+  prev.lib.composeExtensions sbt-drv-overlay overlay final prev
diff --git a/overlay.nix b/overlay.nix
index 8dfa5c9..e955c82 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,9 +1,4 @@
 let 
-  sbt-drv-repo = builtins.fetchTarball {
-    url = "https://github.com/zaninime/sbt-derivation/archive/master.tar.gz";
-  };
-  sbt-drv-overlay = import "${sbt-drv-repo}/overlay.nix";
-
   overlay = final: prev: 
     {
       asli = (prev.callPackage ./asli.nix {})
@@ -22,16 +17,8 @@ let
 
       bap-primus = prev.callPackage ./bap-primus.nix {};
 
-      basil = (prev.callPackage ./basil.nix {})
-        # .overrideAttrs { src = prev.lib.cleanSource ~/progs/basil; }
-        ;
-
-
-      godbolt-basil = (prev.callPackage ./godbolt-basil.nix {});
-      basil-tool = prev.callPackage ./basil-tool.nix {};
-
-      jre = final.temurin-jre-bin-17;
-      jdk = final.temurin-bin-17;
+      # MOVED: basil-related packages now in ./basil/overlay.nix
+      basil = prev.basil;
 
       # llvm-translator packages 
       asl-translator = prev.callPackage ./llvm-translator/asl-translator.nix {};
@@ -39,7 +26,8 @@ let
       retdec-uq-pac = prev.callPackage ./llvm-translator/retdec-uq-pac.nix { retdec = final.retdec5; };
       llvm-rtti-eh = prev.callPackage ./llvm-translator/llvm-rtti-eh.nix {};
       alive2 = prev.callPackage ./llvm-translator/alive2.nix {};
-
     };
 in final: prev: 
-  prev.lib.composeExtensions sbt-drv-overlay overlay final prev
+  prev.lib.composeManyExtensions
+    [ overlay (import ./basil/overlay.nix) ]
+    final prev