diff --git a/filtermail/.github/dependabot.yml b/.github/dependabot.yml
similarity index 90%
rename from filtermail/.github/dependabot.yml
rename to .github/dependabot.yml
index 83fb5346..8bf7efb9 100644
--- a/filtermail/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,7 +1,7 @@
 version: 2
 updates:
   - package-ecosystem: "cargo"
-    directory: "/"
+    directory: "/filtermail"
     schedule:
       interval: "monthly"
     cooldown:
diff --git a/filtermail/.github/workflows/ci.yml b/.github/workflows/filtermail-ci.yml
similarity index 82%
rename from filtermail/.github/workflows/ci.yml
rename to .github/workflows/filtermail-ci.yml
index 605333bc..f2b69099 100644
--- a/filtermail/.github/workflows/ci.yml
+++ b/.github/workflows/filtermail-ci.yml
@@ -27,11 +27,11 @@ jobs:
         with:
           toolchain: nightly
           components: rustfmt
-      - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2
-      - uses: taiki-e/install-action@2ca9b94c269419b7b0c711c09d0b21c4e1d51145 # v2
+      - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
+      - uses: taiki-e/install-action@2ca9b94c269419b7b0c711c09d0b21c4e1d51145 # v2.83.1
         with:
           tool: taplo-cli
-      - run: taplo format --check && cargo fmt --check
+      - run: cd filtermail && taplo format --check && cargo fmt --check
 
   cargo-machete:
     name: Check Unused Dependencies
@@ -58,8 +58,8 @@ jobs:
         with:
           toolchain: ${{ matrix.toolchain }}
           components: clippy
-      - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2
-      - run: cargo clippy
+      - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
+      - run: cd filtermail && cargo clippy
         env:
           RUSTUP_TOOLCHAIN: ${{ matrix.toolchain }}
 
@@ -73,8 +73,8 @@ jobs:
       - uses: dtolnay/rust-toolchain@2c7215f132e9ebf062739d9130488b56d53c060c # master
         with:
           toolchain: stable
-      - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2
-      - run: cargo test
+      - uses: Swatinem/rust-cache@c19371144df3bb44fab255c43d04cbc2ab54d1c4 # v2.9.1
+      - run: cd filtermail && cargo test
 
   relay-test:
     name: Test the relay with cmlxc and custom filtermail
@@ -84,10 +84,10 @@ jobs:
         sudo apt-get update && sudo apt-get install -y musl-tools
         rustup target add x86_64-unknown-linux-musl
         export CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc
-        cd repo && RUSTFLAGS="-Ctarget-feature=+crt-static -Clink-self-contained=yes" cargo build --release --target x86_64-unknown-linux-musl
+        cd repo/filtermail && RUSTFLAGS="-Ctarget-feature=+crt-static -Clink-self-contained=yes" cargo build --release --target x86_64-unknown-linux-musl
         cmlxc init
-        cmlxc -v deploy-cmdeploy --filtermail repo/target/x86_64-unknown-linux-musl/release/filtermail cm0
-        cmlxc -v deploy-cmdeploy --filtermail repo/target/x86_64-unknown-linux-musl/release/filtermail --type ipv4 cm1
+        cmlxc -v deploy-cmdeploy --filtermail repo/filtermail/target/x86_64-unknown-linux-musl/release/filtermail cm0
+        cmlxc -v deploy-cmdeploy --filtermail repo/filtermail/target/x86_64-unknown-linux-musl/release/filtermail --type ipv4 cm1
         cmlxc -v deploy-madmail mad0
 
         # single-relay tests
diff --git a/filtermail/.github/workflows/release.yml b/.github/workflows/filtermail-release.yml
similarity index 94%
rename from filtermail/.github/workflows/release.yml
rename to .github/workflows/filtermail-release.yml
index af1825df..d2f99d3a 100644
--- a/filtermail/.github/workflows/release.yml
+++ b/.github/workflows/filtermail-release.yml
@@ -1,9 +1,11 @@
 on:
-  release:
-    types: [published]
+  tags:
+    - 'filtermail-*'
+
 
 jobs:
   build:
+    permissions: {}
     name: Build binaries.
     runs-on: ubuntu-latest
     steps:
@@ -14,14 +16,14 @@ jobs:
         with:
           toolchain: stable
           targets: aarch64-unknown-linux-musl,x86_64-unknown-linux-musl
-      - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2
-      - uses: taiki-e/install-action@2ca9b94c269419b7b0c711c09d0b21c4e1d51145 # v2
+      - uses: mlugg/setup-zig@d1434d08867e3ee9daa34448df10607b98908d29 # v2.2.1
+      - uses: taiki-e/install-action@2ca9b94c269419b7b0c711c09d0b21c4e1d51145 # v2.83.1
         with:
           tool: cargo-zigbuild
       - name: Build
         run: |
           RUSTFLAGS="-Ctarget-feature=+crt-static -Clink-self-contained=yes" \
-          cargo zigbuild \
+          cd filtermail && cargo zigbuild \
             --release \
             --target x86_64-unknown-linux-musl \
             --target aarch64-unknown-linux-musl
diff --git a/.gitignore b/.gitignore
index c0f40b9b..24e6cbf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,6 +78,7 @@ docs/_build/
 # PyBuilder
 .pybuilder/
 target/
+filtermail/target/
 
 # Jupyter Notebook
 .ipynb_checkpoints
diff --git a/filtermail/.gitignore b/filtermail/.gitignore
deleted file mode 100644
index ea8c4bf7..00000000
--- a/filtermail/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target