diff --git a/distant-core-net/src/connection.rs b/distant-core-net/src/connection.rs
index d90fbaa..1692b51 100644
--- a/distant-core-net/src/connection.rs
+++ b/distant-core-net/src/connection.rs
@@ -511,7 +511,7 @@ mod tests {
     use test_log::test;
 
     use super::*;
-    use crate::common::Frame;
+    use crate::Frame;
 
     macro_rules! server_version {
         () => {
diff --git a/distant-core-net/src/listener/tcp.rs b/distant-core-net/src/listener/tcp.rs
index 8189572..5940186 100644
--- a/distant-core-net/src/listener/tcp.rs
+++ b/distant-core-net/src/listener/tcp.rs
@@ -74,7 +74,7 @@ mod tests {
     use tokio::task::JoinHandle;
 
     use super::*;
-    use crate::common::TransportExt;
+    use crate::TransportExt;
 
     #[test(tokio::test)]
     async fn should_fail_to_bind_if_port_already_bound() {
diff --git a/distant-core-net/src/listener/unix.rs b/distant-core-net/src/listener/unix.rs
index 83ab770..a598afe 100644
--- a/distant-core-net/src/listener/unix.rs
+++ b/distant-core-net/src/listener/unix.rs
@@ -100,7 +100,7 @@ mod tests {
     use tokio::task::JoinHandle;
 
     use super::*;
-    use crate::common::TransportExt;
+    use crate::TransportExt;
 
     #[test(tokio::test)]
     async fn should_succeed_to_bind_if_file_exists_at_path_but_nothing_listening() {
diff --git a/distant-core-net/src/listener/windows.rs b/distant-core-net/src/listener/windows.rs
index 9cf6859..2a57562 100644
--- a/distant-core-net/src/listener/windows.rs
+++ b/distant-core-net/src/listener/windows.rs
@@ -71,7 +71,7 @@ mod tests {
     use tokio::task::JoinHandle;
 
     use super::*;
-    use crate::common::TransportExt;
+    use crate::TransportExt;
 
     #[test(tokio::test)]
     async fn should_fail_to_bind_if_pipe_already_bound() {
diff --git a/distant-core-net/src/transport/framed.rs b/distant-core-net/src/transport/framed.rs
index ef88395..721d2a2 100644
--- a/distant-core-net/src/transport/framed.rs
+++ b/distant-core-net/src/transport/framed.rs
@@ -915,7 +915,7 @@ mod tests {
     use test_log::test;
 
     use super::*;
-    use crate::common::TestTransport;
+    use crate::TestTransport;
 
     /// Codec that always succeeds without altering the frame
     #[derive(Clone, Debug, PartialEq, Eq)]
diff --git a/distant-core-net/src/version.rs b/distant-core-net/src/version.rs
index 9db9a6c..feadd1b 100644
--- a/distant-core-net/src/version.rs
+++ b/distant-core-net/src/version.rs
@@ -15,7 +15,7 @@ impl Version {
     /// major version is `0`.
     ///
     /// ```
-    /// use distant_core_net::common::Version;
+    /// use distant_core_net::Version;
     ///
     /// // Matching versions are compatible
     /// let a = Version::new(1, 2, 3);
diff --git a/distant-core-net/tests/typed_tests.rs b/distant-core/tests/typed_tests.rs
similarity index 100%
rename from distant-core-net/tests/typed_tests.rs
rename to distant-core/tests/typed_tests.rs
diff --git a/distant-core-net/tests/untyped_tests.rs b/distant-core/tests/untyped_tests.rs
similarity index 100%
rename from distant-core-net/tests/untyped_tests.rs
rename to distant-core/tests/untyped_tests.rs