diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index 56d433fd..61bc6f6d 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -18,7 +18,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@c449d86cf33a2a6c7a4193264cc2578e2c3266d4 # pin@v4
         with:
-          paths_ignore: '["cli/**", "github/**", "linter/**","parser/**"]'
+          paths_ignore: '["crates/**"]'
 
   typescript:
     needs: pre_job
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 4db69ca6..9fa57eed 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -50,7 +50,7 @@ jobs:
         with:
           target: ${{ matrix.platform.target }}
           maturin-version: v1.7.1
-          working-directory: crates/cli
+          working-directory: crates/squawk
           args: --release --out dist ${{ matrix.platform.maturin-options }}
           manylinux: ${{ matrix.platform.manylinux }}
           sccache: "true"
@@ -59,7 +59,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: wheels-linux-${{ matrix.platform.target }}
-          path: crates/cli/dist
+          path: crates/squawk/dist
           if-no-files-found: error
 
   windows:
@@ -79,14 +79,14 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          working-directory: crates/cli
+          working-directory: crates/squawk
           args: --release --out dist
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
           name: wheels-windows-${{ matrix.platform.target }}
-          path: crates/cli/dist
+          path: crates/squawk/dist
           if-no-files-found: error
 
   macos:
@@ -106,14 +106,14 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.platform.target }}
-          working-directory: crates/cli
+          working-directory: crates/squawk
           args: --release --out dist
           sccache: "true"
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
           name: wheels-macos-${{ matrix.platform.target }}
-          path: crates/cli/dist
+          path: crates/squawk/dist
           if-no-files-found: error
 
   sdist:
@@ -126,13 +126,13 @@ jobs:
         uses: PyO3/maturin-action@v1
         with:
           command: sdist
-          working-directory: crates/cli
+          working-directory: crates/squawk
           args: --out dist
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with:
           name: wheels-sdist
-          path: crates/cli/dist
+          path: crates/squawk/dist
           if-no-files-found: error
 
   release:
diff --git a/Cargo.lock b/Cargo.lock
index a06025a2..2a1f8f0e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2558,7 +2558,7 @@ dependencies = [
  "serde",
  "serde_json",
  "simplelog",
- "squawk-github",
+ "squawk_github",
  "squawk_lexer",
  "squawk_linter",
  "squawk_syntax",
@@ -2568,7 +2568,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "squawk-github"
+name = "squawk_github"
 version = "0.0.0"
 dependencies = [
  "jsonwebtoken",
diff --git a/Cargo.toml b/Cargo.toml
index c21f8336..c757f6b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ convert_case = "0.7.1"
 clap = { version = "4.5.8", features = ["derive"] }
 
 # local
-squawk-github = { version = "0.0.0", path = "./crates/github" }
+squawk_github = { version = "0.0.0", path = "./crates/squawk_github" }
 squawk_lexer = { version = "0.0.0", path = "./crates/squawk_lexer" }
 squawk_parser = { version = "0.0.0", path = "./crates/squawk_parser" }
 squawk_syntax = { version = "0.0.0", path = "./crates/squawk_syntax" }
diff --git a/crates/cli/Cargo.toml b/crates/squawk/Cargo.toml
similarity index 97%
rename from crates/cli/Cargo.toml
rename to crates/squawk/Cargo.toml
index a41291b1..47c7d2e3 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/squawk/Cargo.toml
@@ -29,7 +29,7 @@ enum-iterator.workspace = true
 squawk_syntax.workspace = true
 squawk_linter.workspace = true
 squawk_lexer.workspace = true
-squawk-github.workspace = true
+squawk_github.workspace = true
 toml.workspace = true
 glob.workspace = true
 anyhow.workspace = true
diff --git a/crates/cli/pyproject.toml b/crates/squawk/pyproject.toml
similarity index 100%
rename from crates/cli/pyproject.toml
rename to crates/squawk/pyproject.toml
diff --git a/crates/cli/src/config.rs b/crates/squawk/src/config.rs
similarity index 100%
rename from crates/cli/src/config.rs
rename to crates/squawk/src/config.rs
diff --git a/crates/cli/src/debug.rs b/crates/squawk/src/debug.rs
similarity index 100%
rename from crates/cli/src/debug.rs
rename to crates/squawk/src/debug.rs
diff --git a/crates/cli/src/file.rs b/crates/squawk/src/file.rs
similarity index 100%
rename from crates/cli/src/file.rs
rename to crates/squawk/src/file.rs
diff --git a/crates/cli/src/file_finding.rs b/crates/squawk/src/file_finding.rs
similarity index 100%
rename from crates/cli/src/file_finding.rs
rename to crates/squawk/src/file_finding.rs
diff --git a/crates/cli/src/github.rs b/crates/squawk/src/github.rs
similarity index 100%
rename from crates/cli/src/github.rs
rename to crates/squawk/src/github.rs
diff --git a/crates/cli/src/main.rs b/crates/squawk/src/main.rs
similarity index 100%
rename from crates/cli/src/main.rs
rename to crates/squawk/src/main.rs
diff --git a/crates/cli/src/reporter.rs b/crates/squawk/src/reporter.rs
similarity index 100%
rename from crates/cli/src/reporter.rs
rename to crates/squawk/src/reporter.rs
diff --git a/crates/cli/src/snapshots/squawk__config__test_config__load_assume_in_transaction.snap b/crates/squawk/src/snapshots/squawk__config__test_config__load_assume_in_transaction.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__config__test_config__load_assume_in_transaction.snap
rename to crates/squawk/src/snapshots/squawk__config__test_config__load_assume_in_transaction.snap
diff --git a/crates/cli/src/snapshots/squawk__config__test_config__load_cfg_full.snap b/crates/squawk/src/snapshots/squawk__config__test_config__load_cfg_full.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__config__test_config__load_cfg_full.snap
rename to crates/squawk/src/snapshots/squawk__config__test_config__load_cfg_full.snap
diff --git a/crates/cli/src/snapshots/squawk__config__test_config__load_excluded_paths.snap b/crates/squawk/src/snapshots/squawk__config__test_config__load_excluded_paths.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__config__test_config__load_excluded_paths.snap
rename to crates/squawk/src/snapshots/squawk__config__test_config__load_excluded_paths.snap
diff --git a/crates/cli/src/snapshots/squawk__config__test_config__load_excluded_rules.snap b/crates/squawk/src/snapshots/squawk__config__test_config__load_excluded_rules.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__config__test_config__load_excluded_rules.snap
rename to crates/squawk/src/snapshots/squawk__config__test_config__load_excluded_rules.snap
diff --git a/crates/cli/src/snapshots/squawk__config__test_config__load_fail_on_violations.snap b/crates/squawk/src/snapshots/squawk__config__test_config__load_fail_on_violations.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__config__test_config__load_fail_on_violations.snap
rename to crates/squawk/src/snapshots/squawk__config__test_config__load_fail_on_violations.snap
diff --git a/crates/cli/src/snapshots/squawk__config__test_config__load_pg_version.snap b/crates/squawk/src/snapshots/squawk__config__test_config__load_pg_version.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__config__test_config__load_pg_version.snap
rename to crates/squawk/src/snapshots/squawk__config__test_config__load_pg_version.snap
diff --git a/crates/cli/src/snapshots/squawk__github__test_github_comment__generating_comment_multiple_files.snap b/crates/squawk/src/snapshots/squawk__github__test_github_comment__generating_comment_multiple_files.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__github__test_github_comment__generating_comment_multiple_files.snap
rename to crates/squawk/src/snapshots/squawk__github__test_github_comment__generating_comment_multiple_files.snap
diff --git a/crates/cli/src/snapshots/squawk__github__test_github_comment__generating_comment_no_violations.snap b/crates/squawk/src/snapshots/squawk__github__test_github_comment__generating_comment_no_violations.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__github__test_github_comment__generating_comment_no_violations.snap
rename to crates/squawk/src/snapshots/squawk__github__test_github_comment__generating_comment_no_violations.snap
diff --git a/crates/cli/src/snapshots/squawk__github__test_github_comment__generating_no_violations_no_files.snap b/crates/squawk/src/snapshots/squawk__github__test_github_comment__generating_no_violations_no_files.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__github__test_github_comment__generating_no_violations_no_files.snap
rename to crates/squawk/src/snapshots/squawk__github__test_github_comment__generating_no_violations_no_files.snap
diff --git a/crates/cli/src/snapshots/squawk__reporter__test_check_files__check_files_invalid_syntax.snap b/crates/squawk/src/snapshots/squawk__reporter__test_check_files__check_files_invalid_syntax.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__reporter__test_check_files__check_files_invalid_syntax.snap
rename to crates/squawk/src/snapshots/squawk__reporter__test_check_files__check_files_invalid_syntax.snap
diff --git a/crates/cli/src/snapshots/squawk__reporter__test_reporter__display_no_violations_tty.snap b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_no_violations_tty.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__reporter__test_reporter__display_no_violations_tty.snap
rename to crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_no_violations_tty.snap
diff --git a/crates/cli/src/snapshots/squawk__reporter__test_reporter__display_violations_tty.snap b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__reporter__test_reporter__display_violations_tty.snap
rename to crates/squawk/src/snapshots/squawk__reporter__test_reporter__display_violations_tty.snap
diff --git a/crates/cli/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap b/crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap
similarity index 100%
rename from crates/cli/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap
rename to crates/squawk/src/snapshots/squawk__reporter__test_reporter__span_offsets.snap
diff --git a/crates/github/Cargo.toml b/crates/squawk_github/Cargo.toml
similarity index 95%
rename from crates/github/Cargo.toml
rename to crates/squawk_github/Cargo.toml
index 1e6e7b15..0cc4c008 100644
--- a/crates/github/Cargo.toml
+++ b/crates/squawk_github/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "squawk-github"
+name = "squawk_github"
 version = "0.0.0"
 authors = ["Steve Dignam <steve@dignam.xyz>"]
 edition = "2018"
diff --git a/crates/github/README.md b/crates/squawk_github/README.md
similarity index 87%
rename from crates/github/README.md
rename to crates/squawk_github/README.md
index f29e3b1f..fc3acc2d 100644
--- a/crates/github/README.md
+++ b/crates/squawk_github/README.md
@@ -1,3 +1,3 @@
-# squawk-github
+# squawk_github
 
 A small wrapper around the GitHub API to allow [`squawk`](https://github.com/sbdchd/squawk) to comment on PRs.
diff --git a/crates/github/src/actions.rs b/crates/squawk_github/src/actions.rs
similarity index 100%
rename from crates/github/src/actions.rs
rename to crates/squawk_github/src/actions.rs
diff --git a/crates/github/src/app.rs b/crates/squawk_github/src/app.rs
similarity index 100%
rename from crates/github/src/app.rs
rename to crates/squawk_github/src/app.rs
diff --git a/crates/github/src/lib.rs b/crates/squawk_github/src/lib.rs
similarity index 100%
rename from crates/github/src/lib.rs
rename to crates/squawk_github/src/lib.rs
diff --git a/s/check-version b/s/check-version
index ae200496..32ee71c4 100755
--- a/s/check-version
+++ b/s/check-version
@@ -38,7 +38,7 @@ CLI_VERSION_PATTERN = r"version = \"(?P<version>\d+\.\d+\.\d+)\""
 
 
 def find_cli_version() -> str:
-    cargo_toml = squawk_root() / "crates" / "cli" / "Cargo.toml"
+    cargo_toml = squawk_root() / "crates/squawk/Cargo.toml"
     for line in cargo_toml.read_text().split("\n"):
         match = re.match(CLI_VERSION_PATTERN, line)
         if match is not None:
diff --git a/s/publish b/s/publish
deleted file mode 100755
index 3c4bee23..00000000
--- a/s/publish
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-cargo publish --manifest-path parser/Cargo.toml
-cargo publish --manifest-path linter/Cargo.toml
-cargo publish --manifest-path github/Cargo.toml
-cargo publish --manifest-path cli/Cargo.toml
diff --git a/s/update-version b/s/update-version
index bd13e427..d176158a 100755
--- a/s/update-version
+++ b/s/update-version
@@ -6,7 +6,7 @@
 function main {
     NEW_VERSION="$1"
     echo "updating version to '$NEW_VERSION'..."
-    fastmod '^version = ".*"' 'version = "'$NEW_VERSION'"' crates/cli/Cargo.toml
+    fastmod '^version = ".*"' 'version = "'$NEW_VERSION'"' crates/squawk/Cargo.toml
     fastmod -m '(name = "squawk"\n)version = ".*?"' '${1}version = "'$NEW_VERSION'"' Cargo.lock
     fastmod '"version": ".*"' '"version": "'$NEW_VERSION'"' package.json
     fastmod -m '(pname = "squawk";.*?)version = ".*?"' '${1}version = "'$NEW_VERSION'"' flake.nix