diff --git a/rust/.github/workflows/checks.yml b/.github/workflows/checks.yml
similarity index 95%
rename from rust/.github/workflows/checks.yml
rename to .github/workflows/checks.yml
index 88a094618..1e45f0828 100644
--- a/rust/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -1,4 +1,4 @@
-name: Checks
+name: checks
 
 on:
   push:
@@ -10,7 +10,7 @@ on:
 jobs:
   clippy:
     runs-on: ubuntu-latest
-    name: "Clippy"
+    name: "Check & Clippy"
 
     steps:
       - uses: actions/checkout@v2
@@ -79,8 +79,8 @@ jobs:
       - name: Create usage-docs plugin
         run: cargo build -p taskchampion-cli --features usage-docs --bin usage-docs
 
-      - run: mdbook test docs
-      - run: mdbook build docs
+      - run: mdbook test rust/docs
+      - run: mdbook build rust/docs
 
   fmt:
     runs-on: ubuntu-latest
diff --git a/rust/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yml
similarity index 99%
rename from rust/.github/workflows/publish-docs.yml
rename to .github/workflows/publish-docs.yml
index 83dceb76c..3362bdb57 100644
--- a/rust/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -1,4 +1,4 @@
-name: Docs
+name: docs
 
 on:
   push:
diff --git a/rust/.github/workflows/tests.yml b/.github/workflows/rust-tests.yml
similarity index 93%
rename from rust/.github/workflows/tests.yml
rename to .github/workflows/rust-tests.yml
index 05ccd9ad3..206eb88d4 100644
--- a/rust/.github/workflows/tests.yml
+++ b/.github/workflows/rust-tests.yml
@@ -1,4 +1,4 @@
-name: Tests
+name: tests - rust
 
 on:
   push:
@@ -20,7 +20,7 @@ jobs:
           - macOS-latest
           - windows-latest
 
-    name: "Test - Rust ${{ matrix.rust }} on ${{ matrix.os }}"
+    name: "rust ${{ matrix.rust }} on ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
 
     steps:
diff --git a/rust/.github/workflows/audit.yml b/.github/workflows/security.yml
similarity index 95%
rename from rust/.github/workflows/audit.yml
rename to .github/workflows/security.yml
index 7454b8b58..19ebbba8f 100644
--- a/rust/.github/workflows/audit.yml
+++ b/.github/workflows/security.yml
@@ -1,4 +1,4 @@
-name: Security
+name: security
 
 on:
   schedule:
diff --git a/.gitignore b/.gitignore
index 03300d5c8..e056d115a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ patches
 *.exe
 tutorials
 .prove
+/target/
diff --git a/rust/Cargo.lock b/Cargo.lock
similarity index 100%
rename from rust/Cargo.lock
rename to Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 000000000..32e10dd3d
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,10 @@
+[workspace]
+
+members = [
+    "rust/taskchampion",
+    "rust/cli",
+    "rust/sync-server",
+    "rust/lib",
+    "rust/integration-tests",
+    "rust/xtask",
+]
diff --git a/rust/.gitignore b/rust/.gitignore
index 53eaa2196..72429aeef 100644
--- a/rust/.gitignore
+++ b/rust/.gitignore
@@ -1,2 +1 @@
-/target
 **/*.rs.bk
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
deleted file mode 100644
index 701f3839e..000000000
--- a/rust/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-[workspace]
-
-members = [
-    "taskchampion",
-    "cli",
-    "sync-server",
-    "lib",
-    "integration-tests",
-    "xtask",
-]