diff --git a/tuic/Cargo.toml b/tuic/Cargo.toml
index 92f686a..3ccc9c8 100644
--- a/tuic/Cargo.toml
+++ b/tuic/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tuic"
-version = "5.0.0-pre-alpha4"
+version = "5.0.0-pre-alpha5"
 authors = ["EAimTY <ea.imty@gmail.com>"]
 description = "Delicately-TUICed 0-RTT proxy protocol"
 categories = ["network-programming"]
diff --git a/tuic/src/marshal.rs b/tuic/src/marshal.rs
index c87a590..20063f9 100644
--- a/tuic/src/marshal.rs
+++ b/tuic/src/marshal.rs
@@ -1,6 +1,4 @@
-use crate::protocol::{
-    Address, Authenticate, Connect, Dissociate, Header, Heartbeat, Packet, VERSION,
-};
+use crate::{Address, Authenticate, Connect, Dissociate, Header, Heartbeat, Packet, VERSION};
 use bytes::BufMut;
 use futures_util::{AsyncWrite, AsyncWriteExt};
 use std::{
diff --git a/tuic/src/model/authenticate.rs b/tuic/src/model/authenticate.rs
index b913692..2c0f6a9 100644
--- a/tuic/src/model/authenticate.rs
+++ b/tuic/src/model/authenticate.rs
@@ -1,5 +1,5 @@
 use super::side::{self, Side};
-use crate::protocol::{Authenticate as AuthenticateHeader, Header};
+use crate::{Authenticate as AuthenticateHeader, Header};
 use std::fmt::{Debug, Formatter, Result as FmtResult};
 use uuid::Uuid;
 
diff --git a/tuic/src/model/connect.rs b/tuic/src/model/connect.rs
index 5c029d6..e8c8522 100644
--- a/tuic/src/model/connect.rs
+++ b/tuic/src/model/connect.rs
@@ -1,5 +1,5 @@
 use super::side::{self, Side};
-use crate::protocol::{Address, Connect as ConnectHeader, Header};
+use crate::{Address, Connect as ConnectHeader, Header};
 use register_count::Register;
 use std::fmt::{Debug, Formatter, Result as FmtResult};
 
diff --git a/tuic/src/model/dissociate.rs b/tuic/src/model/dissociate.rs
index 5d6dcb2..a7bf40d 100644
--- a/tuic/src/model/dissociate.rs
+++ b/tuic/src/model/dissociate.rs
@@ -1,5 +1,5 @@
 use super::side::{self, Side};
-use crate::protocol::{Dissociate as DissociateHeader, Header};
+use crate::{Dissociate as DissociateHeader, Header};
 use std::fmt::{Debug, Formatter, Result as FmtResult};
 
 /// The model of the `Dissociate` command
diff --git a/tuic/src/model/heartbeat.rs b/tuic/src/model/heartbeat.rs
index 5bf6ce2..5ca9941 100644
--- a/tuic/src/model/heartbeat.rs
+++ b/tuic/src/model/heartbeat.rs
@@ -1,5 +1,5 @@
 use super::side::{self, Side};
-use crate::protocol::{Header, Heartbeat as HeartbeatHeader};
+use crate::{Header, Heartbeat as HeartbeatHeader};
 use std::fmt::{Debug, Formatter, Result as FmtResult};
 
 pub struct Heartbeat<M> {
diff --git a/tuic/src/model/mod.rs b/tuic/src/model/mod.rs
index 620ef13..e928d0c 100644
--- a/tuic/src/model/mod.rs
+++ b/tuic/src/model/mod.rs
@@ -1,6 +1,6 @@
 //! An abstraction of a TUIC connection, with packet fragmentation management and task counters. No I/O operation is involved internally
 
-use crate::protocol::{
+use crate::{
     Address, Authenticate as AuthenticateHeader, Connect as ConnectHeader,
     Dissociate as DissociateHeader, Heartbeat as HeartbeatHeader, Packet as PacketHeader,
 };
diff --git a/tuic/src/model/packet.rs b/tuic/src/model/packet.rs
index e357cf6..ded42db 100644
--- a/tuic/src/model/packet.rs
+++ b/tuic/src/model/packet.rs
@@ -2,7 +2,7 @@ use super::{
     side::{self, Side},
     Assemblable, AssembleError, UdpSessions,
 };
-use crate::protocol::{Address, Header, Packet as PacketHeader};
+use crate::{Address, Header, Packet as PacketHeader};
 use parking_lot::Mutex;
 use std::{
     fmt::{Debug, Formatter, Result as FmtResult},
diff --git a/tuic/src/unmarshal.rs b/tuic/src/unmarshal.rs
index a6b7422..5f3c307 100644
--- a/tuic/src/unmarshal.rs
+++ b/tuic/src/unmarshal.rs
@@ -1,6 +1,4 @@
-use crate::protocol::{
-    Address, Authenticate, Connect, Dissociate, Header, Heartbeat, Packet, VERSION,
-};
+use crate::{Address, Authenticate, Connect, Dissociate, Header, Heartbeat, Packet, VERSION};
 use futures_util::{AsyncRead, AsyncReadExt};
 use std::{
     io::{Error as IoError, Read},