diff --git a/ql/Cargo.lock b/ql/Cargo.lock
index 8d355f264b1..ac27495128e 100644
Binary files a/ql/Cargo.lock and b/ql/Cargo.lock differ
diff --git a/ql/Cargo.toml b/ql/Cargo.toml
index bb052f81d32..5e42fc8d5e5 100644
--- a/ql/Cargo.toml
+++ b/ql/Cargo.toml
@@ -1,7 +1,5 @@
 [workspace]
 members = [
-    "autobuilder",
     "extractor",
-    "generator",
     "buramu",
 ]
diff --git a/ql/autobuilder/Cargo.toml b/ql/autobuilder/Cargo.toml
deleted file mode 100644
index ac39f025ade..00000000000
--- a/ql/autobuilder/Cargo.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[package]
-name = "ql-autobuilder"
-version = "0.1.0"
-authors = ["GitHub"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
diff --git a/ql/autobuilder/src/main.rs b/ql/extractor/src/bin/autobuilder.rs
similarity index 100%
rename from ql/autobuilder/src/main.rs
rename to ql/extractor/src/bin/autobuilder.rs
diff --git a/ql/extractor/src/main.rs b/ql/extractor/src/bin/extractor.rs
similarity index 100%
rename from ql/extractor/src/main.rs
rename to ql/extractor/src/bin/extractor.rs
diff --git a/ql/generator/src/main.rs b/ql/extractor/src/bin/generator.rs
similarity index 100%
rename from ql/generator/src/main.rs
rename to ql/extractor/src/bin/generator.rs
diff --git a/ql/generator/Cargo.toml b/ql/generator/Cargo.toml
deleted file mode 100644
index 3a5665f33ae..00000000000
--- a/ql/generator/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "ql-generator"
-version = "0.1.0"
-authors = ["GitHub"]
-edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-clap = "2.33"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
-tree-sitter-ql = { git = "https://github.com/tree-sitter/tree-sitter-ql.git", rev = "d08db734f8dc52f6bc04db53a966603122bc6985"}
-tree-sitter-ql-dbscheme = { git = "https://github.com/erik-krogh/tree-sitter-ql-dbscheme.git", rev = "63e1344353f63931e88bfbc2faa2e78e1421b213"}
-tree-sitter-ql-yaml = {git = "https://github.com/erik-krogh/tree-sitter-ql.git", rev = "cf704bf3671e1ae148e173464fb65a4d2bbf5f99"}
-tree-sitter-blame = {path = "../buramu/tree-sitter-blame"}
-tree-sitter-json = { git = "https://github.com/tausbn/tree-sitter-json.git", rev = "745663ee997f1576fe1e7187e6347e0db36ec7a9"}
-codeql-extractor = { path = "../../shared/extractor" }
diff --git a/ql/scripts/create-extractor-pack.ps1 b/ql/scripts/create-extractor-pack.ps1
index 65b4dfc348a..1229621c2c1 100644
--- a/ql/scripts/create-extractor-pack.ps1
+++ b/ql/scripts/create-extractor-pack.ps1
@@ -1,6 +1,6 @@
 cargo build --release
 
-cargo run --release -p ql-generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
+cargo run --release --bin generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
 codeql query format -i ql\src\codeql_ql\ast\internal\TreeSitter.qll
 
 if (Test-Path -Path extractor-pack) {
@@ -10,5 +10,5 @@ mkdir extractor-pack | Out-Null
 cp codeql-extractor.yml, ql\src\ql.dbscheme, ql\src\ql.dbscheme.stats extractor-pack
 cp -Recurse tools extractor-pack
 mkdir extractor-pack\tools\win64 | Out-Null
-cp target\release\ql-extractor.exe extractor-pack\tools\win64\extractor.exe
-cp target\release\ql-autobuilder.exe extractor-pack\tools\win64\autobuilder.exe
+cp target\release\extractor.exe extractor-pack\tools\win64\extractor.exe
+cp target\release\autobuilder.exe extractor-pack\tools\win64\autobuilder.exe
diff --git a/ql/scripts/create-extractor-pack.sh b/ql/scripts/create-extractor-pack.sh
index d1b3c6312d9..01fbc2ad5a7 100755
--- a/ql/scripts/create-extractor-pack.sh
+++ b/ql/scripts/create-extractor-pack.sh
@@ -20,13 +20,12 @@ else
 fi
 
 cargo build --release
-
-cargo run --release -p ql-generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
+cargo run --release --bin generator -- --dbscheme ql/src/ql.dbscheme --library ql/src/codeql_ql/ast/internal/TreeSitter.qll
 $CODEQL_BINARY query format -i ql/src/codeql_ql/ast/internal/TreeSitter.qll
 
 rm -rf extractor-pack
 mkdir -p extractor-pack
 cp -r codeql-extractor.yml tools ql/src/ql.dbscheme ql/src/ql.dbscheme.stats extractor-pack/
 mkdir -p extractor-pack/tools/${platform}
-cp target/release/ql-extractor extractor-pack/tools/${platform}/extractor
-cp target/release/ql-autobuilder extractor-pack/tools/${platform}/autobuilder
+cp target/release/extractor extractor-pack/tools/${platform}/extractor
+cp target/release/autobuilder extractor-pack/tools/${platform}/autobuilder