diff --git a/Sources/Sockets/BaseSocket.swift b/Sources/NIO/BaseSocket.swift
similarity index 88%
rename from Sources/Sockets/BaseSocket.swift
rename to Sources/NIO/BaseSocket.swift
index f7f37dc2..69ce4790 100644
--- a/Sources/Sockets/BaseSocket.swift
+++ b/Sources/NIO/BaseSocket.swift
@@ -28,20 +28,21 @@ import Foundation
     let sysSOCK_STREAM = SOCK_STREAM
 #endif
 
-public protocol Registration {
+protocol Registration {
     var interested: IOEvent { get set }
 }
 
-public class BaseSocket : Selectable {
+class BaseSocket : Selectable {
     public let descriptor: Int32
     public private(set) var open: Bool
     
-    public final var localAddress: SocketAddress? {
+    final var localAddress: SocketAddress? {
         get {
             return nil
         }
     }
-    public final var remoteAddress: SocketAddress? {
+    
+    final var remoteAddress: SocketAddress? {
         get {
             return nil
         }
@@ -60,7 +61,7 @@ public class BaseSocket : Selectable {
         self.open = true
     }
 
-    public final func setNonBlocking() throws {
+    final func setNonBlocking() throws {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't control file descriptor as it's not open anymore.")
         }
@@ -70,7 +71,7 @@ public class BaseSocket : Selectable {
         }
     }
     
-    public final func setOption<T>(level: Int32, name: Int32, value: T) throws {
+    final func setOption<T>(level: Int32, name: Int32, value: T) throws {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't set socket options as it's not open anymore.")
         }
@@ -87,7 +88,7 @@ public class BaseSocket : Selectable {
         }
     }
 
-    public final func getOption<T>(level: Int32, name: Int32) throws -> T {
+    final func getOption<T>(level: Int32, name: Int32) throws -> T {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't get socket options as it's not open anymore.")
         }
@@ -105,7 +106,7 @@ public class BaseSocket : Selectable {
         return val.pointee
     }
     
-    public final func bind(to address: SocketAddress) throws {
+    final func bind(to address: SocketAddress) throws {
         switch address {
         case .v4(address: let addr):
             try bindSocket(addr: addr)
@@ -129,7 +130,7 @@ public class BaseSocket : Selectable {
         }
     }
     
-    public final func close() throws {
+    final func close() throws {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't close socket (as it's not open anymore.")
         }
diff --git a/Sources/NIO/Bootstrap.swift b/Sources/NIO/Bootstrap.swift
index afb55fa1..70c3f545 100644
--- a/Sources/NIO/Bootstrap.swift
+++ b/Sources/NIO/Bootstrap.swift
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import Sockets
 
 public final class ServerBootstrap {
     
diff --git a/Sources/NIO/Channel.swift b/Sources/NIO/Channel.swift
index e3565aed..61568fc0 100644
--- a/Sources/NIO/Channel.swift
+++ b/Sources/NIO/Channel.swift
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import Sockets
 import ConcurrencyHelpers
 
 #if os(Linux)
diff --git a/Sources/NIO/ChannelHandler.swift b/Sources/NIO/ChannelHandler.swift
index 30df016f..264926fb 100644
--- a/Sources/NIO/ChannelHandler.swift
+++ b/Sources/NIO/ChannelHandler.swift
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import Sockets
 
 public protocol ChannelHandler : class {
     func handlerAdded(ctx: ChannelHandlerContext) throws
diff --git a/Sources/NIO/ChannelInvoker.swift b/Sources/NIO/ChannelInvoker.swift
index fbbab6cd..1ca42ffb 100644
--- a/Sources/NIO/ChannelInvoker.swift
+++ b/Sources/NIO/ChannelInvoker.swift
@@ -11,8 +11,6 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
-import Sockets
-
 public protocol ChannelOutboundInvoker {
     func register() -> Future<Void>
     func register(promise: Promise<Void>?)
diff --git a/Sources/NIO/ChannelPipeline.swift b/Sources/NIO/ChannelPipeline.swift
index 1165c513..337906c9 100644
--- a/Sources/NIO/ChannelPipeline.swift
+++ b/Sources/NIO/ChannelPipeline.swift
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import Sockets
 
 
 /*
diff --git a/Sources/NIO/Embedded.swift b/Sources/NIO/Embedded.swift
index a7e14651..cb9d0d9b 100644
--- a/Sources/NIO/Embedded.swift
+++ b/Sources/NIO/Embedded.swift
@@ -14,7 +14,6 @@
 
 import Foundation
 import Dispatch
-import Sockets
 
 class EmbeddedEventLoop : EventLoop {
 
diff --git a/Sources/NIO/EventLoop.swift b/Sources/NIO/EventLoop.swift
index f77c38aa..75e1e560 100644
--- a/Sources/NIO/EventLoop.swift
+++ b/Sources/NIO/EventLoop.swift
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import Sockets
 import ConcurrencyHelpers
 
 public protocol EventLoop: EventLoopGroup {
@@ -88,7 +87,7 @@ enum NIORegistration: Registration {
 
 // TODO: Implement scheduling tasks in the future (a.k.a ScheduledExecutoreService
 final class SelectableEventLoop : EventLoop {
-    private let selector: Sockets.Selector<NIORegistration>
+    private let selector: NIO.Selector<NIORegistration>
     private var thread: pthread_t?
     private var tasks: [() -> ()]
     private let tasksLock = Lock()
@@ -101,7 +100,7 @@ final class SelectableEventLoop : EventLoop {
     let storageRefs: UnsafeMutableBufferPointer<Unmanaged<AnyObject>>
     
     init() throws {
-        self.selector = try Sockets.Selector()
+        self.selector = try NIO.Selector()
         self.tasks = Array()
         self._iovecs = UnsafeMutablePointer.allocate(capacity: Socket.writevLimit)
         self._storageRefs = UnsafeMutablePointer.allocate(capacity: Socket.writevLimit)
diff --git a/Sources/Sockets/IO.swift b/Sources/NIO/IO.swift
similarity index 100%
rename from Sources/Sockets/IO.swift
rename to Sources/NIO/IO.swift
diff --git a/Sources/Sockets/Selectable.swift b/Sources/NIO/Selectable.swift
similarity index 95%
rename from Sources/Sockets/Selectable.swift
rename to Sources/NIO/Selectable.swift
index 058ee9c5..9a1c38c6 100644
--- a/Sources/Sockets/Selectable.swift
+++ b/Sources/NIO/Selectable.swift
@@ -14,7 +14,7 @@
 
 import Foundation
 
-public protocol Selectable {
+protocol Selectable {
     var descriptor: Int32 { get }
 
     var open: Bool { get }
diff --git a/Sources/Sockets/Selector.swift b/Sources/NIO/Selector.swift
similarity index 95%
rename from Sources/Sockets/Selector.swift
rename to Sources/NIO/Selector.swift
index a1daa5b6..1c2202d8 100644
--- a/Sources/Sockets/Selector.swift
+++ b/Sources/NIO/Selector.swift
@@ -22,7 +22,7 @@ import Foundation
     import Darwin
 #endif
 
-public final class Selector<R: Registration> {
+final class Selector<R: Registration> {
     private var open: Bool
     
     #if os(Linux)
@@ -60,7 +60,7 @@ public final class Selector<R: Registration> {
         events = Selector.allocateEventsArray(capacity: eventsCapacity)
     }
     
-    public init() throws {
+    init() throws {
         events = Selector.allocateEventsArray(capacity: eventsCapacity)
         self.open = false
 
@@ -243,7 +243,7 @@ public final class Selector<R: Registration> {
     }
 #endif
 
-    public func register<S: Selectable>(selectable: S, interested: IOEvent = .read, makeRegistration: (IOEvent) -> R) throws {
+    func register<S: Selectable>(selectable: S, interested: IOEvent = .read, makeRegistration: (IOEvent) -> R) throws {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't register selector as it's not open anymore.")
         }
@@ -263,7 +263,7 @@ public final class Selector<R: Registration> {
         registrations[Int(selectable.descriptor)] = makeRegistration(interested)
     }
 
-    public func reregister<S: Selectable>(selectable: S, interested: IOEvent) throws {
+    func reregister<S: Selectable>(selectable: S, interested: IOEvent) throws {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't re-register selector as it's not open anymore.")
         }
@@ -285,7 +285,7 @@ public final class Selector<R: Registration> {
         registrations[Int(selectable.descriptor)] = reg
     }
 
-    public func deregister<S: Selectable>(selectable: S) throws {
+    func deregister<S: Selectable>(selectable: S) throws {
         guard let reg = registrations.removeValue(forKey: Int(selectable.descriptor)) else {
             return
         }
@@ -300,7 +300,7 @@ public final class Selector<R: Registration> {
 #endif
     }
 
-    public func whenReady(strategy: SelectorStrategy, _ fn: (SelectorEvent<R>) throws -> Void) throws -> Void {
+     func whenReady(strategy: SelectorStrategy, _ fn: (SelectorEvent<R>) throws -> Void) throws -> Void {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't call whenReady for selector as it's not open anymore.")
         }
@@ -361,7 +361,7 @@ public final class Selector<R: Registration> {
 #endif
     }
 
-    public func close() throws {
+    func close() throws {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't close selector as it's not open anymore.")
         }
@@ -377,7 +377,7 @@ public final class Selector<R: Registration> {
         }
     }
 
-    public func wakeup() throws {
+    func wakeup() throws {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't wakeup selector as it's not open anymore.")
         }
@@ -397,7 +397,7 @@ public final class Selector<R: Registration> {
     }
 }
 
-public struct SelectorEvent<R> {
+struct SelectorEvent<R> {
     public let registration: R
     public let io: IOEvent
     
@@ -413,13 +413,13 @@ public struct SelectorEvent<R> {
     }
 }
 
-public enum SelectorStrategy {
+enum SelectorStrategy {
     case block
     case blockUntilTimeout(ms: Int)
     case now
 }
 
-public enum IOEvent {
+enum IOEvent {
     case read
     case write
     case all
diff --git a/Sources/Sockets/ServerSocket.swift b/Sources/NIO/ServerSocket.swift
similarity index 93%
rename from Sources/Sockets/ServerSocket.swift
rename to Sources/NIO/ServerSocket.swift
index 02b928ee..d9903789 100644
--- a/Sources/Sockets/ServerSocket.swift
+++ b/Sources/NIO/ServerSocket.swift
@@ -27,7 +27,7 @@ import Foundation
 
 
 // TODO: Handle AF_INET6 as well
-public final class ServerSocket: BaseSocket {
+final class ServerSocket: BaseSocket {
     public class func bootstrap(host: String, port: Int32) throws -> ServerSocket {
         let socket = try ServerSocket()
         try socket.bind(to: try SocketAddresses.newAddress(for: host, on: port))
@@ -35,18 +35,18 @@ public final class ServerSocket: BaseSocket {
         return socket
     }
     
-    public init() throws {
+    init() throws {
         let sock = try BaseSocket.newSocket()
         super.init(descriptor: sock)
     }
     
-    public func listen(backlog: Int32 = 128) throws {
+    func listen(backlog: Int32 = 128) throws {
         _ = try wrapSyscall({ $0 >= 0 }, function: "listen") { () -> Int32 in
             sysListen(self.descriptor, backlog)
         }
     }
     
-    public func accept() throws -> Socket? {
+    func accept() throws -> Socket? {
         var acceptAddr = sockaddr_in()
         var addrSize = socklen_t(MemoryLayout<sockaddr_in>.size)
         
diff --git a/Sources/Sockets/Socket.swift b/Sources/NIO/Socket.swift
similarity index 85%
rename from Sources/Sockets/Socket.swift
rename to Sources/NIO/Socket.swift
index d260bbe6..6ccc24c8 100644
--- a/Sources/Sockets/Socket.swift
+++ b/Sources/NIO/Socket.swift
@@ -33,8 +33,8 @@ let sysConnect = Darwin.connect
 public typealias IOVector = iovec
 
 // TODO: scattering support
-public final class Socket : BaseSocket {
-    public static var writevLimit: Int {
+final class Socket : BaseSocket {
+    static var writevLimit: Int {
 // UIO_MAXIOV is only exported on linux atm
 #if os(Linux)
         return Int(UIO_MAXIOV)
@@ -43,7 +43,7 @@ public final class Socket : BaseSocket {
 #endif
     }
     
-    public init() throws {
+    init() throws {
         let sock = try BaseSocket.newSocket()
         super.init(descriptor: sock)
     }
@@ -52,7 +52,7 @@ public final class Socket : BaseSocket {
         super.init(descriptor: descriptor)
     }
     
-    public func connect(to address: SocketAddress) throws  -> Bool {
+    func connect(to address: SocketAddress) throws  -> Bool {
         switch address {
         case .v4(address: let addr):
             return try connectSocket(addr: addr)
@@ -83,18 +83,18 @@ public final class Socket : BaseSocket {
         }
     }
     
-    public func finishConnect() throws {
+    func finishConnect() throws {
         let result: Int32 = try getOption(level: SOL_SOCKET, name: SO_ERROR)
         if result != 0 {
             throw ioError(errno: result, function: "getsockopt")
         }
     }
     
-    public func write(data: Data) throws -> IOResult<Int> {
+    func write(data: Data) throws -> IOResult<Int> {
         return try data.withUnsafeBytes({ try write(pointer: $0, size: data.count) })
     }
 
-    public func write(pointer: UnsafePointer<UInt8>, size: Int) throws -> IOResult<Int> {
+    func write(pointer: UnsafePointer<UInt8>, size: Int) throws -> IOResult<Int> {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't write to socket as it's not open anymore.")
         }
@@ -103,7 +103,7 @@ public final class Socket : BaseSocket {
         }
     }
 
-    public func writev(iovecs: UnsafeBufferPointer<IOVector>) throws -> IOResult<Int> {
+    func writev(iovecs: UnsafeBufferPointer<IOVector>) throws -> IOResult<Int> {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't writev to socket as it's not open anymore.")
         }
@@ -113,11 +113,11 @@ public final class Socket : BaseSocket {
         }
     }
     
-    public func read(data: inout Data) throws -> IOResult<Int> {
+    func read(data: inout Data) throws -> IOResult<Int> {
         return try data.withUnsafeMutableBytes({ try read(pointer: $0, size: data.count) })
     }
 
-    public func read(pointer: UnsafeMutablePointer<UInt8>, size: Int) throws -> IOResult<Int> {
+    func read(pointer: UnsafeMutablePointer<UInt8>, size: Int) throws -> IOResult<Int> {
         guard self.open else {
             throw IOError(errno: EBADF, reason: "can't read from socket as it's not open anymore.")
         }
diff --git a/Sources/Sockets/SocketAddresses.swift b/Sources/NIO/SocketAddresses.swift
similarity index 99%
rename from Sources/Sockets/SocketAddresses.swift
rename to Sources/NIO/SocketAddresses.swift
index 517b9a7b..dfd86646 100644
--- a/Sources/Sockets/SocketAddresses.swift
+++ b/Sources/NIO/SocketAddresses.swift
@@ -61,7 +61,6 @@ public enum SocketAddressError: Error {
     case unsupported
 }
 
-
 public enum SocketAddress {
     case v4(address: sockaddr_in)
     case v6(address: sockaddr_in6)
diff --git a/Sources/SocketsEchoServer/main.swift b/Sources/SocketsEchoServer/main_socket.swift
similarity index 99%
rename from Sources/SocketsEchoServer/main.swift
rename to Sources/SocketsEchoServer/main_socket.swift
index 063b8412..43885761 100644
--- a/Sources/SocketsEchoServer/main.swift
+++ b/Sources/SocketsEchoServer/main_socket.swift
@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import Sockets
 
 public class Buffer {
     var data: Data