diff --git a/Cargo.lock b/Cargo.lock
index 9b6bb82d..c3039e0c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -21,7 +21,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
-name = "dnssec-tests"
+name = "dns-test"
 version = "0.1.0"
 dependencies = [
  "minijinja",
diff --git a/Cargo.toml b/Cargo.toml
index 72d5349d..225effa9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,3 @@
-[package]
-name = "dnssec-tests"
-version = "0.1.0"
-edition = "2021"
-license = "MIT or Apache 2.0"
-
-[dependencies]
-minijinja = "1.0.12"
-tempfile = "3.9.0"
-
-[lib]
-doctest = false
+[workspace]
+members = ["packages/*"]
+resolver = "2"
diff --git a/packages/dns-test/Cargo.toml b/packages/dns-test/Cargo.toml
new file mode 100644
index 00000000..a9c5e601
--- /dev/null
+++ b/packages/dns-test/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+edition = "2021"
+license = "MIT OR Apache-2.0"
+name = "dns-test"
+publish = false
+version = "0.1.0"
+
+[dependencies]
+minijinja = "1.0.12"
+tempfile = "3.9.0"
+
+[lib]
+doctest = false
diff --git a/src/client.rs b/packages/dns-test/src/client.rs
similarity index 100%
rename from src/client.rs
rename to packages/dns-test/src/client.rs
diff --git a/src/container.rs b/packages/dns-test/src/container.rs
similarity index 100%
rename from src/container.rs
rename to packages/dns-test/src/container.rs
diff --git a/src/docker/unbound.Dockerfile b/packages/dns-test/src/docker/unbound.Dockerfile
similarity index 100%
rename from src/docker/unbound.Dockerfile
rename to packages/dns-test/src/docker/unbound.Dockerfile
diff --git a/src/fqdn.rs b/packages/dns-test/src/fqdn.rs
similarity index 100%
rename from src/fqdn.rs
rename to packages/dns-test/src/fqdn.rs
diff --git a/src/lib.rs b/packages/dns-test/src/lib.rs
similarity index 88%
rename from src/lib.rs
rename to packages/dns-test/src/lib.rs
index 60f55948..05fa9d41 100644
--- a/src/lib.rs
+++ b/packages/dns-test/src/lib.rs
@@ -1,3 +1,5 @@
+//! A test framework for all things DNS
+
 pub use crate::fqdn::FQDN;
 pub use crate::recursive_resolver::RecursiveResolver;
 
diff --git a/src/name_server.rs b/packages/dns-test/src/name_server.rs
similarity index 100%
rename from src/name_server.rs
rename to packages/dns-test/src/name_server.rs
diff --git a/src/record.rs b/packages/dns-test/src/record.rs
similarity index 100%
rename from src/record.rs
rename to packages/dns-test/src/record.rs
diff --git a/src/recursive_resolver.rs b/packages/dns-test/src/recursive_resolver.rs
similarity index 100%
rename from src/recursive_resolver.rs
rename to packages/dns-test/src/recursive_resolver.rs
diff --git a/src/templates/nsd.conf.jinja b/packages/dns-test/src/templates/nsd.conf.jinja
similarity index 100%
rename from src/templates/nsd.conf.jinja
rename to packages/dns-test/src/templates/nsd.conf.jinja
diff --git a/src/templates/unbound.conf.jinja b/packages/dns-test/src/templates/unbound.conf.jinja
similarity index 100%
rename from src/templates/unbound.conf.jinja
rename to packages/dns-test/src/templates/unbound.conf.jinja
diff --git a/src/zone_file.rs b/packages/dns-test/src/zone_file.rs
similarity index 100%
rename from src/zone_file.rs
rename to packages/dns-test/src/zone_file.rs