diff --git a/Cargo.lock b/Cargo.lock
index 7f1d22e7..6ee17376 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -444,7 +444,7 @@ dependencies = [
  "claims",
  "rew_components",
  "rew_core",
- "rew_fixtures",
+ "rew_fixture",
 ]
 
 [[package]]
@@ -515,7 +515,7 @@ dependencies = [
  "num-traits",
  "owo-colors",
  "rew_core",
- "rew_fixtures",
+ "rew_fixture",
  "rstest",
  "thiserror",
 ]
@@ -541,13 +541,13 @@ dependencies = [
  "rew_adapters",
  "rew_components",
  "rew_core",
- "rew_fixtures",
+ "rew_fixture",
  "rew_io",
  "rstest",
 ]
 
 [[package]]
-name = "rew_fixtures"
+name = "rew_fixture"
 version = "0.4.0"
 dependencies = [
  "anyhow",
@@ -566,7 +566,7 @@ dependencies = [
  "claims",
  "owo-colors",
  "rew_core",
- "rew_fixtures",
+ "rew_fixture",
  "rstest",
  "thiserror",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index f76b3cd8..dbe038d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["xtask", "crates/bin", "crates/libs/*", "crates/commands/*"]
+members = ["xtask", "crates/bin", "crates/lib/*", "crates/command/*"]
 
 [workspace.package]
 version = "0.4.0"
diff --git a/crates/bin/Cargo.toml b/crates/bin/Cargo.toml
index 37cd353c..e6cd4493 100644
--- a/crates/bin/Cargo.toml
+++ b/crates/bin/Cargo.toml
@@ -13,4 +13,4 @@ edition.workspace = true
 
 [dependencies]
 anyhow.workspace = true
-rew_app = { path = "../libs/app" }
+rew_app = { path = "../lib/app" }
diff --git a/crates/commands/ascii/Cargo.toml b/crates/command/ascii/Cargo.toml
similarity index 60%
rename from crates/commands/ascii/Cargo.toml
rename to crates/command/ascii/Cargo.toml
index 7b36a496..66c2c1a6 100644
--- a/crates/commands/ascii/Cargo.toml
+++ b/crates/command/ascii/Cargo.toml
@@ -7,10 +7,10 @@ edition.workspace = true
 anyhow.workspace = true
 bstr.workspace = true
 clap.workspace = true
-rew_adapters = { path = "../../libs/adapters" }
-rew_core = { path = "../../libs/core" }
-rew_command = { path = "../../libs/command" }
-rew_exec = { path = "../../libs/exec" }
+rew_adapters = { path = "../../lib/adapter" }
+rew_core = { path = "../../lib/core" }
+rew_command = { path = "../../lib/command" }
+rew_exec = { path = "../../lib/exec" }
 unidecode.workspace = true
 
 [dev-dependencies]
diff --git a/crates/commands/ascii/src/lib.rs b/crates/command/ascii/src/lib.rs
similarity index 100%
rename from crates/commands/ascii/src/lib.rs
rename to crates/command/ascii/src/lib.rs
diff --git a/crates/commands/x/Cargo.toml b/crates/command/x/Cargo.toml
similarity index 58%
rename from crates/commands/x/Cargo.toml
rename to crates/command/x/Cargo.toml
index 7b41f101..6a66c491 100644
--- a/crates/commands/x/Cargo.toml
+++ b/crates/command/x/Cargo.toml
@@ -8,11 +8,11 @@ anyhow.workspace = true
 bstr.workspace = true
 clap.workspace = true
 owo-colors.workspace = true
-rew_adapters = { path = "../../libs/adapters" }
-rew_core = { path = "../../libs/core" }
-rew_command = { path = "../../libs/command" }
-rew_exec = { path = "../../libs/exec" }
-rew_io = { path = "../../libs/io" }
+rew_adapters = { path = "../../lib/adapter" }
+rew_core = { path = "../../lib/core" }
+rew_command = { path = "../../lib/command" }
+rew_exec = { path = "../../lib/exec" }
+rew_io = { path = "../../lib/io" }
 thiserror.workspace = true
 
 [dev-dependencies]
diff --git a/crates/commands/x/src/lib.rs b/crates/command/x/src/lib.rs
similarity index 100%
rename from crates/commands/x/src/lib.rs
rename to crates/command/x/src/lib.rs
diff --git a/crates/commands/x/src/pattern.rs b/crates/command/x/src/pattern.rs
similarity index 100%
rename from crates/commands/x/src/pattern.rs
rename to crates/command/x/src/pattern.rs
diff --git a/crates/libs/adapters/Cargo.toml b/crates/lib/adapter/Cargo.toml
similarity index 72%
rename from crates/libs/adapters/Cargo.toml
rename to crates/lib/adapter/Cargo.toml
index 4d53f5eb..9a16e137 100644
--- a/crates/libs/adapters/Cargo.toml
+++ b/crates/lib/adapter/Cargo.toml
@@ -7,8 +7,8 @@ edition.workspace = true
 anyhow.workspace = true
 bstr.workspace = true
 rew_core = { path = "../core" }
-rew_fixtures = { path = "../fixtures" }
+rew_fixture = { path = "../fixture" }
 
 [dev-dependencies]
 claims.workspace = true
-rew_components = { path = "../components" }
\ No newline at end of file
+rew_components = { path = "../component" }
\ No newline at end of file
diff --git a/crates/libs/adapters/src/adapters.rs b/crates/lib/adapter/src/adapter.rs
similarity index 100%
rename from crates/libs/adapters/src/adapters.rs
rename to crates/lib/adapter/src/adapter.rs
diff --git a/crates/libs/adapters/src/bridge.rs b/crates/lib/adapter/src/bridge.rs
similarity index 97%
rename from crates/libs/adapters/src/bridge.rs
rename to crates/lib/adapter/src/bridge.rs
index ae438364..f482da64 100644
--- a/crates/libs/adapters/src/bridge.rs
+++ b/crates/lib/adapter/src/bridge.rs
@@ -123,10 +123,10 @@ mod tests {
     use claims::assert_ok;
     use claims::assert_ok_eq;
     use rew_core::bstr;
-    use rew_fixtures::Bytes;
-    use rew_fixtures::Concat;
-    use rew_fixtures::MaskedBytes;
-    use rew_fixtures::SkipOdd;
+    use rew_fixture::Bytes;
+    use rew_fixture::Concat;
+    use rew_fixture::MaskedBytes;
+    use rew_fixture::SkipOdd;
     use std::io::BufWriter;
 
     #[test]
diff --git a/crates/libs/adapters/src/buffer.rs b/crates/lib/adapter/src/buffer.rs
similarity index 97%
rename from crates/libs/adapters/src/buffer.rs
rename to crates/lib/adapter/src/buffer.rs
index 6e52c07e..9aa0d1b6 100644
--- a/crates/libs/adapters/src/buffer.rs
+++ b/crates/lib/adapter/src/buffer.rs
@@ -98,9 +98,9 @@ mod tests {
     use bstr::B;
     use claims::assert_ok_eq;
     use rew_core::bstr;
-    use rew_fixtures::Bytes;
-    use rew_fixtures::Countdown;
-    use rew_fixtures::Duplicate;
+    use rew_fixture::Bytes;
+    use rew_fixture::Countdown;
+    use rew_fixture::Duplicate;
 
     #[test]
     fn produce_from_to_buffer() {
diff --git a/crates/libs/adapters/src/lib.rs b/crates/lib/adapter/src/lib.rs
similarity index 79%
rename from crates/libs/adapters/src/lib.rs
rename to crates/lib/adapter/src/lib.rs
index 1d5ecf3b..ca258bd1 100644
--- a/crates/libs/adapters/src/lib.rs
+++ b/crates/lib/adapter/src/lib.rs
@@ -1,10 +1,10 @@
-pub use adapters::*;
+pub use adapter::*;
 pub use bridge::*;
 pub use buffer::*;
 pub use transfer::*;
 pub use transform::*;
 
-mod adapters;
+mod adapter;
 mod bridge;
 mod buffer;
 mod transfer;
diff --git a/crates/libs/adapters/src/transfer.rs b/crates/lib/adapter/src/transfer.rs
similarity index 100%
rename from crates/libs/adapters/src/transfer.rs
rename to crates/lib/adapter/src/transfer.rs
diff --git a/crates/libs/adapters/src/transform.rs b/crates/lib/adapter/src/transform.rs
similarity index 96%
rename from crates/libs/adapters/src/transform.rs
rename to crates/lib/adapter/src/transform.rs
index e57211e7..36165cdc 100644
--- a/crates/libs/adapters/src/transform.rs
+++ b/crates/lib/adapter/src/transform.rs
@@ -52,8 +52,8 @@ mod tests {
     use claims::assert_ok_eq;
     use rew_components::IterProduce;
     use rew_core::bstr;
-    use rew_fixtures::FirstByte;
-    use rew_fixtures::IsLowerCase;
+    use rew_fixture::FirstByte;
+    use rew_fixture::IsLowerCase;
 
     #[test]
     fn map_transform() {
diff --git a/crates/libs/app/Cargo.toml b/crates/lib/app/Cargo.toml
similarity index 86%
rename from crates/libs/app/Cargo.toml
rename to crates/lib/app/Cargo.toml
index 26ad4aea..134b5999 100644
--- a/crates/libs/app/Cargo.toml
+++ b/crates/lib/app/Cargo.toml
@@ -9,7 +9,7 @@ anstream.workspace = true
 clap.workspace = true
 owo-colors.workspace = true
 rew_command = { path = "../command" }
-rew_command_ascii = { path = "../../commands/ascii" }
+rew_command_ascii = { path = "../../command/ascii" }
 rew_exec = { path = "../exec" }
 
 [dev-dependencies]
diff --git a/crates/libs/app/src/lib.rs b/crates/lib/app/src/lib.rs
similarity index 100%
rename from crates/libs/app/src/lib.rs
rename to crates/lib/app/src/lib.rs
diff --git a/crates/libs/command/Cargo.toml b/crates/lib/command/Cargo.toml
similarity index 100%
rename from crates/libs/command/Cargo.toml
rename to crates/lib/command/Cargo.toml
diff --git a/crates/libs/command/src/lib.rs b/crates/lib/command/src/lib.rs
similarity index 100%
rename from crates/libs/command/src/lib.rs
rename to crates/lib/command/src/lib.rs
diff --git a/crates/libs/components/Cargo.toml b/crates/lib/component/Cargo.toml
similarity index 89%
rename from crates/libs/components/Cargo.toml
rename to crates/lib/component/Cargo.toml
index 441df935..8f876b0b 100644
--- a/crates/libs/components/Cargo.toml
+++ b/crates/lib/component/Cargo.toml
@@ -9,7 +9,7 @@ bstr.workspace = true
 num-traits.workspace = true
 owo-colors.workspace = true
 rew_core = { path = "../core" }
-rew_fixtures = { path = "../fixtures" }
+rew_fixture = { path = "../fixture" }
 thiserror.workspace = true
 
 [dev-dependencies]
diff --git a/crates/libs/components/src/iter.rs b/crates/lib/component/src/iter.rs
similarity index 100%
rename from crates/libs/components/src/iter.rs
rename to crates/lib/component/src/iter.rs
diff --git a/crates/libs/components/src/lib.rs b/crates/lib/component/src/lib.rs
similarity index 100%
rename from crates/libs/components/src/lib.rs
rename to crates/lib/component/src/lib.rs
diff --git a/crates/libs/components/src/limit.rs b/crates/lib/component/src/limit.rs
similarity index 100%
rename from crates/libs/components/src/limit.rs
rename to crates/lib/component/src/limit.rs
diff --git a/crates/libs/core/Cargo.toml b/crates/lib/core/Cargo.toml
similarity index 100%
rename from crates/libs/core/Cargo.toml
rename to crates/lib/core/Cargo.toml
diff --git a/crates/libs/core/src/consume.rs b/crates/lib/core/src/consume.rs
similarity index 100%
rename from crates/libs/core/src/consume.rs
rename to crates/lib/core/src/consume.rs
diff --git a/crates/libs/core/src/lib.rs b/crates/lib/core/src/lib.rs
similarity index 100%
rename from crates/libs/core/src/lib.rs
rename to crates/lib/core/src/lib.rs
diff --git a/crates/libs/core/src/produce.rs b/crates/lib/core/src/produce.rs
similarity index 100%
rename from crates/libs/core/src/produce.rs
rename to crates/lib/core/src/produce.rs
diff --git a/crates/libs/core/src/transfer.rs b/crates/lib/core/src/transfer.rs
similarity index 100%
rename from crates/libs/core/src/transfer.rs
rename to crates/lib/core/src/transfer.rs
diff --git a/crates/libs/core/src/transform.rs b/crates/lib/core/src/transform.rs
similarity index 100%
rename from crates/libs/core/src/transform.rs
rename to crates/lib/core/src/transform.rs
diff --git a/crates/libs/core/src/utils.rs b/crates/lib/core/src/utils.rs
similarity index 100%
rename from crates/libs/core/src/utils.rs
rename to crates/lib/core/src/utils.rs
diff --git a/crates/libs/exec/Cargo.toml b/crates/lib/exec/Cargo.toml
similarity index 71%
rename from crates/libs/exec/Cargo.toml
rename to crates/lib/exec/Cargo.toml
index e1b238d5..09386bce 100644
--- a/crates/libs/exec/Cargo.toml
+++ b/crates/lib/exec/Cargo.toml
@@ -8,12 +8,12 @@ anyhow.workspace = true
 bstr.workspace = true
 byte-unit.workspace = true
 clap.workspace = true
-rew_adapters = { path = "../adapters" }
+rew_adapters = { path = "../adapter" }
 rew_core = { path = "../core" }
 rew_io = { path = "../io" }
 
 [dev-dependencies]
 claims.workspace = true
 rstest.workspace = true
-rew_components = { path = "../components" }
-rew_fixtures = { path = "../fixtures" }
+rew_components = { path = "../component" }
+rew_fixture = { path = "../fixture" }
diff --git a/crates/libs/exec/src/args.rs b/crates/lib/exec/src/args.rs
similarity index 100%
rename from crates/libs/exec/src/args.rs
rename to crates/lib/exec/src/args.rs
diff --git a/crates/libs/exec/src/context.rs b/crates/lib/exec/src/context.rs
similarity index 100%
rename from crates/libs/exec/src/context.rs
rename to crates/lib/exec/src/context.rs
diff --git a/crates/libs/exec/src/fixtures.rs b/crates/lib/exec/src/fixture.rs
similarity index 100%
rename from crates/libs/exec/src/fixtures.rs
rename to crates/lib/exec/src/fixture.rs
diff --git a/crates/libs/exec/src/init.rs b/crates/lib/exec/src/init.rs
similarity index 100%
rename from crates/libs/exec/src/init.rs
rename to crates/lib/exec/src/init.rs
diff --git a/crates/libs/exec/src/lib.rs b/crates/lib/exec/src/lib.rs
similarity index 87%
rename from crates/libs/exec/src/lib.rs
rename to crates/lib/exec/src/lib.rs
index 50c6e21d..ddc038f8 100644
--- a/crates/libs/exec/src/lib.rs
+++ b/crates/lib/exec/src/lib.rs
@@ -6,6 +6,6 @@ pub use run::*;
 mod args;
 mod context;
 #[cfg(test)]
-pub mod fixtures;
+pub mod fixture;
 mod init;
 mod run;
diff --git a/crates/libs/exec/src/run.rs b/crates/lib/exec/src/run.rs
similarity index 94%
rename from crates/libs/exec/src/run.rs
rename to crates/lib/exec/src/run.rs
index 5003d2cc..1cc73632 100644
--- a/crates/libs/exec/src/run.rs
+++ b/crates/lib/exec/src/run.rs
@@ -127,17 +127,17 @@ impl<P: Channel, X: Context + Send + Sync + 'static> Run<X> for AdaptChannel<P>
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::fixtures::TestContext;
+    use crate::fixture::TestContext;
     use claims::assert_ok;
-    use rew_fixtures::Bytes;
-    use rew_fixtures::Concat;
-    use rew_fixtures::Countdown;
-    use rew_fixtures::DirectChannel;
-    use rew_fixtures::Duplicate;
-    use rew_fixtures::FirstByte;
-    use rew_fixtures::IsLowerCase;
-    use rew_fixtures::MaskedBytes;
-    use rew_fixtures::SkipOdd;
+    use rew_fixture::Bytes;
+    use rew_fixture::Concat;
+    use rew_fixture::Countdown;
+    use rew_fixture::DirectChannel;
+    use rew_fixture::Duplicate;
+    use rew_fixture::FirstByte;
+    use rew_fixture::IsLowerCase;
+    use rew_fixture::MaskedBytes;
+    use rew_fixture::SkipOdd;
 
     #[test]
     fn produce() {
diff --git a/crates/libs/fixtures/Cargo.toml b/crates/lib/fixture/Cargo.toml
similarity index 89%
rename from crates/libs/fixtures/Cargo.toml
rename to crates/lib/fixture/Cargo.toml
index 7d0895eb..31b2f798 100644
--- a/crates/libs/fixtures/Cargo.toml
+++ b/crates/lib/fixture/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "rew_fixtures"
+name = "rew_fixture"
 version.workspace = true
 edition.workspace = true
 
diff --git a/crates/libs/fixtures/src/consume.rs b/crates/lib/fixture/src/consume.rs
similarity index 100%
rename from crates/libs/fixtures/src/consume.rs
rename to crates/lib/fixture/src/consume.rs
diff --git a/crates/libs/fixtures/src/lib.rs b/crates/lib/fixture/src/lib.rs
similarity index 100%
rename from crates/libs/fixtures/src/lib.rs
rename to crates/lib/fixture/src/lib.rs
diff --git a/crates/libs/fixtures/src/produce.rs b/crates/lib/fixture/src/produce.rs
similarity index 97%
rename from crates/libs/fixtures/src/produce.rs
rename to crates/lib/fixture/src/produce.rs
index 45d80826..2f8365dc 100644
--- a/crates/libs/fixtures/src/produce.rs
+++ b/crates/lib/fixture/src/produce.rs
@@ -31,13 +31,14 @@ impl ProduceTo for Countdown {
     }
 }
 
+#[derive(Default)]
 pub struct MaskedBytes {
     last: bool,
 }
 
 impl MaskedBytes {
     pub fn new() -> Self {
-        Self { last: false }
+        Self::default()
     }
 }
 
diff --git a/crates/libs/fixtures/src/transfer.rs b/crates/lib/fixture/src/transfer.rs
similarity index 100%
rename from crates/libs/fixtures/src/transfer.rs
rename to crates/lib/fixture/src/transfer.rs
diff --git a/crates/libs/fixtures/src/transform.rs b/crates/lib/fixture/src/transform.rs
similarity index 100%
rename from crates/libs/fixtures/src/transform.rs
rename to crates/lib/fixture/src/transform.rs
diff --git a/crates/libs/io/Cargo.toml b/crates/lib/io/Cargo.toml
similarity index 88%
rename from crates/libs/io/Cargo.toml
rename to crates/lib/io/Cargo.toml
index e956e353..04636bf5 100644
--- a/crates/libs/io/Cargo.toml
+++ b/crates/lib/io/Cargo.toml
@@ -9,7 +9,7 @@ bstr.workspace = true
 byte-unit.workspace = true
 owo-colors.workspace = true
 rew_core = { path = "../core" }
-rew_fixtures = { path = "../fixtures" }
+rew_fixture = { path = "../fixture" }
 thiserror.workspace = true
 
 [dev-dependencies]
diff --git a/crates/libs/io/src/config.rs b/crates/lib/io/src/config.rs
similarity index 100%
rename from crates/libs/io/src/config.rs
rename to crates/lib/io/src/config.rs
diff --git a/crates/libs/io/src/lib.rs b/crates/lib/io/src/lib.rs
similarity index 100%
rename from crates/libs/io/src/lib.rs
rename to crates/lib/io/src/lib.rs
diff --git a/crates/libs/io/src/read.rs b/crates/lib/io/src/read.rs
similarity index 100%
rename from crates/libs/io/src/read.rs
rename to crates/lib/io/src/read.rs
diff --git a/crates/libs/io/src/write.rs b/crates/lib/io/src/write.rs
similarity index 100%
rename from crates/libs/io/src/write.rs
rename to crates/lib/io/src/write.rs
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
index 9f22ccf0..c121339b 100644
--- a/fuzz/Cargo.lock
+++ b/fuzz/Cargo.lock
@@ -329,7 +329,7 @@ dependencies = [
  "anyhow",
  "bstr",
  "rew_core",
- "rew_fixtures",
+ "rew_fixture",
 ]
 
 [[package]]
@@ -379,7 +379,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "rew_fixtures"
+name = "rew_fixture"
 version = "0.4.0"
 dependencies = [
  "anyhow",
@@ -397,7 +397,7 @@ dependencies = [
  "byte-unit",
  "owo-colors",
  "rew_core",
- "rew_fixtures",
+ "rew_fixture",
  "thiserror",
 ]
 
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index c3953070..21348130 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -9,7 +9,7 @@ cargo-fuzz = true
 
 [dependencies]
 libfuzzer-sys = "0.4"
-rew_command_x = { path = "../crates/commands/x" }
+rew_command_x = { path = "../crates/command/x" }
 
 [workspace]
 members = ["."] # Prevent this from interfering with workspaces
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
index 10922464..bb8e8ac8 100644
--- a/xtask/Cargo.toml
+++ b/xtask/Cargo.toml
@@ -8,4 +8,4 @@ publish = false
 anyhow.workspace = true
 clap = { workspace = true, features = ["derive"] }
 clap_mangen.workspace = true
-rew_app = { path = "../crates/libs/app" }
+rew_app = { path = "../crates/lib/app" }