diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d6e8f7..40f9b78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,11 @@
 
 * Add support for reporting peer client information
 
+#### Changed
+
+* Compiling with SIMD extensions enabled is no longer required, due to the
+  addition of runtime detection to simd-json
+
 ## 0.8.0 - 2023-03-17
 
 ### General
diff --git a/Cargo.lock b/Cargo.lock
index 808d2af..3240b92 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -42,9 +42,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.4"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
@@ -63,9 +63,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
 name = "anstyle"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 
 [[package]]
 name = "anyhow"
@@ -95,10 +95,10 @@ dependencies = [
  "duplicate",
  "git-testament",
  "glommio",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "hex",
  "hwloc",
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
  "libc",
  "log",
  "privdrop",
@@ -140,7 +140,7 @@ dependencies = [
  "serde",
  "signal-hook",
  "slab",
- "socket2 0.5.3",
+ "socket2 0.5.4",
 ]
 
 [[package]]
@@ -154,7 +154,7 @@ dependencies = [
  "futures-lite",
  "futures-rustls",
  "glommio",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "log",
  "mimalloc",
  "quickcheck",
@@ -230,7 +230,7 @@ dependencies = [
  "constant_time_eq",
  "crossbeam-channel",
  "getrandom",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "hdrhistogram",
  "hex",
  "io-uring",
@@ -248,7 +248,7 @@ dependencies = [
  "serde",
  "signal-hook",
  "slab",
- "socket2 0.5.3",
+ "socket2 0.5.4",
  "tempfile",
  "time",
  "tinytemplate",
@@ -280,7 +280,7 @@ dependencies = [
  "aquatic_common",
  "aquatic_toml_config",
  "aquatic_udp_protocol",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "mimalloc",
  "mio",
  "quickcheck",
@@ -288,7 +288,7 @@ dependencies = [
  "rand",
  "rand_distr",
  "serde",
- "socket2 0.5.3",
+ "socket2 0.5.4",
 ]
 
 [[package]]
@@ -317,7 +317,7 @@ dependencies = [
  "futures-lite",
  "futures-rustls",
  "glommio",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "httparse",
  "log",
  "metrics",
@@ -333,7 +333,7 @@ dependencies = [
  "serde",
  "signal-hook",
  "slab",
- "socket2 0.5.3",
+ "socket2 0.5.4",
  "tungstenite",
 ]
 
@@ -367,7 +367,7 @@ version = "0.8.0"
 dependencies = [
  "anyhow",
  "criterion 0.5.1",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
  "quickcheck",
  "quickcheck_macros",
  "serde",
@@ -396,9 +396,9 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "async-tungstenite"
-version = "0.22.2"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce01ac37fdc85f10a43c43bc582cbd566720357011578a935761075f898baf58"
+checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc"
 dependencies = [
  "futures-io",
  "futures-util",
@@ -447,9 +447,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.3"
+version = "0.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
 
 [[package]]
 name = "bendy"
@@ -477,9 +477,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "bitmaps"
@@ -489,16 +489,15 @@ checksum = "703642b98a00b3b90513279a8ede3fcfa479c126c5fb46e78f3051522f021403"
 
 [[package]]
 name = "blake3"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5"
+checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87"
 dependencies = [
  "arrayref",
  "arrayvec",
  "cc",
  "cfg-if",
  "constant_time_eq",
- "digest",
 ]
 
 [[package]]
@@ -518,21 +517,21 @@ checksum = "3240a4cb09cf0da6a51641bd40ce90e96ea6065e3a1adc46434029254bcc2d09"
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
 
 [[package]]
 name = "cache-padded"
@@ -611,18 +610,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.1"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c8d502cbaec4595d2e7d5f61e318f05417bd2b66fdc3809498f0d3fdf0bea27"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.1"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5891c7bc0edb3e1c2204fc5e94009affabeb1821c9e5fdc3959536c5c0bb984d"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
  "anstyle",
  "clap_lex 0.5.1",
@@ -749,7 +748,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.4.1",
+ "clap 4.4.6",
  "criterion-plot",
  "is-terminal",
  "itertools",
@@ -861,9 +860,12 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
 [[package]]
 name = "deranged"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+]
 
 [[package]]
 name = "digest"
@@ -873,7 +875,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
  "block-buffer",
  "crypto-common",
- "subtle",
 ]
 
 [[package]]
@@ -945,11 +946,10 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.2"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
 dependencies = [
- "errno-dragonfly",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -975,15 +975,15 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1097,7 +1097,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1171,24 +1171,23 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "git-testament"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "986bf57c808270f3a0a0652c3bfce0f5d667aa5f5b465616dc697c7f390834b1"
+checksum = "710c78d2b68e46e62f5ba63ba0a7a2986640f37f9ecc07903b9ad4e7b2dbfc8e"
 dependencies = [
  "git-testament-derive",
- "no-std-compat",
 ]
 
 [[package]]
 name = "git-testament-derive"
-version = "0.1.14"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a782db5866c7ab75f3552dda4cbf34e3e257cc64c963c6ed5af1e12818e8ae6"
+checksum = "9b31494efbbe1a6730f6943759c21b92c8dc431cb4df177e6f2a6429c3c96842"
 dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.38",
  "time",
 ]
 
@@ -1260,9 +1259,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
 dependencies = [
  "ahash 0.8.3",
  "allocator-api2",
@@ -1300,9 +1299,9 @@ dependencies = [
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "hex"
@@ -1404,19 +1403,19 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.1",
 ]
 
 [[package]]
 name = "indicatif"
-version = "0.17.6"
+version = "0.17.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730"
+checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
 dependencies = [
  "console",
  "instant",
@@ -1445,9 +1444,9 @@ dependencies = [
 
 [[package]]
 name = "io-uring"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "141a0f4546a50b2ed637c7a6df0d7dff45c9f41523254996764461c8ae0d9424"
+checksum = "460648e47a07a43110fbfa2e0b14afb2be920093c31e5dccc50e49568e099762"
 dependencies = [
  "bitflags 1.3.2",
  "libc",
@@ -1465,7 +1464,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi 0.3.3",
  "rustix",
  "windows-sys 0.48.0",
 ]
@@ -1576,21 +1575,21 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libm"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.34"
+version = "0.1.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25d058a81af0d1c22d7a1c948576bee6d673f7af3c0f35564abd6c81122f513d"
+checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664"
 dependencies = [
  "cc",
  "libc",
@@ -1598,15 +1597,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.5"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1638,9 +1637,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.0"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76fc44e2588d5b436dbc3c6cf62aef290f90dab6235744a93dfe1cc18f451e2c"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memoffset"
@@ -1686,7 +1685,7 @@ version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a4964177ddfdab1e3a2b37aec7cf320e14169abb0ed73999f558136409178d5"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
  "hyper",
  "indexmap 1.9.3",
  "ipnet",
@@ -1705,7 +1704,7 @@ checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1729,9 +1728,9 @@ dependencies = [
 
 [[package]]
 name = "mimalloc"
-version = "0.1.38"
+version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "972e5f23f6716f62665760b0f4cbf592576a80c7b879ba9beaafc0e558894127"
+checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c"
 dependencies = [
  "libmimalloc-sys",
 ]
@@ -1807,12 +1806,6 @@ dependencies = [
  "pin-utils",
 ]
 
-[[package]]
-name = "no-std-compat"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
-
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -1867,9 +1860,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
  "libm",
@@ -1881,7 +1874,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi 0.3.3",
  "libc",
 ]
 
@@ -1902,9 +1895,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "object"
-version = "0.32.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -1923,18 +1916,18 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "ordered-float"
-version = "3.9.1"
+version = "3.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a54938017eacd63036332b4ae5c8a49fc8c0c1d6d629893057e4f13609edd06"
+checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
 dependencies = [
  "num-traits",
 ]
 
 [[package]]
 name = "os_str_bytes"
-version = "6.5.1"
+version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
 [[package]]
 name = "owned-alloc"
@@ -1944,9 +1937,9 @@ checksum = "30fceb411f9a12ff9222c5f824026be368ff15dc2f13468d850c7d3f502205d6"
 
 [[package]]
 name = "parking"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "percent-encoding"
@@ -1971,7 +1964,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -2026,6 +2019,12 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -2068,9 +2067,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -2183,9 +2182,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
 dependencies = [
  "either",
  "rayon-core",
@@ -2193,14 +2192,12 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
 ]
 
 [[package]]
@@ -2214,9 +2211,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.4"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2226,9 +2223,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.7"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2237,9 +2234,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "ring"
@@ -2273,12 +2270,12 @@ checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
 [[package]]
 name = "rustix"
-version = "0.38.9"
+version = "0.38.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49"
+checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
 dependencies = [
- "bitflags 2.4.0",
- "errno 0.3.2",
+ "bitflags 2.4.1",
+ "errno 0.3.5",
  "libc",
  "linux-raw-sys",
  "windows-sys 0.48.0",
@@ -2302,14 +2299,14 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
 dependencies = [
- "base64 0.21.3",
+ "base64 0.21.4",
 ]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.101.4"
+version = "0.101.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d"
+checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
 dependencies = [
  "ring",
  "untrusted",
@@ -2360,18 +2357,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bencode"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "934d8bdbaa0126dafaea9a8833424a211d9661897717846c6bb782349ca1c30d"
+checksum = "a70dfc7b7438b99896e7f8992363ab8e2c4ba26aa5ec675d32d1c3c2c33d413e"
 dependencies = [
  "serde",
  "serde_bytes",
@@ -2388,20 +2385,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -2410,9 +2407,9 @@ dependencies = [
 
 [[package]]
 name = "sha1"
-version = "0.10.5"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -2440,10 +2437,11 @@ dependencies = [
 
 [[package]]
 name = "simd-json"
-version = "0.10.6"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de7f1293f0e4e11d52e588766fe9de8caa2857ff63809d40de83245452ca7c5c"
+checksum = "f0f07a84c7456b901b8dd2c1d44caca8b0fd2c2616206ee5acc9d9da61e8d9ec"
 dependencies = [
+ "getrandom",
  "halfbrown",
  "lexical-core",
  "serde",
@@ -2493,9 +2491,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
 name = "snafu"
@@ -2531,9 +2529,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
 dependencies = [
  "libc",
  "windows-sys 0.48.0",
@@ -2560,12 +2558,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -2579,9 +2571,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2595,7 +2587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.0",
+ "fastrand 2.0.1",
  "redox_syscall",
  "rustix",
  "windows-sys 0.48.0",
@@ -2609,34 +2601,35 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "time"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
 dependencies = [
  "deranged",
  "itoa",
  "libc",
  "num_threads",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -2644,15 +2637,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
  "time-core",
 ]
@@ -2684,15 +2677,15 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
  "backtrace",
  "libc",
  "mio",
  "pin-project-lite",
- "socket2 0.5.3",
+ "socket2 0.5.4",
  "windows-sys 0.48.0",
 ]
 
@@ -2713,11 +2706,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9"
 dependencies = [
- "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -2725,20 +2717,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
 ]
@@ -2751,9 +2743,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
 
 [[package]]
 name = "tungstenite"
-version = "0.19.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67"
+checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
 dependencies = [
  "byteorder",
  "bytes",
@@ -2770,9 +2762,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicode-bidi"
@@ -2782,9 +2774,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -2797,9 +2789,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "untrusted"
@@ -2850,15 +2842,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "waker-fn"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
 
 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -2900,7 +2892,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
@@ -2922,7 +2914,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2973,9 +2965,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi 0.3.9",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 1ba315c..116ac9a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,21 +1,22 @@
 [workspace]
 members = [ 
-    "aquatic",
-    "aquatic_common",
-    "aquatic_http",
-    "aquatic_http_load_test",
-    "aquatic_http_protocol",
-    "aquatic_peer_id",
-    "aquatic_toml_config",
-    "aquatic_toml_config_derive",
-    "aquatic_udp",
-    "aquatic_udp_bench",
-    "aquatic_udp_load_test",
-    "aquatic_udp_protocol",
-    "aquatic_ws",
-    "aquatic_ws_load_test",
-    "aquatic_ws_protocol",
+    "crates/combined_binary",
+    "crates/common",
+    "crates/http",
+    "crates/http_load_test",
+    "crates/http_protocol",
+    "crates/peer_id",
+    "crates/toml_config",
+    "crates/toml_config_derive",
+    "crates/udp",
+    "crates/udp_bench",
+    "crates/udp_load_test",
+    "crates/udp_protocol",
+    "crates/ws",
+    "crates/ws_load_test",
+    "crates/ws_protocol",
 ]
+resolver = "2"
 
 [workspace.package]
 version = "0.8.0"
@@ -27,16 +28,16 @@ readme = "./README.md"
 rust-version = "1.64"
 
 [workspace.dependencies]
-aquatic_common = { version = "0.8.0", path = "./aquatic_common" }
-aquatic_http_protocol = { version = "0.8.0", path = "./aquatic_http_protocol" }
-aquatic_http = { version = "0.8.0", path = "./aquatic_http" }
-aquatic_peer_id = { version = "0.8.0", path = "./aquatic_peer_id" }
-aquatic_toml_config = { version = "0.8.0", path = "./aquatic_toml_config" }
-aquatic_toml_config_derive = { version = "0.8.0", path = "./aquatic_toml_config_derive" }
-aquatic_udp_protocol = { version = "0.8.0", path = "./aquatic_udp_protocol" }
-aquatic_udp = { version = "0.8.0", path = "./aquatic_udp" }
-aquatic_ws_protocol = { version = "0.8.0", path = "./aquatic_ws_protocol" }
-aquatic_ws = { version = "0.8.0", path = "./aquatic_ws" }
+aquatic_common = { version = "0.8.0", path = "./crates/common" }
+aquatic_http_protocol = { version = "0.8.0", path = "./crates/http_protocol" }
+aquatic_http = { version = "0.8.0", path = "./crates/http" }
+aquatic_peer_id = { version = "0.8.0", path = "./crates/peer_id" }
+aquatic_toml_config = { version = "0.8.0", path = "./crates/toml_config" }
+aquatic_toml_config_derive = { version = "0.8.0", path = "./crates/toml_config_derive" }
+aquatic_udp_protocol = { version = "0.8.0", path = "./crates/udp_protocol" }
+aquatic_udp = { version = "0.8.0", path = "./crates/udp" }
+aquatic_ws_protocol = { version = "0.8.0", path = "./crates/ws_protocol" }
+aquatic_ws = { version = "0.8.0", path = "./crates/ws" }
 
 [profile.release]
 debug = false
diff --git a/README.md b/README.md
index 9ac91ff..ed367bb 100644
--- a/README.md
+++ b/README.md
@@ -42,11 +42,10 @@ Known users:
 - Build the implementations that you are interested in:
 
 ```sh
-# Tell Rust to enable support for all SIMD extensions present on current CPU
-# except for those relating to AVX-512. SIMD is required for aquatic_ws and
-# recommended for the other implementations. If you run a processor that
-# doesn't clock down when using AVX-512, you can enable those instructions
-# too.
+# Recommended: tell Rust to enable support for all SIMD extensions present on
+# current CPU except for those relating to AVX-512. (If you run a processor
+# that doesn't clock down when using AVX-512, you can enable those instructions
+# too.)
 . ./scripts/env-native-cpu-without-avx-512
 
 cargo build --release -p aquatic_udp
diff --git a/aquatic/Cargo.toml b/crates/combined_binary/Cargo.toml
similarity index 100%
rename from aquatic/Cargo.toml
rename to crates/combined_binary/Cargo.toml
diff --git a/aquatic/src/main.rs b/crates/combined_binary/src/main.rs
similarity index 100%
rename from aquatic/src/main.rs
rename to crates/combined_binary/src/main.rs
diff --git a/aquatic_common/Cargo.toml b/crates/common/Cargo.toml
similarity index 100%
rename from aquatic_common/Cargo.toml
rename to crates/common/Cargo.toml
diff --git a/aquatic_common/src/access_list.rs b/crates/common/src/access_list.rs
similarity index 100%
rename from aquatic_common/src/access_list.rs
rename to crates/common/src/access_list.rs
diff --git a/aquatic_common/src/cli.rs b/crates/common/src/cli.rs
similarity index 100%
rename from aquatic_common/src/cli.rs
rename to crates/common/src/cli.rs
diff --git a/aquatic_common/src/cpu_pinning.rs b/crates/common/src/cpu_pinning.rs
similarity index 100%
rename from aquatic_common/src/cpu_pinning.rs
rename to crates/common/src/cpu_pinning.rs
diff --git a/aquatic_common/src/lib.rs b/crates/common/src/lib.rs
similarity index 100%
rename from aquatic_common/src/lib.rs
rename to crates/common/src/lib.rs
diff --git a/aquatic_common/src/privileges.rs b/crates/common/src/privileges.rs
similarity index 100%
rename from aquatic_common/src/privileges.rs
rename to crates/common/src/privileges.rs
diff --git a/aquatic_common/src/rustls_config.rs b/crates/common/src/rustls_config.rs
similarity index 100%
rename from aquatic_common/src/rustls_config.rs
rename to crates/common/src/rustls_config.rs
diff --git a/aquatic_http/Cargo.toml b/crates/http/Cargo.toml
similarity index 100%
rename from aquatic_http/Cargo.toml
rename to crates/http/Cargo.toml
diff --git a/aquatic_http/src/common.rs b/crates/http/src/common.rs
similarity index 100%
rename from aquatic_http/src/common.rs
rename to crates/http/src/common.rs
diff --git a/aquatic_http/src/config.rs b/crates/http/src/config.rs
similarity index 100%
rename from aquatic_http/src/config.rs
rename to crates/http/src/config.rs
diff --git a/aquatic_http/src/lib.rs b/crates/http/src/lib.rs
similarity index 100%
rename from aquatic_http/src/lib.rs
rename to crates/http/src/lib.rs
diff --git a/aquatic_http/src/main.rs b/crates/http/src/main.rs
similarity index 100%
rename from aquatic_http/src/main.rs
rename to crates/http/src/main.rs
diff --git a/aquatic_http/src/workers/mod.rs b/crates/http/src/workers/mod.rs
similarity index 100%
rename from aquatic_http/src/workers/mod.rs
rename to crates/http/src/workers/mod.rs
diff --git a/aquatic_http/src/workers/socket.rs b/crates/http/src/workers/socket.rs
similarity index 100%
rename from aquatic_http/src/workers/socket.rs
rename to crates/http/src/workers/socket.rs
diff --git a/aquatic_http/src/workers/swarm.rs b/crates/http/src/workers/swarm.rs
similarity index 100%
rename from aquatic_http/src/workers/swarm.rs
rename to crates/http/src/workers/swarm.rs
diff --git a/aquatic_http_load_test/Cargo.toml b/crates/http_load_test/Cargo.toml
similarity index 100%
rename from aquatic_http_load_test/Cargo.toml
rename to crates/http_load_test/Cargo.toml
diff --git a/aquatic_http_load_test/src/common.rs b/crates/http_load_test/src/common.rs
similarity index 100%
rename from aquatic_http_load_test/src/common.rs
rename to crates/http_load_test/src/common.rs
diff --git a/aquatic_http_load_test/src/config.rs b/crates/http_load_test/src/config.rs
similarity index 100%
rename from aquatic_http_load_test/src/config.rs
rename to crates/http_load_test/src/config.rs
diff --git a/aquatic_http_load_test/src/main.rs b/crates/http_load_test/src/main.rs
similarity index 100%
rename from aquatic_http_load_test/src/main.rs
rename to crates/http_load_test/src/main.rs
diff --git a/aquatic_http_load_test/src/network.rs b/crates/http_load_test/src/network.rs
similarity index 100%
rename from aquatic_http_load_test/src/network.rs
rename to crates/http_load_test/src/network.rs
diff --git a/aquatic_http_load_test/src/utils.rs b/crates/http_load_test/src/utils.rs
similarity index 100%
rename from aquatic_http_load_test/src/utils.rs
rename to crates/http_load_test/src/utils.rs
diff --git a/aquatic_http_protocol/Cargo.toml b/crates/http_protocol/Cargo.toml
similarity index 100%
rename from aquatic_http_protocol/Cargo.toml
rename to crates/http_protocol/Cargo.toml
diff --git a/aquatic_http_protocol/benches/bench_announce_response_to_bytes.rs b/crates/http_protocol/benches/bench_announce_response_to_bytes.rs
similarity index 100%
rename from aquatic_http_protocol/benches/bench_announce_response_to_bytes.rs
rename to crates/http_protocol/benches/bench_announce_response_to_bytes.rs
diff --git a/aquatic_http_protocol/benches/bench_request_from_bytes.rs b/crates/http_protocol/benches/bench_request_from_bytes.rs
similarity index 100%
rename from aquatic_http_protocol/benches/bench_request_from_bytes.rs
rename to crates/http_protocol/benches/bench_request_from_bytes.rs
diff --git a/aquatic_http_protocol/src/common.rs b/crates/http_protocol/src/common.rs
similarity index 100%
rename from aquatic_http_protocol/src/common.rs
rename to crates/http_protocol/src/common.rs
diff --git a/aquatic_http_protocol/src/lib.rs b/crates/http_protocol/src/lib.rs
similarity index 100%
rename from aquatic_http_protocol/src/lib.rs
rename to crates/http_protocol/src/lib.rs
diff --git a/aquatic_http_protocol/src/request.rs b/crates/http_protocol/src/request.rs
similarity index 100%
rename from aquatic_http_protocol/src/request.rs
rename to crates/http_protocol/src/request.rs
diff --git a/aquatic_http_protocol/src/response.rs b/crates/http_protocol/src/response.rs
similarity index 100%
rename from aquatic_http_protocol/src/response.rs
rename to crates/http_protocol/src/response.rs
diff --git a/aquatic_http_protocol/src/utils.rs b/crates/http_protocol/src/utils.rs
similarity index 100%
rename from aquatic_http_protocol/src/utils.rs
rename to crates/http_protocol/src/utils.rs
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/benchmark.json b/crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/benchmark.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/benchmark.json
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/benchmark.json
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/estimates.json b/crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/estimates.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/estimates.json
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/estimates.json
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/raw.csv b/crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/raw.csv
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/raw.csv
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/raw.csv
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/sample.json b/crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/sample.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/sample.json
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/sample.json
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/tukey.json b/crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/tukey.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/tukey.json
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/bendy/tukey.json
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/benchmark.json b/crates/http_protocol/target/criterion/announce-response-to-bytes/latest/benchmark.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/benchmark.json
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/latest/benchmark.json
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/estimates.json b/crates/http_protocol/target/criterion/announce-response-to-bytes/latest/estimates.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/estimates.json
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/latest/estimates.json
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/raw.csv b/crates/http_protocol/target/criterion/announce-response-to-bytes/latest/raw.csv
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/raw.csv
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/latest/raw.csv
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/sample.json b/crates/http_protocol/target/criterion/announce-response-to-bytes/latest/sample.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/sample.json
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/latest/sample.json
diff --git a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/tukey.json b/crates/http_protocol/target/criterion/announce-response-to-bytes/latest/tukey.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/tukey.json
rename to crates/http_protocol/target/criterion/announce-response-to-bytes/latest/tukey.json
diff --git a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/benchmark.json b/crates/http_protocol/target/criterion/request-from-bytes/latest/benchmark.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/request-from-bytes/latest/benchmark.json
rename to crates/http_protocol/target/criterion/request-from-bytes/latest/benchmark.json
diff --git a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/estimates.json b/crates/http_protocol/target/criterion/request-from-bytes/latest/estimates.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/request-from-bytes/latest/estimates.json
rename to crates/http_protocol/target/criterion/request-from-bytes/latest/estimates.json
diff --git a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/raw.csv b/crates/http_protocol/target/criterion/request-from-bytes/latest/raw.csv
similarity index 100%
rename from aquatic_http_protocol/target/criterion/request-from-bytes/latest/raw.csv
rename to crates/http_protocol/target/criterion/request-from-bytes/latest/raw.csv
diff --git a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/sample.json b/crates/http_protocol/target/criterion/request-from-bytes/latest/sample.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/request-from-bytes/latest/sample.json
rename to crates/http_protocol/target/criterion/request-from-bytes/latest/sample.json
diff --git a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/tukey.json b/crates/http_protocol/target/criterion/request-from-bytes/latest/tukey.json
similarity index 100%
rename from aquatic_http_protocol/target/criterion/request-from-bytes/latest/tukey.json
rename to crates/http_protocol/target/criterion/request-from-bytes/latest/tukey.json
diff --git a/aquatic_peer_id/Cargo.toml b/crates/peer_id/Cargo.toml
similarity index 100%
rename from aquatic_peer_id/Cargo.toml
rename to crates/peer_id/Cargo.toml
diff --git a/aquatic_peer_id/src/lib.rs b/crates/peer_id/src/lib.rs
similarity index 100%
rename from aquatic_peer_id/src/lib.rs
rename to crates/peer_id/src/lib.rs
diff --git a/aquatic_toml_config/Cargo.toml b/crates/toml_config/Cargo.toml
similarity index 100%
rename from aquatic_toml_config/Cargo.toml
rename to crates/toml_config/Cargo.toml
diff --git a/aquatic_toml_config/src/lib.rs b/crates/toml_config/src/lib.rs
similarity index 100%
rename from aquatic_toml_config/src/lib.rs
rename to crates/toml_config/src/lib.rs
diff --git a/aquatic_toml_config/tests/test.rs b/crates/toml_config/tests/test.rs
similarity index 100%
rename from aquatic_toml_config/tests/test.rs
rename to crates/toml_config/tests/test.rs
diff --git a/aquatic_toml_config_derive/Cargo.toml b/crates/toml_config_derive/Cargo.toml
similarity index 100%
rename from aquatic_toml_config_derive/Cargo.toml
rename to crates/toml_config_derive/Cargo.toml
diff --git a/aquatic_toml_config_derive/src/lib.rs b/crates/toml_config_derive/src/lib.rs
similarity index 100%
rename from aquatic_toml_config_derive/src/lib.rs
rename to crates/toml_config_derive/src/lib.rs
diff --git a/aquatic_udp/Cargo.toml b/crates/udp/Cargo.toml
similarity index 100%
rename from aquatic_udp/Cargo.toml
rename to crates/udp/Cargo.toml
diff --git a/aquatic_udp/src/common.rs b/crates/udp/src/common.rs
similarity index 100%
rename from aquatic_udp/src/common.rs
rename to crates/udp/src/common.rs
diff --git a/aquatic_udp/src/config.rs b/crates/udp/src/config.rs
similarity index 100%
rename from aquatic_udp/src/config.rs
rename to crates/udp/src/config.rs
diff --git a/aquatic_udp/src/lib.rs b/crates/udp/src/lib.rs
similarity index 100%
rename from aquatic_udp/src/lib.rs
rename to crates/udp/src/lib.rs
diff --git a/aquatic_udp/src/main.rs b/crates/udp/src/main.rs
similarity index 100%
rename from aquatic_udp/src/main.rs
rename to crates/udp/src/main.rs
diff --git a/aquatic_udp/src/workers/mod.rs b/crates/udp/src/workers/mod.rs
similarity index 100%
rename from aquatic_udp/src/workers/mod.rs
rename to crates/udp/src/workers/mod.rs
diff --git a/aquatic_udp/src/workers/socket/mio.rs b/crates/udp/src/workers/socket/mio.rs
similarity index 100%
rename from aquatic_udp/src/workers/socket/mio.rs
rename to crates/udp/src/workers/socket/mio.rs
diff --git a/aquatic_udp/src/workers/socket/mod.rs b/crates/udp/src/workers/socket/mod.rs
similarity index 100%
rename from aquatic_udp/src/workers/socket/mod.rs
rename to crates/udp/src/workers/socket/mod.rs
diff --git a/aquatic_udp/src/workers/socket/storage.rs b/crates/udp/src/workers/socket/storage.rs
similarity index 100%
rename from aquatic_udp/src/workers/socket/storage.rs
rename to crates/udp/src/workers/socket/storage.rs
diff --git a/aquatic_udp/src/workers/socket/uring/buf_ring.rs b/crates/udp/src/workers/socket/uring/buf_ring.rs
similarity index 100%
rename from aquatic_udp/src/workers/socket/uring/buf_ring.rs
rename to crates/udp/src/workers/socket/uring/buf_ring.rs
diff --git a/aquatic_udp/src/workers/socket/uring/mod.rs b/crates/udp/src/workers/socket/uring/mod.rs
similarity index 100%
rename from aquatic_udp/src/workers/socket/uring/mod.rs
rename to crates/udp/src/workers/socket/uring/mod.rs
diff --git a/aquatic_udp/src/workers/socket/uring/recv_helper.rs b/crates/udp/src/workers/socket/uring/recv_helper.rs
similarity index 100%
rename from aquatic_udp/src/workers/socket/uring/recv_helper.rs
rename to crates/udp/src/workers/socket/uring/recv_helper.rs
diff --git a/aquatic_udp/src/workers/socket/uring/send_buffers.rs b/crates/udp/src/workers/socket/uring/send_buffers.rs
similarity index 100%
rename from aquatic_udp/src/workers/socket/uring/send_buffers.rs
rename to crates/udp/src/workers/socket/uring/send_buffers.rs
diff --git a/aquatic_udp/src/workers/socket/validator.rs b/crates/udp/src/workers/socket/validator.rs
similarity index 100%
rename from aquatic_udp/src/workers/socket/validator.rs
rename to crates/udp/src/workers/socket/validator.rs
diff --git a/aquatic_udp/src/workers/statistics/collector.rs b/crates/udp/src/workers/statistics/collector.rs
similarity index 100%
rename from aquatic_udp/src/workers/statistics/collector.rs
rename to crates/udp/src/workers/statistics/collector.rs
diff --git a/aquatic_udp/src/workers/statistics/mod.rs b/crates/udp/src/workers/statistics/mod.rs
similarity index 100%
rename from aquatic_udp/src/workers/statistics/mod.rs
rename to crates/udp/src/workers/statistics/mod.rs
diff --git a/aquatic_udp/src/workers/swarm/mod.rs b/crates/udp/src/workers/swarm/mod.rs
similarity index 100%
rename from aquatic_udp/src/workers/swarm/mod.rs
rename to crates/udp/src/workers/swarm/mod.rs
diff --git a/aquatic_udp/src/workers/swarm/storage.rs b/crates/udp/src/workers/swarm/storage.rs
similarity index 100%
rename from aquatic_udp/src/workers/swarm/storage.rs
rename to crates/udp/src/workers/swarm/storage.rs
diff --git a/aquatic_udp/templates/statistics.css b/crates/udp/templates/statistics.css
similarity index 100%
rename from aquatic_udp/templates/statistics.css
rename to crates/udp/templates/statistics.css
diff --git a/aquatic_udp/templates/statistics.html b/crates/udp/templates/statistics.html
similarity index 100%
rename from aquatic_udp/templates/statistics.html
rename to crates/udp/templates/statistics.html
diff --git a/aquatic_udp/tests/access_list.rs b/crates/udp/tests/access_list.rs
similarity index 100%
rename from aquatic_udp/tests/access_list.rs
rename to crates/udp/tests/access_list.rs
diff --git a/aquatic_udp/tests/common/mod.rs b/crates/udp/tests/common/mod.rs
similarity index 100%
rename from aquatic_udp/tests/common/mod.rs
rename to crates/udp/tests/common/mod.rs
diff --git a/aquatic_udp/tests/invalid_connection_id.rs b/crates/udp/tests/invalid_connection_id.rs
similarity index 100%
rename from aquatic_udp/tests/invalid_connection_id.rs
rename to crates/udp/tests/invalid_connection_id.rs
diff --git a/aquatic_udp/tests/requests_responses.rs b/crates/udp/tests/requests_responses.rs
similarity index 100%
rename from aquatic_udp/tests/requests_responses.rs
rename to crates/udp/tests/requests_responses.rs
diff --git a/aquatic_udp_bench/Cargo.toml b/crates/udp_bench/Cargo.toml
similarity index 100%
rename from aquatic_udp_bench/Cargo.toml
rename to crates/udp_bench/Cargo.toml
diff --git a/aquatic_udp_bench/src/announce.rs b/crates/udp_bench/src/announce.rs
similarity index 100%
rename from aquatic_udp_bench/src/announce.rs
rename to crates/udp_bench/src/announce.rs
diff --git a/aquatic_udp_bench/src/common.rs b/crates/udp_bench/src/common.rs
similarity index 100%
rename from aquatic_udp_bench/src/common.rs
rename to crates/udp_bench/src/common.rs
diff --git a/aquatic_udp_bench/src/config.rs b/crates/udp_bench/src/config.rs
similarity index 100%
rename from aquatic_udp_bench/src/config.rs
rename to crates/udp_bench/src/config.rs
diff --git a/aquatic_udp_bench/src/main.rs b/crates/udp_bench/src/main.rs
similarity index 100%
rename from aquatic_udp_bench/src/main.rs
rename to crates/udp_bench/src/main.rs
diff --git a/aquatic_udp_bench/src/scrape.rs b/crates/udp_bench/src/scrape.rs
similarity index 100%
rename from aquatic_udp_bench/src/scrape.rs
rename to crates/udp_bench/src/scrape.rs
diff --git a/aquatic_udp_load_test/Cargo.toml b/crates/udp_load_test/Cargo.toml
similarity index 100%
rename from aquatic_udp_load_test/Cargo.toml
rename to crates/udp_load_test/Cargo.toml
diff --git a/aquatic_udp_load_test/src/common.rs b/crates/udp_load_test/src/common.rs
similarity index 100%
rename from aquatic_udp_load_test/src/common.rs
rename to crates/udp_load_test/src/common.rs
diff --git a/aquatic_udp_load_test/src/config.rs b/crates/udp_load_test/src/config.rs
similarity index 100%
rename from aquatic_udp_load_test/src/config.rs
rename to crates/udp_load_test/src/config.rs
diff --git a/aquatic_udp_load_test/src/main.rs b/crates/udp_load_test/src/main.rs
similarity index 100%
rename from aquatic_udp_load_test/src/main.rs
rename to crates/udp_load_test/src/main.rs
diff --git a/aquatic_udp_load_test/src/utils.rs b/crates/udp_load_test/src/utils.rs
similarity index 100%
rename from aquatic_udp_load_test/src/utils.rs
rename to crates/udp_load_test/src/utils.rs
diff --git a/aquatic_udp_load_test/src/worker/mod.rs b/crates/udp_load_test/src/worker/mod.rs
similarity index 100%
rename from aquatic_udp_load_test/src/worker/mod.rs
rename to crates/udp_load_test/src/worker/mod.rs
diff --git a/aquatic_udp_load_test/src/worker/request_gen.rs b/crates/udp_load_test/src/worker/request_gen.rs
similarity index 100%
rename from aquatic_udp_load_test/src/worker/request_gen.rs
rename to crates/udp_load_test/src/worker/request_gen.rs
diff --git a/aquatic_udp_protocol/Cargo.toml b/crates/udp_protocol/Cargo.toml
similarity index 100%
rename from aquatic_udp_protocol/Cargo.toml
rename to crates/udp_protocol/Cargo.toml
diff --git a/aquatic_udp_protocol/src/common.rs b/crates/udp_protocol/src/common.rs
similarity index 100%
rename from aquatic_udp_protocol/src/common.rs
rename to crates/udp_protocol/src/common.rs
diff --git a/aquatic_udp_protocol/src/lib.rs b/crates/udp_protocol/src/lib.rs
similarity index 100%
rename from aquatic_udp_protocol/src/lib.rs
rename to crates/udp_protocol/src/lib.rs
diff --git a/aquatic_udp_protocol/src/request.rs b/crates/udp_protocol/src/request.rs
similarity index 100%
rename from aquatic_udp_protocol/src/request.rs
rename to crates/udp_protocol/src/request.rs
diff --git a/aquatic_udp_protocol/src/response.rs b/crates/udp_protocol/src/response.rs
similarity index 100%
rename from aquatic_udp_protocol/src/response.rs
rename to crates/udp_protocol/src/response.rs
diff --git a/aquatic_ws/Cargo.toml b/crates/ws/Cargo.toml
similarity index 95%
rename from aquatic_ws/Cargo.toml
rename to crates/ws/Cargo.toml
index 598cb1f..d3e2f01 100644
--- a/aquatic_ws/Cargo.toml
+++ b/crates/ws/Cargo.toml
@@ -8,7 +8,7 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 readme.workspace = true
-rust-version.workspace = true
+rust-version = "1.70"
 
 [lib]
 name = "aquatic_ws"
@@ -28,7 +28,7 @@ aquatic_toml_config.workspace = true
 aquatic_ws_protocol.workspace = true
 
 anyhow = "1"
-async-tungstenite = "0.22"
+async-tungstenite = "0.23"
 cfg-if = "1"
 futures = "0.3"
 futures-lite = "1"
@@ -49,7 +49,7 @@ serde = { version = "1", features = ["derive"] }
 signal-hook = { version = "0.3" }
 slab = "0.4"
 socket2 = { version = "0.5", features = ["all"] }
-tungstenite = "0.19"
+tungstenite = "0.20"
 
 [dev-dependencies]
 quickcheck = "1"
diff --git a/aquatic_ws/src/common.rs b/crates/ws/src/common.rs
similarity index 100%
rename from aquatic_ws/src/common.rs
rename to crates/ws/src/common.rs
diff --git a/aquatic_ws/src/config.rs b/crates/ws/src/config.rs
similarity index 98%
rename from aquatic_ws/src/config.rs
rename to crates/ws/src/config.rs
index 25651e1..16903a2 100644
--- a/aquatic_ws/src/config.rs
+++ b/crates/ws/src/config.rs
@@ -76,6 +76,7 @@ pub struct NetworkConfig {
 
     pub websocket_max_message_size: usize,
     pub websocket_max_frame_size: usize,
+    pub websocket_write_buffer_size: usize,
 
     /// Return a HTTP 200 Ok response when receiving GET /health. Can not be
     /// combined with enable_tls.
@@ -95,6 +96,7 @@ impl Default for NetworkConfig {
 
             websocket_max_message_size: 64 * 1024,
             websocket_max_frame_size: 16 * 1024,
+            websocket_write_buffer_size: 8 * 1024,
 
             enable_http_health_checks: false,
         }
diff --git a/aquatic_ws/src/lib.rs b/crates/ws/src/lib.rs
similarity index 100%
rename from aquatic_ws/src/lib.rs
rename to crates/ws/src/lib.rs
diff --git a/aquatic_ws/src/main.rs b/crates/ws/src/main.rs
similarity index 100%
rename from aquatic_ws/src/main.rs
rename to crates/ws/src/main.rs
diff --git a/aquatic_ws/src/workers/mod.rs b/crates/ws/src/workers/mod.rs
similarity index 100%
rename from aquatic_ws/src/workers/mod.rs
rename to crates/ws/src/workers/mod.rs
diff --git a/aquatic_ws/src/workers/socket.rs b/crates/ws/src/workers/socket.rs
similarity index 99%
rename from aquatic_ws/src/workers/socket.rs
rename to crates/ws/src/workers/socket.rs
index 09c1884..58bfaa3 100644
--- a/aquatic_ws/src/workers/socket.rs
+++ b/crates/ws/src/workers/socket.rs
@@ -464,7 +464,8 @@ async fn run_stream_agnostic_connection<
     let ws_config = tungstenite::protocol::WebSocketConfig {
         max_frame_size: Some(config.network.websocket_max_frame_size),
         max_message_size: Some(config.network.websocket_max_message_size),
-        max_send_queue: Some(2),
+        write_buffer_size: config.network.websocket_write_buffer_size,
+        max_write_buffer_size: config.network.websocket_write_buffer_size * 3,
         ..Default::default()
     };
     let stream = async_tungstenite::accept_async_with_config(stream, Some(ws_config)).await?;
diff --git a/aquatic_ws/src/workers/swarm.rs b/crates/ws/src/workers/swarm.rs
similarity index 100%
rename from aquatic_ws/src/workers/swarm.rs
rename to crates/ws/src/workers/swarm.rs
diff --git a/aquatic_ws_load_test/Cargo.toml b/crates/ws_load_test/Cargo.toml
similarity index 95%
rename from aquatic_ws_load_test/Cargo.toml
rename to crates/ws_load_test/Cargo.toml
index e5c26d2..2ad2a72 100644
--- a/aquatic_ws_load_test/Cargo.toml
+++ b/crates/ws_load_test/Cargo.toml
@@ -19,7 +19,7 @@ aquatic_toml_config.workspace = true
 aquatic_ws_protocol.workspace = true
 
 anyhow = "1"
-async-tungstenite = "0.22"
+async-tungstenite = "0.23"
 futures = "0.3"
 futures-rustls = "0.24"
 glommio = "0.8"
@@ -30,7 +30,7 @@ rand_distr = "0.4"
 rustls = { version = "0.21", default-features = false, features = ["dangerous_configuration"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-tungstenite = "0.19"
+tungstenite = "0.20"
 
 [dev-dependencies]
 quickcheck = "1"
diff --git a/aquatic_ws_load_test/src/common.rs b/crates/ws_load_test/src/common.rs
similarity index 100%
rename from aquatic_ws_load_test/src/common.rs
rename to crates/ws_load_test/src/common.rs
diff --git a/aquatic_ws_load_test/src/config.rs b/crates/ws_load_test/src/config.rs
similarity index 100%
rename from aquatic_ws_load_test/src/config.rs
rename to crates/ws_load_test/src/config.rs
diff --git a/aquatic_ws_load_test/src/main.rs b/crates/ws_load_test/src/main.rs
similarity index 100%
rename from aquatic_ws_load_test/src/main.rs
rename to crates/ws_load_test/src/main.rs
diff --git a/aquatic_ws_load_test/src/network.rs b/crates/ws_load_test/src/network.rs
similarity index 99%
rename from aquatic_ws_load_test/src/network.rs
rename to crates/ws_load_test/src/network.rs
index b8b4c8d..e6ef638 100644
--- a/aquatic_ws_load_test/src/network.rs
+++ b/crates/ws_load_test/src/network.rs
@@ -148,7 +148,6 @@ impl Connection {
                 };
 
                 self.stream.send(request.to_ws_message()).await?;
-                self.stream.flush().await?;
 
                 self.load_test_state
                     .statistics
diff --git a/aquatic_ws_load_test/src/utils.rs b/crates/ws_load_test/src/utils.rs
similarity index 100%
rename from aquatic_ws_load_test/src/utils.rs
rename to crates/ws_load_test/src/utils.rs
diff --git a/aquatic_ws_protocol/Cargo.toml b/crates/ws_protocol/Cargo.toml
similarity index 89%
rename from aquatic_ws_protocol/Cargo.toml
rename to crates/ws_protocol/Cargo.toml
index ba89914..54053a0 100644
--- a/aquatic_ws_protocol/Cargo.toml
+++ b/crates/ws_protocol/Cargo.toml
@@ -24,8 +24,8 @@ anyhow = "1"
 hashbrown = { version = "0.14", features = ["serde"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-simd-json = { version = "0.10", features = ["allow-non-simd"] }
-tungstenite = "0.19"
+simd-json = "0.12"
+tungstenite = "0.20"
 
 [dev-dependencies]
 criterion = "0.5"
diff --git a/aquatic_ws_protocol/benches/bench_deserialize_announce_request.rs b/crates/ws_protocol/benches/bench_deserialize_announce_request.rs
similarity index 100%
rename from aquatic_ws_protocol/benches/bench_deserialize_announce_request.rs
rename to crates/ws_protocol/benches/bench_deserialize_announce_request.rs
diff --git a/aquatic_ws_protocol/src/common.rs b/crates/ws_protocol/src/common.rs
similarity index 100%
rename from aquatic_ws_protocol/src/common.rs
rename to crates/ws_protocol/src/common.rs
diff --git a/aquatic_ws_protocol/src/lib.rs b/crates/ws_protocol/src/lib.rs
similarity index 100%
rename from aquatic_ws_protocol/src/lib.rs
rename to crates/ws_protocol/src/lib.rs
diff --git a/aquatic_ws_protocol/src/request/announce.rs b/crates/ws_protocol/src/request/announce.rs
similarity index 100%
rename from aquatic_ws_protocol/src/request/announce.rs
rename to crates/ws_protocol/src/request/announce.rs
diff --git a/aquatic_ws_protocol/src/request/mod.rs b/crates/ws_protocol/src/request/mod.rs
similarity index 100%
rename from aquatic_ws_protocol/src/request/mod.rs
rename to crates/ws_protocol/src/request/mod.rs
diff --git a/aquatic_ws_protocol/src/request/scrape.rs b/crates/ws_protocol/src/request/scrape.rs
similarity index 100%
rename from aquatic_ws_protocol/src/request/scrape.rs
rename to crates/ws_protocol/src/request/scrape.rs
diff --git a/aquatic_ws_protocol/src/response/announce.rs b/crates/ws_protocol/src/response/announce.rs
similarity index 100%
rename from aquatic_ws_protocol/src/response/announce.rs
rename to crates/ws_protocol/src/response/announce.rs
diff --git a/aquatic_ws_protocol/src/response/answer.rs b/crates/ws_protocol/src/response/answer.rs
similarity index 100%
rename from aquatic_ws_protocol/src/response/answer.rs
rename to crates/ws_protocol/src/response/answer.rs
diff --git a/aquatic_ws_protocol/src/response/error.rs b/crates/ws_protocol/src/response/error.rs
similarity index 100%
rename from aquatic_ws_protocol/src/response/error.rs
rename to crates/ws_protocol/src/response/error.rs
diff --git a/aquatic_ws_protocol/src/response/mod.rs b/crates/ws_protocol/src/response/mod.rs
similarity index 100%
rename from aquatic_ws_protocol/src/response/mod.rs
rename to crates/ws_protocol/src/response/mod.rs
diff --git a/aquatic_ws_protocol/src/response/offer.rs b/crates/ws_protocol/src/response/offer.rs
similarity index 100%
rename from aquatic_ws_protocol/src/response/offer.rs
rename to crates/ws_protocol/src/response/offer.rs
diff --git a/aquatic_ws_protocol/src/response/scrape.rs b/crates/ws_protocol/src/response/scrape.rs
similarity index 100%
rename from aquatic_ws_protocol/src/response/scrape.rs
rename to crates/ws_protocol/src/response/scrape.rs
diff --git a/aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/benchmark.json b/crates/ws_protocol/target/criterion/deserialize-announce-request/latest/benchmark.json
similarity index 100%
rename from aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/benchmark.json
rename to crates/ws_protocol/target/criterion/deserialize-announce-request/latest/benchmark.json
diff --git a/aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/estimates.json b/crates/ws_protocol/target/criterion/deserialize-announce-request/latest/estimates.json
similarity index 100%
rename from aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/estimates.json
rename to crates/ws_protocol/target/criterion/deserialize-announce-request/latest/estimates.json
diff --git a/aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/raw.csv b/crates/ws_protocol/target/criterion/deserialize-announce-request/latest/raw.csv
similarity index 100%
rename from aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/raw.csv
rename to crates/ws_protocol/target/criterion/deserialize-announce-request/latest/raw.csv
diff --git a/aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/sample.json b/crates/ws_protocol/target/criterion/deserialize-announce-request/latest/sample.json
similarity index 100%
rename from aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/sample.json
rename to crates/ws_protocol/target/criterion/deserialize-announce-request/latest/sample.json
diff --git a/aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/tukey.json b/crates/ws_protocol/target/criterion/deserialize-announce-request/latest/tukey.json
similarity index 100%
rename from aquatic_ws_protocol/target/criterion/deserialize-announce-request/latest/tukey.json
rename to crates/ws_protocol/target/criterion/deserialize-announce-request/latest/tukey.json