5 files changed, 26 insertions, 28 deletions
diff --git a/src/libextra/extra.rs b/src/libextra/extra.rs
index 50c57b28d22..2d222099f2d 100644
--- a/src/libextra/extra.rs
+++ b/src/libextra/extra.rs
@@ -40,10 +40,8 @@ pub mod uv_ll;
 
 // General io and system-services modules
 
+#[path = "net/mod.rs"]
 pub mod net;
-pub mod net_ip;
-pub mod net_tcp;
-pub mod net_url;
 
 // libuv modules
 pub mod uv;
diff --git a/src/libextra/net_ip.rs b/src/libextra/net/ip.rs
index d18aac68481..8db5c65b750 100644
--- a/src/libextra/net_ip.rs
+++ b/src/libextra/net/ip.rs
@@ -22,20 +22,20 @@ use std::str;
 use iotask = uv::iotask::IoTask;
 use interact = uv::iotask::interact;
 
-use sockaddr_in = super::uv_ll::sockaddr_in;
-use sockaddr_in6 = super::uv_ll::sockaddr_in6;
-use addrinfo = super::uv_ll::addrinfo;
-use uv_getaddrinfo_t = super::uv_ll::uv_getaddrinfo_t;
-use uv_ip4_name = super::uv_ll::ip4_name;
-use uv_ip4_port = super::uv_ll::ip4_port;
-use uv_ip6_name = super::uv_ll::ip6_name;
-use uv_ip6_port = super::uv_ll::ip6_port;
-use uv_getaddrinfo = super::uv_ll::getaddrinfo;
-use uv_freeaddrinfo = super::uv_ll::freeaddrinfo;
-use create_uv_getaddrinfo_t = super::uv_ll::getaddrinfo_t;
-use set_data_for_req = super::uv_ll::set_data_for_req;
-use get_data_for_req = super::uv_ll::get_data_for_req;
-use ll = super::uv_ll;
+use sockaddr_in = super::super::uv_ll::sockaddr_in;
+use sockaddr_in6 = super::super::uv_ll::sockaddr_in6;
+use addrinfo = super::super::uv_ll::addrinfo;
+use uv_getaddrinfo_t = super::super::uv_ll::uv_getaddrinfo_t;
+use uv_ip4_name = super::super::uv_ll::ip4_name;
+use uv_ip4_port = super::super::uv_ll::ip4_port;
+use uv_ip6_name = super::super::uv_ll::ip6_name;
+use uv_ip6_port = super::super::uv_ll::ip6_port;
+use uv_getaddrinfo = super::super::uv_ll::getaddrinfo;
+use uv_freeaddrinfo = super::super::uv_ll::freeaddrinfo;
+use create_uv_getaddrinfo_t = super::super::uv_ll::getaddrinfo_t;
+use set_data_for_req = super::super::uv_ll::set_data_for_req;
+use get_data_for_req = super::super::uv_ll::get_data_for_req;
+use ll = super::super::uv_ll;
 
 /// An IP address
 pub enum IpAddr {
@@ -363,9 +363,9 @@ extern fn get_addr_cb(handle: *uv_getaddrinfo_t,
 #[cfg(test)]
 mod test {
 
-    use net_ip::*;
-    use net_ip::v4;
-    use net_ip::v6;
+    use net::ip::*;
+    use net::ip::v4;
+    use net::ip::v6;
     use uv;
 
     use std::result;
diff --git a/src/libextra/net.rs b/src/libextra/net/mod.rs
index ca1cc123596..463260bd3dc 100644
--- a/src/libextra/net.rs
+++ b/src/libextra/net/mod.rs
@@ -13,13 +13,13 @@ Top-level module for network-related functionality.
 
 Basically, including this module gives you:
 
-* `net_tcp`
-* `net_ip`
-* `net_url`
+* `tcp`
+* `ip`
+* `url`
 
 See each of those three modules for documentation on what they do.
 */
 
-pub use tcp = net_tcp;
-pub use ip = net_ip;
-pub use url = net_url;
+pub mod tcp;
+pub mod ip;
+pub mod url;
diff --git a/src/libextra/net_tcp.rs b/src/libextra/net/tcp.rs
index 6a22950ec04..e0ed313bc02 100644
--- a/src/libextra/net_tcp.rs
+++ b/src/libextra/net/tcp.rs
@@ -16,7 +16,7 @@
 
 use future;
 use future_spawn = future::spawn;
-use ip = net_ip;
+use ip = net::ip;
 use uv;
 use uv::iotask;
 use uv::iotask::IoTask;
diff --git a/src/libextra/net_url.rs b/src/libextra/net/url.rs
index 9ac58efe793..4ed8761cc11 100644
--- a/src/libextra/net_url.rs
+++ b/src/libextra/net/url.rs
@@ -800,7 +800,7 @@ fn test_get_path() {
 #[cfg(test)]
 mod tests {
 
-    use net_url::*;
+    use net::url::*;
 
     use std::hashmap::HashMap;