diff --git a/Cargo.toml b/Cargo.toml
index 9329f3c..ff6532b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,25 +1,14 @@
-[package]
-name = "test-context"
-version = "0.1.4"
+[workspace]
+resolver = "2"
+members = ["test-context", "test-context-macros"]
+
+[workspace.package]
 edition = "2021"
-description = "A library for providing custom setup/teardown for Rust tests without needing a test harness"
+version = "0.1.4"
 homepage = "https://github.com/JasterV/test-context"
 repository = "https://github.com/JasterV/test-context"
-readme = "README.md"
 authors = [
   "Mark Hildreth <mark.k.hildreth@gmail.com>",
   "Victor Martinez <victor.martinez@jaster.xyz>",
 ]
 license = "MIT"
-categories = ["development-tools::testing"]
-
-[dependencies]
-test-context-macros = { version = "0.1.4", path = "macros" }
-async-trait = "0.1.42"
-futures = "0.3"
-
-[dev-dependencies]
-tokio = { version = "1.0", features = ["macros", "rt"] }
-
-[workspace]
-members = ["macros"]
diff --git a/macros/Cargo.toml b/test-context-macros/Cargo.toml
similarity index 51%
rename from macros/Cargo.toml
rename to test-context-macros/Cargo.toml
index 9dc08fe..993a00d 100644
--- a/macros/Cargo.toml
+++ b/test-context-macros/Cargo.toml
@@ -1,15 +1,12 @@
 [package]
 name = "test-context-macros"
-version = "0.1.4"
-edition = "2021"
 description = "Macro crate for test-context"
-homepage = "https://github.com/JasterV/test-context"
-repository = "https://github.com/JasterV/test-context"
-authors = [
-  "Mark Hildreth <mark.k.hildreth@gmail.com>",
-  "Victor Martinez <victor.martinez@jaster.xyz>",
-]
-license = "MIT"
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+authors.workspace = true
+license.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
diff --git a/macros/src/lib.rs b/test-context-macros/src/lib.rs
similarity index 100%
rename from macros/src/lib.rs
rename to test-context-macros/src/lib.rs
diff --git a/test-context/Cargo.toml b/test-context/Cargo.toml
new file mode 100644
index 0000000..200a638
--- /dev/null
+++ b/test-context/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "test-context"
+description = "A library for providing custom setup/teardown for Rust tests without needing a test harness"
+readme = "../README.md"
+keywords = ["test", "setup", "teardown"]
+categories = ["development-tools::testing"]
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+authors.workspace = true
+license.workspace = true
+
+[dependencies]
+test-context-macros = { version = "0.1.4", path = "../test-context-macros/" }
+async-trait = "0.1.42"
+futures = "0.3"
+
+[dev-dependencies]
+tokio = { version = "1.0", features = ["macros", "rt"] }
diff --git a/src/lib.rs b/test-context/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to test-context/src/lib.rs
diff --git a/tests/test.rs b/test-context/tests/test.rs
similarity index 100%
rename from tests/test.rs
rename to test-context/tests/test.rs