diff --git a/net/src/address.rs b/net/src/common/address.rs
similarity index 96%
rename from net/src/address.rs
rename to net/src/common/address.rs
index aebc96f1..e9a67485 100644
--- a/net/src/address.rs
+++ b/net/src/common/address.rs
@@ -3,7 +3,7 @@ use ser::{
 	Stream, Serializable,
 	Reader, Deserializable, Error as ReaderError, deserialize,
 };
-use {Port, IpAddress, ServiceFlags};
+use common::{Port, IpAddress, ServiceFlags};
 
 #[derive(Debug, PartialEq)]
 pub struct NetAddress {
@@ -42,7 +42,7 @@ impl From<&'static str> for NetAddress {
 #[cfg(test)]
 mod tests {
 	use ser::{serialize, deserialize};
-	use ServiceFlags;
+	use common::ServiceFlags;
 	use super::NetAddress;
 
 	#[test]
diff --git a/net/src/command.rs b/net/src/common/command.rs
similarity index 99%
rename from net/src/command.rs
rename to net/src/common/command.rs
index 7234d030..d0e53879 100644
--- a/net/src/command.rs
+++ b/net/src/common/command.rs
@@ -2,7 +2,7 @@ use std::{str, fmt};
 use std::ascii::AsciiExt;
 use hash::H96;
 use ser::{Serializable, Stream, Deserializable, Reader, Error as ReaderError};
-use Error;
+use common::Error;
 
 #[derive(Debug, PartialEq)]
 pub struct Command(H96);
diff --git a/net/src/error.rs b/net/src/common/error.rs
similarity index 100%
rename from net/src/error.rs
rename to net/src/common/error.rs
diff --git a/net/src/inventory.rs b/net/src/common/inventory.rs
similarity index 100%
rename from net/src/inventory.rs
rename to net/src/common/inventory.rs
diff --git a/net/src/ip.rs b/net/src/common/ip.rs
similarity index 100%
rename from net/src/ip.rs
rename to net/src/common/ip.rs
diff --git a/net/src/common/mod.rs b/net/src/common/mod.rs
new file mode 100644
index 00000000..169f2285
--- /dev/null
+++ b/net/src/common/mod.rs
@@ -0,0 +1,15 @@
+mod address;
+mod command;
+mod error;
+mod inventory;
+mod ip;
+mod port;
+mod service;
+
+pub use self::address::NetAddress;
+pub use self::command::Command;
+pub use self::error::Error;
+pub use self::inventory::{InventoryVector, InventoryType};
+pub use self::ip::IpAddress;
+pub use self::port::Port;
+pub use self::service::ServiceFlags;
diff --git a/net/src/port.rs b/net/src/common/port.rs
similarity index 100%
rename from net/src/port.rs
rename to net/src/common/port.rs
diff --git a/net/src/service.rs b/net/src/common/service.rs
similarity index 100%
rename from net/src/service.rs
rename to net/src/common/service.rs
diff --git a/net/src/lib.rs b/net/src/lib.rs
index 5cc41143..e755707d 100644
--- a/net/src/lib.rs
+++ b/net/src/lib.rs
@@ -3,28 +3,7 @@ extern crate bitcrypto as crypto;
 extern crate primitives;
 extern crate serialization as ser;
 
-mod address;
-mod command;
-mod error;
-mod inventory;
-mod ip;
-mod message;
-mod message_header;
-mod payload;
-mod port;
-mod service;
-mod version;
+mod common;
+mod messages;
 
 pub use primitives::{hash, bytes};
-
-pub use self::address::NetAddress;
-pub use self::command::Command;
-pub use self::error::Error;
-pub use self::inventory::{InventoryVector, InventoryType};
-pub use self::ip::IpAddress;
-pub use self::message::Message;
-pub use self::message_header::MessageHeader;
-pub use self::payload::Payload;
-pub use self::port::Port;
-pub use self::service::ServiceFlags;
-pub use self::version::{Version, Simple, V106, V70001};
diff --git a/net/src/message.rs b/net/src/messages/message.rs
similarity index 97%
rename from net/src/message.rs
rename to net/src/messages/message.rs
index 6895cc5c..9af7ac6d 100644
--- a/net/src/message.rs
+++ b/net/src/messages/message.rs
@@ -3,7 +3,7 @@ use ser::{
 	Deserializable, Reader, Error as ReaderError,
 	Serializable, Stream, serialize
 };
-use {MessageHeader, Payload};
+use messages::{MessageHeader, Payload};
 
 #[derive(Debug, PartialEq)]
 pub struct Message {
@@ -59,7 +59,7 @@ impl Deserializable for Message {
 mod tests {
 	use bytes::Bytes;
 	use ser::{serialize, deserialize};
-	use {Version, Payload};
+	use messages::{Payload, Version};
 	use super::Message;
 
 	#[test]
diff --git a/net/src/message_header.rs b/net/src/messages/message_header.rs
similarity index 97%
rename from net/src/message_header.rs
rename to net/src/messages/message_header.rs
index 32a3516b..b9410d4e 100644
--- a/net/src/message_header.rs
+++ b/net/src/messages/message_header.rs
@@ -3,7 +3,7 @@ use ser::{
 	Serializable, Stream,
 	Deserializable, Reader, Error as ReaderError
 };
-use Command;
+use common::Command;
 
 #[derive(Debug, PartialEq)]
 pub struct MessageHeader {
diff --git a/net/src/messages/mod.rs b/net/src/messages/mod.rs
new file mode 100644
index 00000000..67185e6f
--- /dev/null
+++ b/net/src/messages/mod.rs
@@ -0,0 +1,9 @@
+mod message;
+mod message_header;
+mod payload;
+mod version;
+
+pub use self::message::Message;
+pub use self::message_header::MessageHeader;
+pub use self::payload::Payload;
+pub use self::version::{Version, Simple, V106, V70001};
diff --git a/net/src/payload.rs b/net/src/messages/payload.rs
similarity index 94%
rename from net/src/payload.rs
rename to net/src/messages/payload.rs
index 871d0689..3acaf8ce 100644
--- a/net/src/payload.rs
+++ b/net/src/messages/payload.rs
@@ -2,7 +2,8 @@ use ser::{
 	Serializable, Stream,
 	Reader, Error as ReaderError
 };
-use {Version, Command};
+use common::Command;
+use messages::{Version};
 
 #[derive(Debug, PartialEq)]
 pub enum Payload {
diff --git a/net/src/version.rs b/net/src/messages/version.rs
similarity index 99%
rename from net/src/version.rs
rename to net/src/messages/version.rs
index 0fc56fe8..f89e1320 100644
--- a/net/src/version.rs
+++ b/net/src/messages/version.rs
@@ -3,7 +3,7 @@ use ser::{
 	Serializable, Stream,
 	Deserializable, Reader, Error as ReaderError, deserialize
 };
-use {ServiceFlags, NetAddress};
+use common::{NetAddress, ServiceFlags};
 
 #[derive(Debug, PartialEq)]
 pub enum Version {