diff --git a/bbq2/.github/workflows/build.yml b/.github/workflows/build.yml
similarity index 95%
rename from bbq2/.github/workflows/build.yml
rename to .github/workflows/build.yml
index 1672629..4bff01d 100644
--- a/bbq2/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,8 +7,12 @@ on:
     branches: ["main"]
   workflow_dispatch:
 
+defaults:
+  run:
+    working-directory: ./bbq2
+
 jobs:
-  miri:
+  build:
     name: "Build all crates"
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/doctests.yml b/.github/workflows/doctests.yml
deleted file mode 100644
index 042917f..0000000
--- a/.github/workflows/doctests.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-name: Documentation Tests
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - features: thumbv6
-            nodefault: "--no-default-features"
-          - features: ""
-            nodefault: ""
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: ${{ matrix.nodefault }} --features=${{ matrix.features }} --manifest-path core/Cargo.toml
diff --git a/.github/workflows/embedded-builds.yml b/.github/workflows/embedded-builds.yml
deleted file mode 100644
index 5441661..0000000
--- a/.github/workflows/embedded-builds.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-name: Embedded Builds
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - features: ""
-            target: thumbv7em-none-eabihf
-          - feature: thumbv6
-            target: thumbv6m-none-eabi
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: thumbv6m-none-eabi, thumbv7em-none-eabihf
-
-      - run: cargo build --manifest-path core/Cargo.toml --no-default-features --features=${{ matrix.feature }} --target=${{ matrix.target }}
diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
deleted file mode 100644
index 9f7c138..0000000
--- a/.github/workflows/fmt.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-name: Formatting check
-
-jobs:
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          components: rustfmt
-      - run: cargo fmt --all -- --check
diff --git a/.github/workflows/full-test.yml b/.github/workflows/full-test.yml
deleted file mode 100644
index 683ef22..0000000
--- a/.github/workflows/full-test.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-name: Integration Tests
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - build: ""
-          - build: "--release"
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
-      - run: cargo test ${{ matrix.build }} --features=short-potato --manifest-path bbqtest/Cargo.toml -- --nocapture
diff --git a/bbq2/.github/workflows/miri.yml b/.github/workflows/miri.yml
similarity index 90%
rename from bbq2/.github/workflows/miri.yml
rename to .github/workflows/miri.yml
index d8ae0e3..90debb3 100644
--- a/bbq2/.github/workflows/miri.yml
+++ b/.github/workflows/miri.yml
@@ -7,6 +7,10 @@ on:
     branches: ["main"]
   workflow_dispatch:
 
+defaults:
+  run:
+    working-directory: ./bbq2
+
 jobs:
   miri:
     name: "miri all the things"
diff --git a/Cargo.toml b/Cargo.toml
index f5deb65..6f72169 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,7 @@
 [workspace]
-members = ["bbqtest", "core"]
-exclude = ["bbq2"]
+resolver = "3"
+members = [
+    "bbq2",
+    "legacy-bbqtest",
+    "legacy-core",
+]
diff --git a/bbqtest/Cargo.toml b/legacy-bbqtest/Cargo.toml
similarity index 96%
rename from bbqtest/Cargo.toml
rename to legacy-bbqtest/Cargo.toml
index 3e9a930..b219766 100644
--- a/bbqtest/Cargo.toml
+++ b/legacy-bbqtest/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 bounded-spsc-queue = { version = "0.4.0", optional = true }
 
 [dependencies.bbqueue]
-path = "../core"
+path = "../legacy-core"
 
 
 [dev-dependencies]
diff --git a/bbqtest/src/benches.rs b/legacy-bbqtest/src/benches.rs
similarity index 100%
rename from bbqtest/src/benches.rs
rename to legacy-bbqtest/src/benches.rs
diff --git a/bbqtest/src/framed.rs b/legacy-bbqtest/src/framed.rs
similarity index 100%
rename from bbqtest/src/framed.rs
rename to legacy-bbqtest/src/framed.rs
diff --git a/bbqtest/src/lib.rs b/legacy-bbqtest/src/lib.rs
similarity index 100%
rename from bbqtest/src/lib.rs
rename to legacy-bbqtest/src/lib.rs
diff --git a/bbqtest/src/multi_thread.rs b/legacy-bbqtest/src/multi_thread.rs
similarity index 100%
rename from bbqtest/src/multi_thread.rs
rename to legacy-bbqtest/src/multi_thread.rs
diff --git a/bbqtest/src/ring_around_the_senders.rs b/legacy-bbqtest/src/ring_around_the_senders.rs
similarity index 100%
rename from bbqtest/src/ring_around_the_senders.rs
rename to legacy-bbqtest/src/ring_around_the_senders.rs
diff --git a/bbqtest/src/single_thread.rs b/legacy-bbqtest/src/single_thread.rs
similarity index 100%
rename from bbqtest/src/single_thread.rs
rename to legacy-bbqtest/src/single_thread.rs
diff --git a/core/Cargo.toml b/legacy-core/Cargo.toml
similarity index 100%
rename from core/Cargo.toml
rename to legacy-core/Cargo.toml
diff --git a/core/src/bbbuffer.rs b/legacy-core/src/bbbuffer.rs
similarity index 100%
rename from core/src/bbbuffer.rs
rename to legacy-core/src/bbbuffer.rs
diff --git a/core/src/framed.rs b/legacy-core/src/framed.rs
similarity index 100%
rename from core/src/framed.rs
rename to legacy-core/src/framed.rs
diff --git a/core/src/lib.rs b/legacy-core/src/lib.rs
similarity index 100%
rename from core/src/lib.rs
rename to legacy-core/src/lib.rs
diff --git a/core/src/vusize.rs b/legacy-core/src/vusize.rs
similarity index 100%
rename from core/src/vusize.rs
rename to legacy-core/src/vusize.rs