diff --git a/quinn-proto/src/assembler.rs b/quinn-proto/src/connection/assembler.rs
similarity index 100%
rename from quinn-proto/src/assembler.rs
rename to quinn-proto/src/connection/assembler.rs
diff --git a/quinn-proto/src/connection.rs b/quinn-proto/src/connection/mod.rs
similarity index 99%
rename from quinn-proto/src/connection.rs
rename to quinn-proto/src/connection/mod.rs
index 217041b4c..475069db9 100644
--- a/quinn-proto/src/connection.rs
+++ b/quinn-proto/src/connection/mod.rs
@@ -24,15 +24,25 @@ use crate::{
         ConnectionEvent, ConnectionEventInner, ConnectionId, EcnCodepoint, EndpointConfig,
         EndpointEvent, EndpointEventInner, IssuedCid, ServerConfig, TransportConfig,
     },
-    spaces::{CryptoSpace, PacketSpace, Retransmits, SentPacket},
-    streams::{self, FinishError, ReadError, Streams, UnknownStream, WriteError},
-    timer::{Timer, TimerTable},
     transport_parameters::{self, TransportParameters},
     Dir, Frame, Side, StreamId, Transmit, TransportError, TransportErrorCode, VarInt,
     LOC_CID_COUNT, MAX_STREAM_COUNT, MIN_INITIAL_SIZE, MIN_MTU, RESET_TOKEN_SIZE,
     TIMER_GRANULARITY,
 };
 
+mod assembler;
+mod send_buffer;
+
+mod spaces;
+use spaces::{CryptoSpace, PacketSpace, Retransmits, SentPacket};
+
+mod streams;
+use streams::Streams;
+pub use streams::{FinishError, ReadError, UnknownStream, WriteError};
+
+mod timer;
+use timer::{Timer, TimerTable};
+
 /// Protocol state and logic for a single QUIC connection
 ///
 /// Objects of this type receive `ConnectionEvent`s and emit `EndpointEvents` and application
diff --git a/quinn-proto/src/send_buffer.rs b/quinn-proto/src/connection/send_buffer.rs
similarity index 100%
rename from quinn-proto/src/send_buffer.rs
rename to quinn-proto/src/connection/send_buffer.rs
diff --git a/quinn-proto/src/spaces.rs b/quinn-proto/src/connection/spaces.rs
similarity index 99%
rename from quinn-proto/src/spaces.rs
rename to quinn-proto/src/connection/spaces.rs
index 54bd5af98..414c1eb06 100644
--- a/quinn-proto/src/spaces.rs
+++ b/quinn-proto/src/connection/spaces.rs
@@ -5,9 +5,8 @@ use std::{
     time::Instant,
 };
 
-use crate::{
-    assembler::Assembler, crypto, frame, range_set::RangeSet, shared::IssuedCid, StreamId, VarInt,
-};
+use super::assembler::Assembler;
+use crate::{crypto, frame, range_set::RangeSet, shared::IssuedCid, StreamId, VarInt};
 
 pub(crate) struct PacketSpace<K>
 where
diff --git a/quinn-proto/src/streams.rs b/quinn-proto/src/connection/streams.rs
similarity index 99%
rename from quinn-proto/src/streams.rs
rename to quinn-proto/src/connection/streams.rs
index d13dd9c22..8417cdfe7 100644
--- a/quinn-proto/src/streams.rs
+++ b/quinn-proto/src/connection/streams.rs
@@ -4,11 +4,10 @@ use bytes::{BufMut, Bytes};
 use err_derive::Error;
 use tracing::{debug, trace};
 
+use super::{assembler::Assembler, send_buffer::SendBuffer};
 use crate::{
-    assembler::Assembler,
     frame::{self, FrameStruct},
     range_set::RangeSet,
-    send_buffer::SendBuffer,
     transport_parameters::TransportParameters,
     Dir, Side, StreamId, TransportError, VarInt,
 };
diff --git a/quinn-proto/src/timer.rs b/quinn-proto/src/connection/timer.rs
similarity index 100%
rename from quinn-proto/src/timer.rs
rename to quinn-proto/src/connection/timer.rs
diff --git a/quinn-proto/src/lib.rs b/quinn-proto/src/lib.rs
index 47575b85e..4186e2981 100644
--- a/quinn-proto/src/lib.rs
+++ b/quinn-proto/src/lib.rs
@@ -20,18 +20,14 @@
 
 use std::{fmt, net::SocketAddr, ops, time::Duration};
 
-mod assembler;
 mod cid_queue;
 #[doc(hidden)]
 pub mod coding;
 mod constant_time;
 mod packet;
 mod range_set;
-mod send_buffer;
-mod spaces;
 #[cfg(all(test, feature = "rustls"))]
 mod tests;
-mod timer;
 pub mod transport_parameters;
 mod varint;
 
@@ -39,6 +35,7 @@ pub use varint::{VarInt, VarIntBoundsExceeded};
 
 mod connection;
 pub use crate::connection::{ConnectionError, Event, SendDatagramError};
+pub use crate::connection::{FinishError, ReadError, UnknownStream, WriteError};
 
 pub mod crypto;
 #[cfg(feature = "rustls")]
@@ -56,9 +53,6 @@ pub use crate::shared::{
     ConfigError, ConnectionEvent, ConnectionId, EcnCodepoint, EndpointEvent, TransportConfig,
 };
 
-mod streams;
-pub use crate::streams::{FinishError, ReadError, UnknownStream, WriteError};
-
 mod transport_error;
 pub use crate::transport_error::{Code as TransportErrorCode, Error as TransportError};