From 6fdb7d91165f7e82c5608c07ee911bc9b6fcdf5a Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 9 Dec 2011 12:38:59 +0900 Subject: [PATCH] org.jboss.netty -> io.netty --- .gitignore | 2 +- pom.xml | 2 +- .../org/jboss/netty/bootstrap/Bootstrap.java | 18 +- .../netty/bootstrap/ClientBootstrap.java | 20 +- .../bootstrap/ConnectionlessBootstrap.java | 22 +- .../netty/bootstrap/ServerBootstrap.java | 34 +- .../jboss/netty/bootstrap/package-info.java | 2 +- .../netty/buffer/AbstractChannelBuffer.java | 2 +- .../buffer/AbstractChannelBufferFactory.java | 2 +- .../buffer/BigEndianHeapChannelBuffer.java | 2 +- .../buffer/ByteBufferBackedChannelBuffer.java | 2 +- .../org/jboss/netty/buffer/ChannelBuffer.java | 2 +- .../netty/buffer/ChannelBufferFactory.java | 2 +- .../buffer/ChannelBufferIndexFinder.java | 4 +- .../buffer/ChannelBufferInputStream.java | 4 +- .../buffer/ChannelBufferOutputStream.java | 4 +- .../jboss/netty/buffer/ChannelBuffers.java | 8 +- .../netty/buffer/CompositeChannelBuffer.java | 2 +- .../buffer/DirectChannelBufferFactory.java | 2 +- .../netty/buffer/DuplicatedChannelBuffer.java | 2 +- .../netty/buffer/DynamicChannelBuffer.java | 2 +- .../jboss/netty/buffer/HeapChannelBuffer.java | 2 +- .../buffer/HeapChannelBufferFactory.java | 2 +- .../buffer/LittleEndianHeapChannelBuffer.java | 2 +- .../netty/buffer/ReadOnlyChannelBuffer.java | 2 +- .../netty/buffer/SlicedChannelBuffer.java | 2 +- .../netty/buffer/TruncatedChannelBuffer.java | 2 +- .../netty/buffer/WrappedChannelBuffer.java | 2 +- .../org/jboss/netty/buffer/package-info.java | 16 +- .../jboss/netty/channel/AbstractChannel.java | 4 +- .../netty/channel/AbstractChannelSink.java | 4 +- .../netty/channel/AbstractServerChannel.java | 2 +- .../AdaptiveReceiveBufferSizePredictor.java | 2 +- ...tiveReceiveBufferSizePredictorFactory.java | 2 +- .../java/org/jboss/netty/channel/Channel.java | 14 +- .../jboss/netty/channel/ChannelConfig.java | 16 +- .../channel/ChannelDownstreamHandler.java | 2 +- .../org/jboss/netty/channel/ChannelEvent.java | 8 +- .../jboss/netty/channel/ChannelException.java | 2 +- .../jboss/netty/channel/ChannelFactory.java | 10 +- .../jboss/netty/channel/ChannelFuture.java | 8 +- .../channel/ChannelFutureAggregator.java | 2 +- .../netty/channel/ChannelFutureListener.java | 2 +- .../ChannelFutureProgressListener.java | 2 +- .../jboss/netty/channel/ChannelHandler.java | 6 +- .../netty/channel/ChannelHandlerContext.java | 4 +- .../ChannelHandlerLifeCycleException.java | 2 +- .../org/jboss/netty/channel/ChannelLocal.java | 4 +- .../jboss/netty/channel/ChannelPipeline.java | 18 +- .../channel/ChannelPipelineException.java | 2 +- .../netty/channel/ChannelPipelineFactory.java | 10 +- .../org/jboss/netty/channel/ChannelSink.java | 4 +- .../org/jboss/netty/channel/ChannelState.java | 2 +- .../netty/channel/ChannelStateEvent.java | 4 +- .../netty/channel/ChannelUpstreamHandler.java | 4 +- .../org/jboss/netty/channel/Channels.java | 4 +- .../netty/channel/ChildChannelStateEvent.java | 2 +- .../netty/channel/CompleteChannelFuture.java | 6 +- .../netty/channel/DefaultChannelConfig.java | 10 +- .../netty/channel/DefaultChannelFuture.java | 8 +- .../netty/channel/DefaultChannelPipeline.java | 6 +- .../DefaultChildChannelStateEvent.java | 4 +- .../netty/channel/DefaultExceptionEvent.java | 6 +- .../netty/channel/DefaultFileRegion.java | 6 +- .../channel/DefaultServerChannelConfig.java | 8 +- .../channel/DefaultWriteCompletionEvent.java | 4 +- .../channel/DownstreamChannelStateEvent.java | 2 +- .../netty/channel/DownstreamMessageEvent.java | 4 +- .../jboss/netty/channel/ExceptionEvent.java | 2 +- .../netty/channel/FailedChannelFuture.java | 2 +- .../org/jboss/netty/channel/FileRegion.java | 4 +- .../FixedReceiveBufferSizePredictor.java | 2 +- ...ixedReceiveBufferSizePredictorFactory.java | 2 +- .../channel/LifeCycleAwareChannelHandler.java | 2 +- .../org/jboss/netty/channel/MessageEvent.java | 2 +- .../channel/ReceiveBufferSizePredictor.java | 4 +- .../ReceiveBufferSizePredictorFactory.java | 4 +- .../jboss/netty/channel/ServerChannel.java | 4 +- .../netty/channel/ServerChannelFactory.java | 4 +- .../SimpleChannelDownstreamHandler.java | 2 +- .../netty/channel/SimpleChannelHandler.java | 8 +- .../channel/SimpleChannelUpstreamHandler.java | 8 +- .../netty/channel/StaticChannelPipeline.java | 8 +- .../netty/channel/SucceededChannelFuture.java | 2 +- .../channel/UpstreamChannelStateEvent.java | 4 +- .../netty/channel/UpstreamMessageEvent.java | 6 +- .../netty/channel/WriteCompletionEvent.java | 2 +- .../netty/channel/group/ChannelGroup.java | 22 +- .../channel/group/ChannelGroupFuture.java | 18 +- .../group/ChannelGroupFutureListener.java | 2 +- .../netty/channel/group/CombinedIterator.java | 2 +- .../channel/group/DefaultChannelGroup.java | 14 +- .../group/DefaultChannelGroupFuture.java | 14 +- .../netty/channel/group/package-info.java | 4 +- .../channel/iostream/IOStreamAddress.java | 2 +- .../channel/iostream/IOStreamChannel.java | 4 +- .../iostream/IOStreamChannelFactory.java | 18 +- .../channel/iostream/IOStreamChannelSink.java | 12 +- .../channel/local/DefaultLocalChannel.java | 28 +- .../DefaultLocalClientChannelFactory.java | 6 +- .../local/DefaultLocalServerChannel.java | 16 +- .../DefaultLocalServerChannelFactory.java | 6 +- .../netty/channel/local/LocalAddress.java | 2 +- .../netty/channel/local/LocalChannel.java | 4 +- .../channel/local/LocalChannelRegistry.java | 6 +- .../local/LocalClientChannelFactory.java | 6 +- .../channel/local/LocalClientChannelSink.java | 26 +- .../channel/local/LocalServerChannel.java | 4 +- .../local/LocalServerChannelFactory.java | 6 +- .../channel/local/LocalServerChannelSink.java | 22 +- .../netty/channel/local/package-info.java | 2 +- .../org/jboss/netty/channel/package-info.java | 2 +- .../jboss/netty/channel/rxtx/RXTXChannel.java | 16 +- .../netty/channel/rxtx/RXTXChannelConfig.java | 6 +- .../channel/rxtx/RXTXChannelFactory.java | 16 +- .../netty/channel/rxtx/RXTXChannelSink.java | 30 +- .../netty/channel/rxtx/RXTXDeviceAddress.java | 2 +- .../socket/ClientSocketChannelFactory.java | 8 +- .../netty/channel/socket/DatagramChannel.java | 6 +- .../channel/socket/DatagramChannelConfig.java | 12 +- .../socket/DatagramChannelFactory.java | 8 +- .../socket/DefaultDatagramChannelConfig.java | 14 +- .../DefaultServerSocketChannelConfig.java | 8 +- .../socket/DefaultSocketChannelConfig.java | 8 +- .../channel/socket/ServerSocketChannel.java | 6 +- .../socket/ServerSocketChannelConfig.java | 4 +- .../socket/ServerSocketChannelFactory.java | 10 +- .../netty/channel/socket/SocketChannel.java | 6 +- .../channel/socket/SocketChannelConfig.java | 4 +- .../AcceptedServerChannelPipelineFactory.java | 14 +- .../AcceptedServerChannelRequestDispatch.java | 24 +- .../socket/http/DefaultTunnelIdGenerator.java | 2 +- .../http/HttpTunnelAcceptedChannel.java | 22 +- .../http/HttpTunnelAcceptedChannelConfig.java | 2 +- .../HttpTunnelAcceptedChannelFactory.java | 2 +- .../HttpTunnelAcceptedChannelReceiver.java | 4 +- .../http/HttpTunnelAcceptedChannelSink.java | 22 +- .../socket/http/HttpTunnelChannelConfig.java | 20 +- .../socket/http/HttpTunnelClientChannel.java | 34 +- .../http/HttpTunnelClientChannelConfig.java | 4 +- .../http/HttpTunnelClientChannelFactory.java | 10 +- .../http/HttpTunnelClientChannelSink.java | 12 +- .../http/HttpTunnelClientPollHandler.java | 20 +- .../http/HttpTunnelClientSendHandler.java | 26 +- .../http/HttpTunnelClientWorkerOwner.java | 6 +- .../socket/http/HttpTunnelMessageUtils.java | 22 +- .../socket/http/HttpTunnelServerChannel.java | 18 +- .../http/HttpTunnelServerChannelConfig.java | 10 +- .../http/HttpTunnelServerChannelFactory.java | 14 +- .../http/HttpTunnelServerChannelSink.java | 16 +- .../socket/http/SaturationManager.java | 8 +- .../socket/http/SaturationStateChange.java | 2 +- .../socket/http/ServerMessageSwitch.java | 20 +- ...erverMessageSwitchDownstreamInterface.java | 6 +- .../ServerMessageSwitchUpstreamInterface.java | 6 +- .../socket/http/TunnelIdGenerator.java | 2 +- .../TunnelWrappedServerChannelHandler.java | 14 +- .../channel/socket/http/WriteFragmenter.java | 16 +- .../channel/socket/http/WriteSplitter.java | 6 +- .../channel/socket/http/package-info.java | 16 +- .../socket/nio/AbstractWriteRequestQueue.java | 6 +- .../nio/DefaultNioDatagramChannelConfig.java | 10 +- .../nio/DefaultNioSocketChannelConfig.java | 18 +- .../socket/nio/NioAcceptedSocketChannel.java | 12 +- .../socket/nio/NioClientSocketChannel.java | 18 +- .../nio/NioClientSocketChannelFactory.java | 14 +- .../nio/NioClientSocketPipelineSink.java | 30 +- .../socket/nio/NioDatagramChannel.java | 34 +- .../socket/nio/NioDatagramChannelConfig.java | 10 +- .../socket/nio/NioDatagramChannelFactory.java | 14 +- .../socket/nio/NioDatagramPipelineSink.java | 20 +- .../channel/socket/nio/NioDatagramWorker.java | 24 +- .../socket/nio/NioProviderMetadata.java | 10 +- .../socket/nio/NioServerSocketChannel.java | 24 +- .../nio/NioServerSocketChannelFactory.java | 16 +- .../nio/NioServerSocketPipelineSink.java | 26 +- .../channel/socket/nio/NioSocketChannel.java | 26 +- .../socket/nio/NioSocketChannelConfig.java | 18 +- .../netty/channel/socket/nio/NioWorker.java | 28 +- .../channel/socket/nio/SelectorUtil.java | 6 +- .../socket/nio/SocketReceiveBufferPool.java | 2 +- .../socket/nio/SocketSendBufferPool.java | 6 +- .../channel/socket/nio/package-info.java | 2 +- .../socket/oio/OioAcceptedSocketChannel.java | 14 +- .../socket/oio/OioClientSocketChannel.java | 10 +- .../oio/OioClientSocketChannelFactory.java | 14 +- .../oio/OioClientSocketPipelineSink.java | 22 +- .../socket/oio/OioDatagramChannel.java | 22 +- .../socket/oio/OioDatagramChannelFactory.java | 14 +- .../socket/oio/OioDatagramPipelineSink.java | 22 +- .../channel/socket/oio/OioDatagramWorker.java | 12 +- .../socket/oio/OioServerSocketChannel.java | 24 +- .../oio/OioServerSocketChannelFactory.java | 16 +- .../oio/OioServerSocketPipelineSink.java | 26 +- .../channel/socket/oio/OioSocketChannel.java | 20 +- .../netty/channel/socket/oio/OioWorker.java | 12 +- .../channel/socket/oio/package-info.java | 2 +- .../netty/channel/socket/package-info.java | 2 +- .../sctp/DefaultNioSctpChannelConfig.java | 18 +- .../socket/sctp/DefaultSctpChannelConfig.java | 10 +- .../sctp/DefaultSctpServerChannelConfig.java | 10 +- .../socket/sctp/NioSctpChannelConfig.java | 54 +- .../socket/sctp/SctpAcceptedChannel.java | 12 +- .../channel/socket/sctp/SctpChannel.java | 10 +- .../socket/sctp/SctpChannelConfig.java | 10 +- .../channel/socket/sctp/SctpChannelImpl.java | 12 +- .../socket/sctp/SctpClientChannel.java | 10 +- .../socket/sctp/SctpClientPipelineSink.java | 12 +- .../sctp/SctpClientSocketChannelFactory.java | 18 +- .../socket/sctp/SctpNotificationEvent.java | 10 +- .../socket/sctp/SctpNotificationHandler.java | 8 +- .../channel/socket/sctp/SctpPayload.java | 6 +- .../socket/sctp/SctpProviderMetadata.java | 10 +- .../socket/sctp/SctpReceiveBufferPool.java | 2 +- .../socket/sctp/SctpSendBufferPool.java | 4 +- .../socket/sctp/SctpServerChannel.java | 6 +- .../socket/sctp/SctpServerChannelConfig.java | 8 +- .../socket/sctp/SctpServerChannelImpl.java | 10 +- .../socket/sctp/SctpServerPipelineSink.java | 14 +- .../sctp/SctpServerSocketChannelFactory.java | 22 +- .../netty/channel/socket/sctp/SctpWorker.java | 20 +- .../channel/socket/sctp/SelectorUtil.java | 6 +- .../channel/socket/sctp/package-info.java | 2 +- .../NettyLoggerConfigurator.java | 6 +- .../microcontainer/package-info.java | 2 +- .../container/osgi/NettyBundleActivator.java | 6 +- .../netty/container/osgi/package-info.java | 2 +- .../spring/NettyLoggerConfigurator.java | 6 +- .../netty/container/spring/package-info.java | 2 +- .../netty/example/discard/DiscardClient.java | 14 +- .../example/discard/DiscardClientHandler.java | 24 +- .../netty/example/discard/DiscardServer.java | 12 +- .../example/discard/DiscardServerHandler.java | 16 +- .../jboss/netty/example/echo/EchoClient.java | 14 +- .../netty/example/echo/EchoClientHandler.java | 16 +- .../jboss/netty/example/echo/EchoServer.java | 12 +- .../netty/example/echo/EchoServerHandler.java | 12 +- .../example/factorial/BigIntegerDecoder.java | 12 +- .../example/factorial/FactorialClient.java | 10 +- .../factorial/FactorialClientHandler.java | 20 +- .../FactorialClientPipelineFactory.java | 14 +- .../example/factorial/FactorialServer.java | 6 +- .../factorial/FactorialServerHandler.java | 14 +- .../FactorialServerPipelineFactory.java | 14 +- .../example/factorial/NumberEncoder.java | 12 +- .../http/file/HttpStaticFileServer.java | 6 +- .../file/HttpStaticFileServerHandler.java | 52 +- .../HttpStaticFileServerPipelineFactory.java | 16 +- .../netty/example/http/snoop/HttpClient.java | 22 +- .../http/snoop/HttpClientPipelineFactory.java | 20 +- .../http/snoop/HttpRequestHandler.java | 46 +- .../http/snoop/HttpResponseHandler.java | 16 +- .../netty/example/http/snoop/HttpServer.java | 6 +- .../http/snoop/HttpServerPipelineFactory.java | 18 +- .../netty/example/http/upload/HttpClient.java | 38 +- .../upload/HttpClientPipelineFactory.java | 18 +- .../http/upload/HttpRequestHandler.java | 78 +-- .../http/upload/HttpResponseHandler.java | 18 +- .../netty/example/http/upload/HttpServer.java | 6 +- .../upload/HttpServerPipelineFactory.java | 14 +- .../http/websocket/WebSocketServer.java | 6 +- .../websocket/WebSocketServerHandler.java | 56 +- .../websocket/WebSocketServerIndexPage.java | 8 +- .../WebSocketServerPipelineFactory.java | 14 +- .../websocketx/autobahn/WebSocketServer.java | 6 +- .../autobahn/WebSocketServerHandler.java | 56 +- .../WebSocketServerPipelineFactory.java | 14 +- .../websocketx/autobahn/package-info.java | 2 +- .../example/http/websocketx/client/App.java | 16 +- .../websocketx/client/WebSocketCallback.java | 4 +- .../websocketx/client/WebSocketClient.java | 6 +- .../client/WebSocketClientFactory.java | 16 +- .../client/WebSocketClientHandler.java | 30 +- .../websocketx/client/WebSocketException.java | 2 +- .../client/WebSocketHttpResponseDecoder.java | 8 +- .../http/websocketx/client/package-info.java | 6 +- .../websocketx/server/WebSocketServer.java | 6 +- .../server/WebSocketServerHandler.java | 56 +- .../server/WebSocketServerIndexPage.java | 8 +- .../WebSocketServerPipelineFactory.java | 14 +- .../http/websocketx/server/package-info.java | 2 +- .../sslserver/WebSocketSslServer.java | 6 +- .../sslserver/WebSocketSslServerHandler.java | 56 +- .../WebSocketSslServerIndexPage.java | 8 +- .../WebSocketSslServerPipelineFactory.java | 16 +- .../WebSocketSslServerSslContext.java | 6 +- .../websocketx/sslserver/package-info.java | 2 +- .../netty/example/iostream/IOStream.java | 20 +- .../netty/example/local/LocalExample.java | 30 +- .../local/LocalExampleMultthreaded.java | 30 +- .../local/LocalServerPipelineFactory.java | 24 +- .../example/localtime/LocalTimeClient.java | 10 +- .../localtime/LocalTimeClientHandler.java | 26 +- .../LocalTimeClientPipelineFactory.java | 16 +- .../example/localtime/LocalTimeProtocol.java | 482 +++++++++--------- .../example/localtime/LocalTimeProtocol.proto | 4 +- .../example/localtime/LocalTimeServer.java | 6 +- .../localtime/LocalTimeServerHandler.java | 26 +- .../LocalTimeServerPipelineFactory.java | 16 +- .../example/objectecho/ObjectEchoClient.java | 18 +- .../objectecho/ObjectEchoClientHandler.java | 16 +- .../example/objectecho/ObjectEchoServer.java | 18 +- .../objectecho/ObjectEchoServerHandler.java | 16 +- .../PortUnificationServer.java | 12 +- .../PortUnificationServerHandler.java | 36 +- .../netty/example/proxy/HexDumpProxy.java | 10 +- .../proxy/HexDumpProxyInboundHandler.java | 26 +- .../proxy/HexDumpProxyPipelineFactory.java | 10 +- .../example/qotm/QuoteOfTheMomentClient.java | 24 +- .../qotm/QuoteOfTheMomentClientHandler.java | 10 +- .../example/qotm/QuoteOfTheMomentServer.java | 22 +- .../qotm/QuoteOfTheMomentServerHandler.java | 10 +- .../jboss/netty/example/sctp/SctpClient.java | 18 +- .../netty/example/sctp/SctpClientHandler.java | 8 +- .../jboss/netty/example/sctp/SctpServer.java | 16 +- .../netty/example/sctp/SctpServerHandler.java | 10 +- .../example/securechat/SecureChatClient.java | 12 +- .../securechat/SecureChatClientHandler.java | 16 +- .../SecureChatClientPipelineFactory.java | 18 +- .../securechat/SecureChatKeyStore.java | 2 +- .../example/securechat/SecureChatServer.java | 8 +- .../securechat/SecureChatServerHandler.java | 26 +- .../SecureChatServerPipelineFactory.java | 18 +- .../SecureChatSslContextFactory.java | 4 +- .../SecureChatTrustManagerFactory.java | 2 +- .../netty/example/telnet/TelnetClient.java | 10 +- .../example/telnet/TelnetClientHandler.java | 14 +- .../telnet/TelnetClientPipelineFactory.java | 16 +- .../netty/example/telnet/TelnetServer.java | 6 +- .../example/telnet/TelnetServerHandler.java | 18 +- .../telnet/TelnetServerPipelineFactory.java | 16 +- .../netty/example/uptime/UptimeClient.java | 20 +- .../example/uptime/UptimeClientHandler.java | 20 +- .../netty/handler/codec/base64/Base64.java | 10 +- .../handler/codec/base64/Base64Decoder.java | 26 +- .../handler/codec/base64/Base64Dialect.java | 2 +- .../handler/codec/base64/Base64Encoder.java | 20 +- .../handler/codec/base64/package-info.java | 6 +- .../handler/codec/bytes/ByteArrayDecoder.java | 18 +- .../handler/codec/bytes/ByteArrayEncoder.java | 20 +- .../handler/codec/bytes/package-info.java | 4 +- .../compression/CompressionException.java | 2 +- .../codec/compression/ZlibDecoder.java | 18 +- .../codec/compression/ZlibEncoder.java | 30 +- .../handler/codec/compression/ZlibUtil.java | 6 +- .../codec/compression/ZlibWrapper.java | 2 +- .../codec/compression/package-info.java | 4 +- .../codec/embedder/AbstractCodecEmbedder.java | 28 +- .../handler/codec/embedder/CodecEmbedder.java | 4 +- .../embedder/CodecEmbedderException.java | 2 +- .../codec/embedder/DecoderEmbedder.java | 18 +- .../codec/embedder/EmbeddedChannel.java | 12 +- .../embedder/EmbeddedChannelFactory.java | 8 +- .../codec/embedder/EmbeddedSocketAddress.java | 2 +- .../codec/embedder/EncoderEmbedder.java | 18 +- .../handler/codec/embedder/package-info.java | 2 +- .../codec/frame/CorruptedFrameException.java | 2 +- .../frame/DelimiterBasedFrameDecoder.java | 12 +- .../netty/handler/codec/frame/Delimiters.java | 6 +- .../codec/frame/FixedLengthFrameDecoder.java | 8 +- .../handler/codec/frame/FrameDecoder.java | 28 +- .../frame/LengthFieldBasedFrameDecoder.java | 14 +- .../codec/frame/LengthFieldPrepender.java | 16 +- .../codec/frame/TooLongFrameException.java | 2 +- .../handler/codec/frame/package-info.java | 2 +- .../codec/http/AbstractDiskHttpData.java | 6 +- .../handler/codec/http/AbstractHttpData.java | 2 +- .../codec/http/AbstractMemoryHttpData.java | 6 +- .../netty/handler/codec/http/Attribute.java | 2 +- .../codec/http/CaseIgnoringComparator.java | 2 +- .../netty/handler/codec/http/Cookie.java | 2 +- .../handler/codec/http/CookieDecoder.java | 4 +- .../handler/codec/http/CookieEncoder.java | 4 +- .../handler/codec/http/CookieHeaderNames.java | 2 +- .../handler/codec/http/DefaultCookie.java | 2 +- .../handler/codec/http/DefaultHttpChunk.java | 4 +- .../codec/http/DefaultHttpChunkTrailer.java | 6 +- .../codec/http/DefaultHttpDataFactory.java | 6 +- .../codec/http/DefaultHttpMessage.java | 8 +- .../codec/http/DefaultHttpRequest.java | 4 +- .../codec/http/DefaultHttpResponse.java | 4 +- .../handler/codec/http/DiskAttribute.java | 6 +- .../handler/codec/http/DiskFileUpload.java | 6 +- .../netty/handler/codec/http/FileUpload.java | 2 +- .../netty/handler/codec/http/HttpChunk.java | 8 +- .../codec/http/HttpChunkAggregator.java | 28 +- .../handler/codec/http/HttpChunkTrailer.java | 2 +- .../handler/codec/http/HttpClientCodec.java | 20 +- .../handler/codec/http/HttpCodecUtil.java | 4 +- .../codec/http/HttpContentCompressor.java | 10 +- .../codec/http/HttpContentDecoder.java | 16 +- .../codec/http/HttpContentDecompressor.java | 10 +- .../codec/http/HttpContentEncoder.java | 18 +- .../netty/handler/codec/http/HttpData.java | 4 +- .../handler/codec/http/HttpDataFactory.java | 2 +- .../codec/http/HttpHeaderDateFormat.java | 2 +- .../netty/handler/codec/http/HttpHeaders.java | 2 +- .../netty/handler/codec/http/HttpMessage.java | 8 +- .../codec/http/HttpMessageDecoder.java | 16 +- .../codec/http/HttpMessageEncoder.java | 18 +- .../netty/handler/codec/http/HttpMethod.java | 2 +- .../handler/codec/http/HttpPostBodyUtil.java | 6 +- .../codec/http/HttpPostRequestDecoder.java | 8 +- .../codec/http/HttpPostRequestEncoder.java | 8 +- .../netty/handler/codec/http/HttpRequest.java | 2 +- .../codec/http/HttpRequestDecoder.java | 8 +- .../codec/http/HttpRequestEncoder.java | 6 +- .../handler/codec/http/HttpResponse.java | 2 +- .../codec/http/HttpResponseDecoder.java | 8 +- .../codec/http/HttpResponseEncoder.java | 6 +- .../codec/http/HttpResponseStatus.java | 2 +- .../handler/codec/http/HttpServerCodec.java | 14 +- .../netty/handler/codec/http/HttpVersion.java | 2 +- .../handler/codec/http/InterfaceHttpData.java | 2 +- .../handler/codec/http/InternalAttribute.java | 2 +- .../handler/codec/http/MemoryAttribute.java | 6 +- .../handler/codec/http/MemoryFileUpload.java | 2 +- .../handler/codec/http/MixedAttribute.java | 4 +- .../handler/codec/http/MixedFileUpload.java | 4 +- .../codec/http/QueryStringDecoder.java | 6 +- .../codec/http/QueryStringEncoder.java | 4 +- .../handler/codec/http/package-info.java | 2 +- .../http/websocket/DefaultWebSocketFrame.java | 8 +- .../codec/http/websocket/WebSocketFrame.java | 6 +- .../http/websocket/WebSocketFrameDecoder.java | 18 +- .../http/websocket/WebSocketFrameEncoder.java | 16 +- .../codec/http/websocket/package-info.java | 4 +- .../http/websocketx/BinaryWebSocketFrame.java | 6 +- .../http/websocketx/CloseWebSocketFrame.java | 4 +- .../ContinuationWebSocketFrame.java | 8 +- .../http/websocketx/PingWebSocketFrame.java | 6 +- .../http/websocketx/PongWebSocketFrame.java | 6 +- .../http/websocketx/TextWebSocketFrame.java | 8 +- .../codec/http/websocketx/UTF8Exception.java | 2 +- .../codec/http/websocketx/UTF8Output.java | 2 +- .../websocketx/WebSocket00FrameDecoder.java | 18 +- .../websocketx/WebSocket00FrameEncoder.java | 16 +- .../websocketx/WebSocket08FrameDecoder.java | 22 +- .../websocketx/WebSocket08FrameEncoder.java | 18 +- .../websocketx/WebSocket13FrameDecoder.java | 2 +- .../websocketx/WebSocket13FrameEncoder.java | 2 +- .../websocketx/WebSocketClientHandshaker.java | 16 +- .../WebSocketClientHandshaker00.java | 24 +- .../WebSocketClientHandshaker10.java | 28 +- .../WebSocketClientHandshaker17.java | 28 +- .../WebSocketClientHandshakerFactory.java | 2 +- .../codec/http/websocketx/WebSocketFrame.java | 4 +- .../http/websocketx/WebSocketFrameType.java | 2 +- .../WebSocketHandshakeException.java | 2 +- .../websocketx/WebSocketServerHandshaker.java | 14 +- .../WebSocketServerHandshaker00.java | 50 +- .../WebSocketServerHandshaker10.java | 30 +- .../WebSocketServerHandshaker17.java | 30 +- .../WebSocketServerHandshakerFactory.java | 16 +- .../WebSocketSpecificationVersion.java | 2 +- .../codec/http/websocketx/package-info.java | 6 +- .../handler/codec/oneone/OneToOneDecoder.java | 22 +- .../handler/codec/oneone/OneToOneEncoder.java | 22 +- .../handler/codec/oneone/package-info.java | 2 +- .../codec/protobuf/ProtobufDecoder.java | 24 +- .../codec/protobuf/ProtobufEncoder.java | 22 +- .../ProtobufVarint32FrameDecoder.java | 12 +- .../ProtobufVarint32LengthFieldPrepender.java | 16 +- .../handler/codec/protobuf/package-info.java | 4 +- .../handler/codec/replay/ReplayError.java | 2 +- .../codec/replay/ReplayingDecoder.java | 30 +- .../codec/replay/ReplayingDecoderBuffer.java | 10 +- .../UnreplayableOperationException.java | 4 +- .../replay/UnsafeDynamicChannelBuffer.java | 6 +- .../netty/handler/codec/replay/VoidEnum.java | 2 +- .../handler/codec/replay/package-info.java | 4 +- .../netty/handler/codec/rtsp/RtspHeaders.java | 4 +- .../codec/rtsp/RtspMessageDecoder.java | 18 +- .../codec/rtsp/RtspMessageEncoder.java | 14 +- .../netty/handler/codec/rtsp/RtspMethods.java | 4 +- .../codec/rtsp/RtspRequestDecoder.java | 12 +- .../codec/rtsp/RtspRequestEncoder.java | 8 +- .../codec/rtsp/RtspResponseDecoder.java | 14 +- .../codec/rtsp/RtspResponseEncoder.java | 8 +- .../codec/rtsp/RtspResponseStatuses.java | 4 +- .../handler/codec/rtsp/RtspVersions.java | 4 +- .../handler/codec/rtsp/package-info.java | 2 +- .../serialization/CachingClassResolver.java | 2 +- .../ClassLoaderClassResolver.java | 2 +- .../codec/serialization/ClassResolver.java | 2 +- .../codec/serialization/ClassResolvers.java | 2 +- .../CompactObjectInputStream.java | 2 +- .../CompactObjectOutputStream.java | 2 +- .../CompatibleObjectDecoder.java | 12 +- .../CompatibleObjectDecoderState.java | 2 +- .../CompatibleObjectEncoder.java | 16 +- .../codec/serialization/ObjectDecoder.java | 14 +- .../ObjectDecoderInputStream.java | 2 +- .../codec/serialization/ObjectEncoder.java | 18 +- .../ObjectEncoderOutputStream.java | 8 +- .../codec/serialization/ReferenceMap.java | 2 +- .../codec/serialization/SoftReferenceMap.java | 2 +- .../serialization/SwitchableInputStream.java | 2 +- .../codec/serialization/WeakReferenceMap.java | 2 +- .../codec/serialization/package-info.java | 2 +- .../handler/codec/string/StringDecoder.java | 22 +- .../handler/codec/string/StringEncoder.java | 22 +- .../handler/codec/string/package-info.java | 4 +- .../execution/ChannelEventRunnable.java | 8 +- .../handler/execution/ExecutionHandler.java | 32 +- .../MemoryAwareThreadPoolExecutor.java | 32 +- .../OrderedMemoryAwareThreadPoolExecutor.java | 16 +- .../netty/handler/execution/package-info.java | 2 +- .../jboss/netty/handler/ipfilter/CIDR.java | 2 +- .../jboss/netty/handler/ipfilter/CIDR4.java | 4 +- .../jboss/netty/handler/ipfilter/CIDR6.java | 8 +- .../handler/ipfilter/IpFilterListener.java | 8 +- .../netty/handler/ipfilter/IpFilterRule.java | 2 +- .../handler/ipfilter/IpFilterRuleHandler.java | 10 +- .../handler/ipfilter/IpFilterRuleList.java | 6 +- .../handler/ipfilter/IpFilteringHandler.java | 2 +- .../ipfilter/IpFilteringHandlerImpl.java | 22 +- .../jboss/netty/handler/ipfilter/IpSet.java | 2 +- .../netty/handler/ipfilter/IpSubnet.java | 2 +- .../handler/ipfilter/IpSubnetFilterRule.java | 2 +- .../netty/handler/ipfilter/IpV4Subnet.java | 2 +- .../ipfilter/IpV4SubnetFilterRule.java | 2 +- .../handler/ipfilter/OneIpFilterHandler.java | 16 +- .../netty/handler/ipfilter/PatternRule.java | 12 +- .../netty/handler/ipfilter/package-info.java | 14 +- .../netty/handler/logging/LoggingHandler.java | 28 +- .../netty/handler/logging/package-info.java | 6 +- .../handler/queue/BlockingReadHandler.java | 24 +- .../queue/BlockingReadTimeoutException.java | 2 +- .../handler/queue/BufferedWriteHandler.java | 30 +- .../netty/handler/queue/package-info.java | 2 +- .../region/ChannelWritableByteChannel.java | 20 +- .../handler/region/FileRegionEncoder.java | 18 +- .../netty/handler/ssl/ImmediateExecutor.java | 2 +- .../netty/handler/ssl/SslBufferPool.java | 2 +- .../jboss/netty/handler/ssl/SslHandler.java | 46 +- .../jboss/netty/handler/ssl/package-info.java | 2 +- .../netty/handler/stream/ChunkedFile.java | 6 +- .../netty/handler/stream/ChunkedInput.java | 4 +- .../netty/handler/stream/ChunkedNioFile.java | 6 +- .../handler/stream/ChunkedNioStream.java | 6 +- .../netty/handler/stream/ChunkedStream.java | 4 +- .../handler/stream/ChunkedWriteHandler.java | 38 +- .../netty/handler/stream/package-info.java | 4 +- .../timeout/DefaultIdleStateEvent.java | 8 +- .../netty/handler/timeout/IdleState.java | 4 +- .../timeout/IdleStateAwareChannelHandler.java | 12 +- .../IdleStateAwareChannelUpstreamHandler.java | 12 +- .../netty/handler/timeout/IdleStateEvent.java | 8 +- .../handler/timeout/IdleStateHandler.java | 44 +- .../handler/timeout/ReadTimeoutException.java | 2 +- .../handler/timeout/ReadTimeoutHandler.java | 40 +- .../handler/timeout/TimeoutException.java | 4 +- .../timeout/WriteTimeoutException.java | 2 +- .../handler/timeout/WriteTimeoutHandler.java | 38 +- .../netty/handler/timeout/package-info.java | 4 +- .../AbstractTrafficShapingHandler.java | 30 +- .../traffic/ChannelTrafficShapingHandler.java | 16 +- .../traffic/GlobalTrafficShapingHandler.java | 12 +- .../netty/handler/traffic/TrafficCounter.java | 4 +- .../netty/handler/traffic/package-info.java | 28 +- .../netty/logging/AbstractInternalLogger.java | 2 +- .../jboss/netty/logging/CommonsLogger.java | 2 +- .../netty/logging/CommonsLoggerFactory.java | 2 +- .../jboss/netty/logging/InternalLogLevel.java | 2 +- .../jboss/netty/logging/InternalLogger.java | 2 +- .../netty/logging/InternalLoggerFactory.java | 6 +- .../org/jboss/netty/logging/JBossLogger.java | 2 +- .../netty/logging/JBossLoggerFactory.java | 2 +- .../org/jboss/netty/logging/JdkLogger.java | 2 +- .../jboss/netty/logging/JdkLoggerFactory.java | 2 +- .../org/jboss/netty/logging/Log4JLogger.java | 2 +- .../netty/logging/Log4JLoggerFactory.java | 2 +- .../org/jboss/netty/logging/OsgiLogger.java | 2 +- .../netty/logging/OsgiLoggerFactory.java | 2 +- .../org/jboss/netty/logging/Slf4JLogger.java | 2 +- .../netty/logging/Slf4JLoggerFactory.java | 2 +- .../org/jboss/netty/logging/package-info.java | 2 +- .../org/jboss/netty/util/CharsetUtil.java | 2 +- .../java/org/jboss/netty/util/DebugUtil.java | 14 +- .../util/DefaultObjectSizeEstimator.java | 8 +- .../netty/util/EstimatableObjectWrapper.java | 2 +- .../util/ExternalResourceReleasable.java | 2 +- .../netty/util/ExternalResourceUtil.java | 2 +- .../jboss/netty/util/HashedWheelTimer.java | 14 +- .../org/jboss/netty/util/MapBackedSet.java | 2 +- .../jboss/netty/util/NamedThreadFactory.java | 6 +- .../jboss/netty/util/ObjectSizeEstimator.java | 4 +- .../java/org/jboss/netty/util/Timeout.java | 2 +- src/main/java/org/jboss/netty/util/Timer.java | 6 +- .../java/org/jboss/netty/util/TimerTask.java | 2 +- .../jboss/netty/util/UnsafeDetectUtil.java | 2 +- .../netty/util/VirtualExecutorService.java | 6 +- .../util/internal/AtomicFieldUpdaterUtil.java | 2 +- .../util/internal/ConcurrentHashMap.java | 2 +- .../internal/ConcurrentIdentityHashMap.java | 2 +- .../ConcurrentIdentityWeakKeyHashMap.java | 2 +- .../internal/ConcurrentWeakKeyHashMap.java | 2 +- .../netty/util/internal/ConversionUtil.java | 2 +- .../util/internal/DeadLockProofWorker.java | 2 +- .../netty/util/internal/ExecutorUtil.java | 2 +- .../internal/LegacyLinkedTransferQueue.java | 2 +- .../util/internal/LinkedTransferQueue.java | 2 +- .../netty/util/internal/NonReentrantLock.java | 2 +- .../netty/util/internal/QueueFactory.java | 4 +- .../netty/util/internal/ReusableIterator.java | 2 +- .../SharedResourceMisuseDetector.java | 6 +- .../util/internal/StackTraceSimplifier.java | 10 +- .../jboss/netty/util/internal/StringUtil.java | 2 +- .../util/internal/SystemPropertyUtil.java | 2 +- .../util/internal/ThreadLocalBoolean.java | 2 +- .../util/internal/ThreadLocalRandom.java | 2 +- .../util/internal/UnterminatableExecutor.java | 2 +- .../netty/util/internal/jzlib/Adler32.java | 2 +- .../netty/util/internal/jzlib/CRC32.java | 2 +- .../netty/util/internal/jzlib/Deflate.java | 4 +- .../netty/util/internal/jzlib/InfBlocks.java | 2 +- .../netty/util/internal/jzlib/InfCodes.java | 2 +- .../netty/util/internal/jzlib/InfTree.java | 2 +- .../netty/util/internal/jzlib/Inflate.java | 4 +- .../netty/util/internal/jzlib/JZlib.java | 2 +- .../netty/util/internal/jzlib/StaticTree.java | 2 +- .../jboss/netty/util/internal/jzlib/Tree.java | 2 +- .../netty/util/internal/jzlib/ZStream.java | 4 +- .../netty/util/internal/package-info.java | 2 +- .../org/jboss/netty/util/package-info.java | 2 +- src/main/resources/META-INF/jboss-beans.xml | 4 +- .../jboss/netty/container/spring/beans.xml | 4 +- .../AbstractSocketClientBootstrapTest.java | 16 +- .../AbstractSocketServerBootstrapTest.java | 28 +- .../bootstrap/BootstrapOrderedMapTest.java | 2 +- .../jboss/netty/bootstrap/BootstrapTest.java | 12 +- .../NioSocketClientBootstrapTest.java | 6 +- .../NioSocketServerBootstrapTest.java | 6 +- .../OioSocketClientBootstrapTest.java | 6 +- .../OioSocketServerBootstrapTest.java | 6 +- .../buffer/AbstractChannelBufferTest.java | 6 +- .../AbstractCompositeChannelBufferTest.java | 4 +- .../BigEndianCompositeChannelBufferTest.java | 2 +- .../BigEndianDirectChannelBufferTest.java | 2 +- .../BigEndianHeapChannelBufferTest.java | 2 +- ...ByteBufferBackedHeapChannelBufferTest.java | 2 +- .../buffer/ChannelBufferIndexFinderTest.java | 4 +- .../netty/buffer/ChannelBufferStreamTest.java | 2 +- .../netty/buffer/ChannelBuffersTest.java | 4 +- .../buffer/DuplicateChannelBufferTest.java | 2 +- .../buffer/DynamicChannelBufferTest.java | 2 +- ...ittleEndianCompositeChannelBufferTest.java | 2 +- .../LittleEndianDirectChannelBufferTest.java | 2 +- .../LittleEndianHeapChannelBufferTest.java | 2 +- .../buffer/ReadOnlyChannelBufferTest.java | 4 +- .../netty/buffer/SlicedChannelBufferTest.java | 2 +- .../buffer/TruncatedChannelBufferTest.java | 2 +- .../channel/CompleteChannelFutureTest.java | 2 +- .../channel/FailedChannelFutureTest.java | 2 +- .../channel/StaticChannelPipelineTest.java | 2 +- .../channel/SucceededChannelFutureTest.java | 2 +- .../socket/AbstractSocketEchoTest.java | 30 +- .../NioClientSocketShutdownTimeTest.java | 12 +- .../channel/socket/NioNioSocketEchoTest.java | 8 +- .../channel/socket/NioOioSocketEchoTest.java | 8 +- .../NioServerSocketShutdownTimeTest.java | 16 +- .../channel/socket/OioNioSocketEchoTest.java | 8 +- .../channel/socket/OioOioSocketEchoTest.java | 8 +- ...eptedServerChannelRequestDispatchTest.java | 18 +- .../socket/http/FakeChannelConfig.java | 16 +- .../channel/socket/http/FakeChannelSink.java | 8 +- .../http/FakeClientSocketChannelFactory.java | 8 +- .../socket/http/FakeServerSocketChannel.java | 20 +- .../http/FakeServerSocketChannelConfig.java | 12 +- .../http/FakeServerSocketChannelFactory.java | 10 +- .../socket/http/FakeSocketChannel.java | 20 +- .../HttpTunnelAcceptedChannelSinkTest.java | 6 +- .../HttpTunnelClientChannelConfigTest.java | 4 +- .../http/HttpTunnelClientChannelTest.java | 16 +- .../http/HttpTunnelClientPollHandlerTest.java | 14 +- .../http/HttpTunnelClientSendHandlerTest.java | 18 +- .../HttpTunnelServerChannelFactoryTest.java | 12 +- .../http/HttpTunnelServerChannelSinkTest.java | 16 +- .../http/HttpTunnelServerChannelTest.java | 18 +- .../socket/http/HttpTunnelSoakTester.java | 42 +- .../channel/socket/http/HttpTunnelTest.java | 38 +- .../socket/http/MockChannelStateListener.java | 6 +- .../channel/socket/http/NettyTestUtils.java | 18 +- .../socket/http/NettyTestUtilsTest.java | 6 +- .../socket/http/NullChannelHandler.java | 10 +- .../socket/http/SaturationManagerTest.java | 4 +- .../socket/http/ServerMessageSwitchTest.java | 14 +- .../socket/http/UpstreamEventCatcher.java | 8 +- .../socket/http/WriteFragmenterTest.java | 14 +- .../socket/http/WriteSplitterTest.java | 6 +- .../socket/nio/NioDatagramChannelTest.java | 10 +- .../channel/socket/nio/SimpleHandler.java | 10 +- .../netty/channel/socket/nio/UdpClient.java | 2 +- .../codec/bytes/ByteArrayDecoderTest.java | 6 +- .../codec/bytes/ByteArrayEncoderTest.java | 8 +- .../AbstractSocketFixedLengthEchoTest.java | 30 +- .../frame/DelimiterBasedFrameDecoderTest.java | 12 +- .../LengthFieldBasedFrameDecoderTest.java | 12 +- .../NioNioSocketFixedLengthEchoTest.java | 8 +- .../NioOioSocketFixedLengthEchoTest.java | 8 +- .../OioNioSocketFixedLengthEchoTest.java | 8 +- .../OioOioSocketFixedLengthEchoTest.java | 8 +- .../handler/codec/http/CookieDecoderTest.java | 2 +- .../handler/codec/http/CookieEncoderTest.java | 2 +- .../codec/http/DefaultHttpMessageTest.java | 2 +- .../codec/http/HttpHeaderDateFormatTest.java | 2 +- .../codec/http/QueryStringDecoderTest.java | 4 +- .../ProtobufVarint32FrameDecoderTest.java | 8 +- ...tobufVarint32LengthFieldPrependerTest.java | 8 +- .../codec/replay/ReplayingDecoderTest.java | 14 +- ...tSocketCompatibleObjectStreamEchoTest.java | 26 +- .../AbstractSocketObjectStreamEchoTest.java | 26 +- .../CompactObjectSerializationTest.java | 2 +- ...oSocketCompatibleObjectStreamEchoTest.java | 8 +- .../NioNioSocketObjectStreamEchoTest.java | 8 +- ...oSocketCompatibleObjectStreamEchoTest.java | 8 +- .../NioOioSocketObjectStreamEchoTest.java | 8 +- ...oSocketCompatibleObjectStreamEchoTest.java | 8 +- .../OioNioSocketObjectStreamEchoTest.java | 8 +- ...oSocketCompatibleObjectStreamEchoTest.java | 8 +- .../OioOioSocketObjectStreamEchoTest.java | 8 +- .../SwitchableInputStreamTest.java | 2 +- .../string/AbstractSocketStringEchoTest.java | 32 +- .../string/NioNioSocketStringEchoTest.java | 8 +- .../string/NioOioSocketStringEchoTest.java | 8 +- .../string/OioNioSocketStringEchoTest.java | 8 +- .../string/OioOioSocketStringEchoTest.java | 8 +- .../handler/ipfilter/IpFilterRuleTest.java | 20 +- .../ssl/AbstractSocketSslEchoTest.java | 40 +- .../handler/ssl/ImmediateExecutorTest.java | 2 +- .../handler/ssl/NioNioSocketSslEchoTest.java | 8 +- .../handler/ssl/NioOioSocketSslEchoTest.java | 8 +- .../handler/ssl/OioNioSocketSslEchoTest.java | 8 +- .../handler/ssl/OioOioSocketSslEchoTest.java | 8 +- .../logging/CommonsLoggerFactoryTest.java | 2 +- .../netty/logging/CommonsLoggerTest.java | 2 +- .../logging/InternalLoggerFactoryTest.java | 2 +- .../netty/logging/JBossLoggerFactoryTest.java | 2 +- .../jboss/netty/logging/JBossLoggerTest.java | 2 +- .../netty/logging/JdkLoggerFactoryTest.java | 2 +- .../jboss/netty/logging/JdkLoggerTest.java | 2 +- .../netty/logging/Log4JLoggerFactoryTest.java | 2 +- .../jboss/netty/logging/Log4JLoggerTest.java | 2 +- .../netty/logging/Slf4JLoggerFactoryTest.java | 2 +- .../jboss/netty/logging/Slf4JLoggerTest.java | 2 +- .../org/jboss/netty/util/DebugUtilTest.java | 10 +- .../org/jboss/netty/util/DummyHandler.java | 10 +- .../jboss/netty/util/MapBackedSetTest.java | 2 +- .../java/org/jboss/netty/util/TestUtil.java | 2 +- .../util/internal/ConversionUtilTest.java | 2 +- .../internal/StackTraceSimplifierTest.java | 10 +- .../netty/util/internal/StringUtilTest.java | 2 +- 753 files changed, 4003 insertions(+), 4003 deletions(-) diff --git a/.gitignore b/.gitignore index aac0dd3a6a..bec6213641 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ /.settings /target /reports -/src/main/java/org/jboss/netty/util/Version.java +/src/main/java/io/netty/util/Version.java /*.iml /*.ipr /*.iws diff --git a/pom.xml b/pom.xml index 0cdde74822..896657234e 100644 --- a/pom.xml +++ b/pom.xml @@ -394,7 +394,7 @@ Build number: ${buildNumber} - + diff --git a/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java index ef7644cd03..11c9555f52 100644 --- a/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java +++ b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.bootstrap; +package io.netty.bootstrap; -import static org.jboss.netty.channel.Channels.*; +import static io.netty.channel.Channels.*; import java.util.ArrayList; import java.util.HashMap; @@ -25,12 +25,12 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelFactory; -import org.jboss.netty.channel.ChannelHandler; -import org.jboss.netty.channel.ChannelPipeline; -import org.jboss.netty.channel.ChannelPipelineFactory; -import org.jboss.netty.util.ExternalResourceReleasable; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFactory; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.ChannelPipelineFactory; +import io.netty.util.ExternalResourceReleasable; /** * A helper class which initializes a {@link Channel}. This class provides @@ -43,7 +43,7 @@ import org.jboss.netty.util.ExternalResourceReleasable; * @author The Netty Project * @author Trustin Lee * - * @apiviz.uses org.jboss.netty.channel.ChannelFactory + * @apiviz.uses io.netty.channel.ChannelFactory */ public class Bootstrap implements ExternalResourceReleasable { diff --git a/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java index a9e7cdbd0e..d973633e41 100644 --- a/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java +++ b/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java @@ -13,20 +13,20 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.bootstrap; +package io.netty.bootstrap; import java.net.InetSocketAddress; import java.net.SocketAddress; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelConfig; -import org.jboss.netty.channel.ChannelFactory; -import org.jboss.netty.channel.ChannelFuture; -import org.jboss.netty.channel.ChannelHandler; -import org.jboss.netty.channel.ChannelPipeline; -import org.jboss.netty.channel.ChannelPipelineException; -import org.jboss.netty.channel.ChannelPipelineFactory; -import org.jboss.netty.channel.Channels; +import io.netty.channel.Channel; +import io.netty.channel.ChannelConfig; +import io.netty.channel.ChannelFactory; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.ChannelPipelineException; +import io.netty.channel.ChannelPipelineFactory; +import io.netty.channel.Channels; /** * A helper class which creates a new client-side {@link Channel} and makes a diff --git a/src/main/java/org/jboss/netty/bootstrap/ConnectionlessBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ConnectionlessBootstrap.java index 421c882edd..e54c68cd7c 100644 --- a/src/main/java/org/jboss/netty/bootstrap/ConnectionlessBootstrap.java +++ b/src/main/java/org/jboss/netty/bootstrap/ConnectionlessBootstrap.java @@ -13,21 +13,21 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.bootstrap; +package io.netty.bootstrap; import java.net.InetSocketAddress; import java.net.SocketAddress; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelConfig; -import org.jboss.netty.channel.ChannelException; -import org.jboss.netty.channel.ChannelFactory; -import org.jboss.netty.channel.ChannelFuture; -import org.jboss.netty.channel.ChannelHandler; -import org.jboss.netty.channel.ChannelPipeline; -import org.jboss.netty.channel.ChannelPipelineException; -import org.jboss.netty.channel.ChannelPipelineFactory; -import org.jboss.netty.channel.Channels; +import io.netty.channel.Channel; +import io.netty.channel.ChannelConfig; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFactory; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.ChannelPipelineException; +import io.netty.channel.ChannelPipelineFactory; +import io.netty.channel.Channels; /** * A helper class which creates a new server-side {@link Channel} for a diff --git a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java index d784ad3986..cf74df41cf 100644 --- a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java +++ b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java @@ -13,9 +13,9 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.bootstrap; +package io.netty.bootstrap; -import static org.jboss.netty.channel.Channels.*; +import static io.netty.channel.Channels.*; import java.net.InetSocketAddress; import java.net.SocketAddress; @@ -26,21 +26,21 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.jboss.netty.channel.Channel; -import org.jboss.netty.channel.ChannelConfig; -import org.jboss.netty.channel.ChannelException; -import org.jboss.netty.channel.ChannelFactory; -import org.jboss.netty.channel.ChannelFuture; -import org.jboss.netty.channel.ChannelHandler; -import org.jboss.netty.channel.ChannelHandlerContext; -import org.jboss.netty.channel.ChannelPipeline; -import org.jboss.netty.channel.ChannelPipelineFactory; -import org.jboss.netty.channel.ChannelStateEvent; -import org.jboss.netty.channel.Channels; -import org.jboss.netty.channel.ChildChannelStateEvent; -import org.jboss.netty.channel.ExceptionEvent; -import org.jboss.netty.channel.ServerChannelFactory; -import org.jboss.netty.channel.SimpleChannelUpstreamHandler; +import io.netty.channel.Channel; +import io.netty.channel.ChannelConfig; +import io.netty.channel.ChannelException; +import io.netty.channel.ChannelFactory; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.ChannelPipeline; +import io.netty.channel.ChannelPipelineFactory; +import io.netty.channel.ChannelStateEvent; +import io.netty.channel.Channels; +import io.netty.channel.ChildChannelStateEvent; +import io.netty.channel.ExceptionEvent; +import io.netty.channel.ServerChannelFactory; +import io.netty.channel.SimpleChannelUpstreamHandler; /** * A helper class which creates a new server-side {@link Channel} and accepts diff --git a/src/main/java/org/jboss/netty/bootstrap/package-info.java b/src/main/java/org/jboss/netty/bootstrap/package-info.java index 18f7ee8b1b..b2d18d0831 100644 --- a/src/main/java/org/jboss/netty/bootstrap/package-info.java +++ b/src/main/java/org/jboss/netty/bootstrap/package-info.java @@ -21,4 +21,4 @@ * @apiviz.landmark * @apiviz.exclude ^org\.jboss\.netty\.util\. */ -package org.jboss.netty.bootstrap; +package io.netty.bootstrap; diff --git a/src/main/java/org/jboss/netty/buffer/AbstractChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/AbstractChannelBuffer.java index 874d305159..5b413d75ed 100644 --- a/src/main/java/org/jboss/netty/buffer/AbstractChannelBuffer.java +++ b/src/main/java/org/jboss/netty/buffer/AbstractChannelBuffer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/jboss/netty/buffer/AbstractChannelBufferFactory.java b/src/main/java/org/jboss/netty/buffer/AbstractChannelBufferFactory.java index 1bfcf1833b..0be05dcca4 100644 --- a/src/main/java/org/jboss/netty/buffer/AbstractChannelBufferFactory.java +++ b/src/main/java/org/jboss/netty/buffer/AbstractChannelBufferFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/jboss/netty/buffer/BigEndianHeapChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/BigEndianHeapChannelBuffer.java index b4be739fb8..dc82e014b4 100644 --- a/src/main/java/org/jboss/netty/buffer/BigEndianHeapChannelBuffer.java +++ b/src/main/java/org/jboss/netty/buffer/BigEndianHeapChannelBuffer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/jboss/netty/buffer/ByteBufferBackedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/ByteBufferBackedChannelBuffer.java index 29c7d27538..eec4f6e857 100644 --- a/src/main/java/org/jboss/netty/buffer/ByteBufferBackedChannelBuffer.java +++ b/src/main/java/org/jboss/netty/buffer/ByteBufferBackedChannelBuffer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/jboss/netty/buffer/ChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/ChannelBuffer.java index fa6ff19f8c..64eb9065bb 100644 --- a/src/main/java/org/jboss/netty/buffer/ChannelBuffer.java +++ b/src/main/java/org/jboss/netty/buffer/ChannelBuffer.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/org/jboss/netty/buffer/ChannelBufferFactory.java b/src/main/java/org/jboss/netty/buffer/ChannelBufferFactory.java index e5ed6c4c2d..d529438ee7 100644 --- a/src/main/java/org/jboss/netty/buffer/ChannelBufferFactory.java +++ b/src/main/java/org/jboss/netty/buffer/ChannelBufferFactory.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/org/jboss/netty/buffer/ChannelBufferIndexFinder.java b/src/main/java/org/jboss/netty/buffer/ChannelBufferIndexFinder.java index 1fa9e8e901..147e78c20a 100644 --- a/src/main/java/org/jboss/netty/buffer/ChannelBufferIndexFinder.java +++ b/src/main/java/org/jboss/netty/buffer/ChannelBufferIndexFinder.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; /** @@ -28,7 +28,7 @@ package org.jboss.netty.buffer; * @author The Netty Project * @author Trustin Lee * - * @apiviz.uses org.jboss.netty.buffer.ChannelBuffer + * @apiviz.uses io.netty.buffer.ChannelBuffer */ public interface ChannelBufferIndexFinder { diff --git a/src/main/java/org/jboss/netty/buffer/ChannelBufferInputStream.java b/src/main/java/org/jboss/netty/buffer/ChannelBufferInputStream.java index 49031da4ce..b60f208824 100644 --- a/src/main/java/org/jboss/netty/buffer/ChannelBufferInputStream.java +++ b/src/main/java/org/jboss/netty/buffer/ChannelBufferInputStream.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; import java.io.DataInput; import java.io.DataInputStream; @@ -36,7 +36,7 @@ import java.io.InputStream; * @author Trustin Lee * * @see ChannelBufferOutputStream - * @apiviz.uses org.jboss.netty.buffer.ChannelBuffer + * @apiviz.uses io.netty.buffer.ChannelBuffer */ public class ChannelBufferInputStream extends InputStream implements DataInput { diff --git a/src/main/java/org/jboss/netty/buffer/ChannelBufferOutputStream.java b/src/main/java/org/jboss/netty/buffer/ChannelBufferOutputStream.java index 1486f3ca31..5ec9f4115f 100644 --- a/src/main/java/org/jboss/netty/buffer/ChannelBufferOutputStream.java +++ b/src/main/java/org/jboss/netty/buffer/ChannelBufferOutputStream.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; import java.io.DataOutput; import java.io.DataOutputStream; @@ -35,7 +35,7 @@ import java.io.OutputStream; * @author Trustin Lee * * @see ChannelBufferInputStream - * @apiviz.uses org.jboss.netty.buffer.ChannelBuffer + * @apiviz.uses io.netty.buffer.ChannelBuffer */ public class ChannelBufferOutputStream extends OutputStream implements DataOutput { diff --git a/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java b/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java index 51e96142a4..07f2be9df8 100644 --- a/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java +++ b/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.jboss.netty.buffer; +package io.netty.buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -26,7 +26,7 @@ import java.nio.charset.CoderResult; import java.util.ArrayList; import java.util.List; -import org.jboss.netty.util.CharsetUtil; +import io.netty.util.CharsetUtil; /** @@ -37,7 +37,7 @@ import org.jboss.netty.util.CharsetUtil; * This classes is intended to be used with Java 5 static import statement: * * 
- * import static org.jboss.netty.buffer.{@link ChannelBuffers}.*;
+ * import static io.netty.buffer.{@link ChannelBuffers}.*;
  *
  * {@link ChannelBuffer} heapBuffer    = buffer(128);
  * {@link ChannelBuffer} directBuffer  = directBuffer(256);
@@ -86,7 +86,7 @@ import org.jboss.netty.util.CharsetUtil;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.buffer.ChannelBuffer oneway - - creates
+ * @apiviz.has io.netty.buffer.ChannelBuffer oneway - - creates
  */
 public class ChannelBuffers {
 
diff --git a/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
index f4f425b45d..a3d4df39cf 100644
--- a/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/jboss/netty/buffer/DirectChannelBufferFactory.java b/src/main/java/org/jboss/netty/buffer/DirectChannelBufferFactory.java
index f77d9aa5c5..96d034a8ac 100644
--- a/src/main/java/org/jboss/netty/buffer/DirectChannelBufferFactory.java
+++ b/src/main/java/org/jboss/netty/buffer/DirectChannelBufferFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.lang.ref.ReferenceQueue;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/org/jboss/netty/buffer/DuplicatedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/DuplicatedChannelBuffer.java
index 2713a1c5f8..eeed1ff8ac 100644
--- a/src/main/java/org/jboss/netty/buffer/DuplicatedChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/DuplicatedChannelBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java
index 713ec01f8a..ed4dbb7480 100644
--- a/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/jboss/netty/buffer/HeapChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/HeapChannelBuffer.java
index f73c0acab1..b693830ab4 100644
--- a/src/main/java/org/jboss/netty/buffer/HeapChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/HeapChannelBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/jboss/netty/buffer/HeapChannelBufferFactory.java b/src/main/java/org/jboss/netty/buffer/HeapChannelBufferFactory.java
index 5ea10ec3e4..02b5d55d1a 100644
--- a/src/main/java/org/jboss/netty/buffer/HeapChannelBufferFactory.java
+++ b/src/main/java/org/jboss/netty/buffer/HeapChannelBufferFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/src/main/java/org/jboss/netty/buffer/LittleEndianHeapChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/LittleEndianHeapChannelBuffer.java
index 4adc3098e8..5dd12a7e37 100644
--- a/src/main/java/org/jboss/netty/buffer/LittleEndianHeapChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/LittleEndianHeapChannelBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.nio.ByteOrder;
 
diff --git a/src/main/java/org/jboss/netty/buffer/ReadOnlyChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/ReadOnlyChannelBuffer.java
index c88ed8152d..2b9b3d2ff9 100644
--- a/src/main/java/org/jboss/netty/buffer/ReadOnlyChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/ReadOnlyChannelBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/jboss/netty/buffer/SlicedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/SlicedChannelBuffer.java
index 88778a352c..c062bbac32 100644
--- a/src/main/java/org/jboss/netty/buffer/SlicedChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/SlicedChannelBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/jboss/netty/buffer/TruncatedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/TruncatedChannelBuffer.java
index 410790dde1..d55b9be897 100644
--- a/src/main/java/org/jboss/netty/buffer/TruncatedChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/TruncatedChannelBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/jboss/netty/buffer/WrappedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/WrappedChannelBuffer.java
index dc9acb3eeb..27def1f877 100644
--- a/src/main/java/org/jboss/netty/buffer/WrappedChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/WrappedChannelBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 /**
  * The common interface for buffer wrappers and derived buffers.  Most users won't
diff --git a/src/main/java/org/jboss/netty/buffer/package-info.java b/src/main/java/org/jboss/netty/buffer/package-info.java
index 6a9dc9866a..2d8f7e6320 100644
--- a/src/main/java/org/jboss/netty/buffer/package-info.java
+++ b/src/main/java/org/jboss/netty/buffer/package-info.java
@@ -21,7 +21,7 @@
  * Netty uses its own buffer API instead of NIO {@link java.nio.ByteBuffer} to
  * represent a sequence of bytes. This approach has significant advantage over
  * using {@link java.nio.ByteBuffer}.  Netty's new buffer type,
- * {@link org.jboss.netty.buffer.ChannelBuffer}, has been designed from ground
+ * {@link io.netty.buffer.ChannelBuffer}, has been designed from ground
  * up to address the problems of {@link java.nio.ByteBuffer} and to meet the
  * daily needs of network application developers.  To list a few cool features:
  * 
    
@@ -35,13 +35,13 @@
  *
  * 
    Extensibility
    
  *
- * {@link org.jboss.netty.buffer.ChannelBuffer} has rich set of operations
+ * {@link io.netty.buffer.ChannelBuffer} has rich set of operations
  * optimized for rapid protocol implementation.  For example,
- * {@link org.jboss.netty.buffer.ChannelBuffer} provides various operations
+ * {@link io.netty.buffer.ChannelBuffer} provides various operations
  * for accessing unsigned values and strings and searching for certain byte
  * sequence in a buffer.  You can also extend or wrap existing buffer type
  * to add convenient accessors.  The custom buffer type still implements
- * {@link org.jboss.netty.buffer.ChannelBuffer} interface rather than
+ * {@link io.netty.buffer.ChannelBuffer} interface rather than
  * introducing an incompatible type.
  *
  * 
    Transparent Zero Copy
    
@@ -70,7 +70,7 @@
  * // The composite type is incompatible with the component type.
  * ByteBuffer[] message = new ByteBuffer[] { header, body };
  *
- * By contrast, {@link org.jboss.netty.buffer.ChannelBuffer} does not have such + * By contrast, {@link io.netty.buffer.ChannelBuffer} does not have such * caveats because it is fully extensible and has a built-in composite buffer * type. * 
@@ -98,7 +98,7 @@
  * of the resulting string and let {@link java.lang.StringBuffer} expand itself
  * on demand.  Netty allows you to do the same via a dynamic buffer
  * which is created by the
- * {@link org.jboss.netty.buffer.ChannelBuffers#dynamicBuffer()} method.
+ * {@link io.netty.buffer.ChannelBuffers#dynamicBuffer()} method.
  * 
  * // A new dynamic buffer is created.  Internally, the actual buffer is created
  * // lazily to avoid potentially wasted memory space.
@@ -120,7 +120,7 @@
  * 
Better Performance

  *
  * Most frequently used buffer implementation of
- * {@link org.jboss.netty.buffer.ChannelBuffer} is a very thin wrapper of a
+ * {@link io.netty.buffer.ChannelBuffer} is a very thin wrapper of a
  * byte array (i.e. {@code byte[]}).  Unlike {@link java.nio.ByteBuffer}, it has
  * no complicated boundary check and index compensation, and therefore it is
  * easier for a JVM to optimize the buffer access.  More complicated buffer
@@ -131,4 +131,4 @@
  * @apiviz.exclude ^java\.lang\.
  * @apiviz.exclude ^java\.io\.[^\.]+Stream$
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
diff --git a/src/main/java/org/jboss/netty/channel/AbstractChannel.java b/src/main/java/org/jboss/netty/channel/AbstractChannel.java
index f8ffaec603..fb829c3e1c 100644
--- a/src/main/java/org/jboss/netty/channel/AbstractChannel.java
+++ b/src/main/java/org/jboss/netty/channel/AbstractChannel.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.net.SocketAddress;
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.netty.util.internal.ConcurrentHashMap;
+import io.netty.util.internal.ConcurrentHashMap;
 
 /**
  * A skeletal {@link Channel} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java b/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
index 8d972167d9..be9c3c98b0 100644
--- a/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 /**
  * A skeletal {@link ChannelSink} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/AbstractServerChannel.java b/src/main/java/org/jboss/netty/channel/AbstractServerChannel.java
index 1df129fceb..1498ec0bb5 100644
--- a/src/main/java/org/jboss/netty/channel/AbstractServerChannel.java
+++ b/src/main/java/org/jboss/netty/channel/AbstractServerChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java b/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java
index 119a102ee7..50a5ade025 100644
--- a/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java
+++ b/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java b/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
index e3d573465f..02eebf774e 100644
--- a/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
+++ b/src/main/java/org/jboss/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/channel/Channel.java b/src/main/java/org/jboss/netty/channel/Channel.java
index f7ed787d0a..7d96722aec 100644
--- a/src/main/java/org/jboss/netty/channel/Channel.java
+++ b/src/main/java/org/jboss/netty/channel/Channel.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.nio.channels.NotYetConnectedException;
 import java.nio.channels.SelectionKey;
 
-import org.jboss.netty.channel.socket.DatagramChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioSocketChannelConfig;
 
 
 /**
@@ -104,8 +104,8 @@ import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.composedOf org.jboss.netty.channel.ChannelConfig
- * @apiviz.composedOf org.jboss.netty.channel.ChannelPipeline
+ * @apiviz.composedOf io.netty.channel.ChannelConfig
+ * @apiviz.composedOf io.netty.channel.ChannelPipeline
  *
  * @apiviz.exclude ^org\.jboss\.netty\.channel\.([a-z]+\.)+[^\.]+Channel$
  */
diff --git a/src/main/java/org/jboss/netty/channel/ChannelConfig.java b/src/main/java/org/jboss/netty/channel/ChannelConfig.java
index 4237f61646..4307cb3fb2 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelConfig.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.nio.ByteOrder;
 import java.util.Map;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
-import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.HeapChannelBufferFactory;
+import io.netty.channel.socket.SocketChannelConfig;
+import io.netty.channel.socket.nio.NioSocketChannelConfig;
 
 /**
  * A set of configuration properties of a {@link Channel}.
@@ -63,8 +63,8 @@ import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.has org.jboss.netty.channel.ChannelPipelineFactory
- * @apiviz.composedOf org.jboss.netty.channel.ReceiveBufferSizePredictor
+ * @apiviz.has io.netty.channel.ChannelPipelineFactory
+ * @apiviz.composedOf io.netty.channel.ReceiveBufferSizePredictor
  *
  * @apiviz.excludeSubtypes
  */
diff --git a/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java b/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java
index 877dd0d60d..4919ac8d4b 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * Handles or intercepts a downstream {@link ChannelEvent}, and sends a
diff --git a/src/main/java/org/jboss/netty/channel/ChannelEvent.java b/src/main/java/org/jboss/netty/channel/ChannelEvent.java
index d16e091dbd..c20b2fb872 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelEvent.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelEvent.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.net.SocketAddress;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.socket.ServerSocketChannel;
 
 /**
  * An I/O event or I/O request associated with a {@link Channel}.
@@ -182,7 +182,7 @@ import org.jboss.netty.channel.socket.ServerSocketChannel;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.composedOf org.jboss.netty.channel.ChannelFuture
+ * @apiviz.composedOf io.netty.channel.ChannelFuture
  */
 public interface ChannelEvent {
 
diff --git a/src/main/java/org/jboss/netty/channel/ChannelException.java b/src/main/java/org/jboss/netty/channel/ChannelException.java
index a9d30d7a21..a46b4fac86 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelException.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * A {@link RuntimeException} which is thrown when an I/O operation fails.
diff --git a/src/main/java/org/jboss/netty/channel/ChannelFactory.java b/src/main/java/org/jboss/netty/channel/ChannelFactory.java
index e9492d36fc..7291d04106 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelFactory.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.util.ExternalResourceReleasable;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.util.ExternalResourceReleasable;
 
 
 /**
@@ -51,7 +51,7 @@ import org.jboss.netty.util.ExternalResourceReleasable;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has        org.jboss.netty.channel.Channel oneway - - creates
+ * @apiviz.has        io.netty.channel.Channel oneway - - creates
  *
  * @apiviz.exclude ^org\.jboss\.netty\.channel\.([a-z]+\.)+.*ChannelFactory$
  */
diff --git a/src/main/java/org/jboss/netty/channel/ChannelFuture.java b/src/main/java/org/jboss/netty/channel/ChannelFuture.java
index b326c5be61..1782b82870 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelFuture.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.handler.execution.ExecutionHandler;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.handler.execution.ExecutionHandler;
 
 /**
  * The result of an asynchronous {@link Channel} I/O operation.
@@ -168,7 +168,7 @@ import org.jboss.netty.handler.execution.ExecutionHandler;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.owns org.jboss.netty.channel.ChannelFutureListener - - notifies
+ * @apiviz.owns io.netty.channel.ChannelFutureListener - - notifies
  */
 public interface ChannelFuture {
 
diff --git a/src/main/java/org/jboss/netty/channel/ChannelFutureAggregator.java b/src/main/java/org/jboss/netty/channel/ChannelFutureAggregator.java
index 54f2801070..b2c060e93b 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelFutureAggregator.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelFutureAggregator.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/org/jboss/netty/channel/ChannelFutureListener.java b/src/main/java/org/jboss/netty/channel/ChannelFutureListener.java
index cc2fc73916..f37a29c501 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelFutureListener.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelFutureListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.EventListener;
 
diff --git a/src/main/java/org/jboss/netty/channel/ChannelFutureProgressListener.java b/src/main/java/org/jboss/netty/channel/ChannelFutureProgressListener.java
index cb142ce4f6..a53738872a 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelFutureProgressListener.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelFutureProgressListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/channel/ChannelHandler.java b/src/main/java/org/jboss/netty/channel/ChannelHandler.java
index 4dd5b32bf7..47879d95d3 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelHandler.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -22,8 +22,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.jboss.netty.bootstrap.Bootstrap;
-import org.jboss.netty.channel.group.ChannelGroup;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.channel.group.ChannelGroup;
 
 /**
  * Handles or intercepts a {@link ChannelEvent}, and sends a
diff --git a/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java b/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java
index 148593a1d9..1987233e47 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 
 /**
@@ -120,7 +120,7 @@ package org.jboss.netty.channel;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.owns org.jboss.netty.channel.ChannelHandler
+ * @apiviz.owns io.netty.channel.ChannelHandler
  */
 public interface ChannelHandlerContext {
 
diff --git a/src/main/java/org/jboss/netty/channel/ChannelHandlerLifeCycleException.java b/src/main/java/org/jboss/netty/channel/ChannelHandlerLifeCycleException.java
index dd9f2e05d8..429e83735c 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelHandlerLifeCycleException.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelHandlerLifeCycleException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * A {@link RuntimeException} which is thrown when a
diff --git a/src/main/java/org/jboss/netty/channel/ChannelLocal.java b/src/main/java/org/jboss/netty/channel/ChannelLocal.java
index 91062feada..8080a1f3b1 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelLocal.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelLocal.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.netty.util.internal.ConcurrentIdentityWeakKeyHashMap;
+import io.netty.util.internal.ConcurrentIdentityWeakKeyHashMap;
 
 /**
  * A global variable that is local to a {@link Channel}.  Think of this as a
diff --git a/src/main/java/org/jboss/netty/channel/ChannelPipeline.java b/src/main/java/org/jboss/netty/channel/ChannelPipeline.java
index d87b1e3b74..77f2669da6 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelPipeline.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelPipeline.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -21,10 +21,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.execution.ExecutionHandler;
-import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
-import org.jboss.netty.handler.ssl.SslHandler;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.execution.ExecutionHandler;
+import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+import io.netty.handler.ssl.SslHandler;
 
 
 /**
@@ -46,7 +46,7 @@ import org.jboss.netty.handler.ssl.SslHandler;
  * {@link Channels} rather than calling an individual implementation's
  * constructor:
  * 
- * import static org.jboss.netty.channel.{@link Channels}.*;
+ * import static io.netty.channel.{@link Channels}.*;
  * {@link ChannelPipeline} pipeline = pipeline(); // same with Channels.pipeline()
  * 

  *
@@ -205,9 +205,9 @@ import org.jboss.netty.handler.ssl.SslHandler;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.composedOf org.jboss.netty.channel.ChannelHandlerContext
- * @apiviz.owns       org.jboss.netty.channel.ChannelHandler
- * @apiviz.uses       org.jboss.netty.channel.ChannelSink - - sends events downstream
+ * @apiviz.composedOf io.netty.channel.ChannelHandlerContext
+ * @apiviz.owns       io.netty.channel.ChannelHandler
+ * @apiviz.uses       io.netty.channel.ChannelSink - - sends events downstream
  */
 public interface ChannelPipeline {
 
diff --git a/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java b/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java
index cd21bb30db..0875e04b83 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * A {@link ChannelException} which is thrown when a {@link ChannelPipeline}
diff --git a/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java b/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java
index d5e0e9cbdf..7735e2e78f 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import org.jboss.netty.bootstrap.Bootstrap;
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
+import io.netty.bootstrap.Bootstrap;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ConnectionlessBootstrap;
 
 /**
  * Creates a new {@link ChannelPipeline} for a new {@link Channel}.
@@ -35,7 +35,7 @@ import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.has org.jboss.netty.channel.ChannelPipeline oneway - - creates
+ * @apiviz.has io.netty.channel.ChannelPipeline oneway - - creates
  */
 public interface ChannelPipelineFactory {
 
diff --git a/src/main/java/org/jboss/netty/channel/ChannelSink.java b/src/main/java/org/jboss/netty/channel/ChannelSink.java
index 4f0918abfc..3eb5ca45f6 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelSink.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 
 /**
@@ -26,7 +26,7 @@ package org.jboss.netty.channel;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.uses org.jboss.netty.channel.ChannelPipeline - - sends events upstream
+ * @apiviz.uses io.netty.channel.ChannelPipeline - - sends events upstream
  */
 public interface ChannelSink {
 
diff --git a/src/main/java/org/jboss/netty/channel/ChannelState.java b/src/main/java/org/jboss/netty/channel/ChannelState.java
index d4a14d2ef6..ed5a1072e7 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelState.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelState.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/jboss/netty/channel/ChannelStateEvent.java b/src/main/java/org/jboss/netty/channel/ChannelStateEvent.java
index 2a80b911ee..1a5054f78a 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelStateEvent.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelStateEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 
 /**
@@ -27,7 +27,7 @@ package org.jboss.netty.channel;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.has org.jboss.netty.channel.ChannelState
+ * @apiviz.has io.netty.channel.ChannelState
  */
 public interface ChannelStateEvent extends ChannelEvent {
 
diff --git a/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java b/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
index 87f4376df3..1eb869fc4b 100644
--- a/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.handler.execution.ExecutionHandler;
+import io.netty.handler.execution.ExecutionHandler;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/channel/Channels.java b/src/main/java/org/jboss/netty/channel/Channels.java
index 31ea56c374..faedd14976 100644
--- a/src/main/java/org/jboss/netty/channel/Channels.java
+++ b/src/main/java/org/jboss/netty/channel/Channels.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.net.SocketAddress;
 import java.util.Map;
 
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.util.internal.ConversionUtil;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/channel/ChildChannelStateEvent.java b/src/main/java/org/jboss/netty/channel/ChildChannelStateEvent.java
index 1b90150e65..79bb181215 100644
--- a/src/main/java/org/jboss/netty/channel/ChildChannelStateEvent.java
+++ b/src/main/java/org/jboss/netty/channel/ChildChannelStateEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * A {@link ChannelEvent} which represents the notification of the state of
diff --git a/src/main/java/org/jboss/netty/channel/CompleteChannelFuture.java b/src/main/java/org/jboss/netty/channel/CompleteChannelFuture.java
index 7d580ebf14..5e2fa421c2 100644
--- a/src/main/java/org/jboss/netty/channel/CompleteChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/CompleteChannelFuture.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * A skeletal {@link ChannelFuture} implementation which represents a
diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java b/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java
index 05533468de..2d2441e481 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChannelConfig.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.HeapChannelBufferFactory;
+import io.netty.channel.socket.SocketChannelConfig;
+import io.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link SocketChannelConfig} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java b/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
index 9bae244483..1bfad67651 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import static java.util.concurrent.TimeUnit.*;
 
@@ -22,9 +22,9 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.DeadLockProofWorker;
 
 /**
  * The default {@link ChannelFuture} implementation.  It is recommended to
diff --git a/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
index 6a74051839..81d7985e98 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,8 +22,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * The default {@link ChannelPipeline} implementation.  It is recommended
diff --git a/src/main/java/org/jboss/netty/channel/DefaultChildChannelStateEvent.java b/src/main/java/org/jboss/netty/channel/DefaultChildChannelStateEvent.java
index ea6749e30e..9c6a039344 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultChildChannelStateEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChildChannelStateEvent.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 /**
  * The default {@link ChildChannelStateEvent} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/DefaultExceptionEvent.java b/src/main/java/org/jboss/netty/channel/DefaultExceptionEvent.java
index 003d84c443..d1fdd85a76 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultExceptionEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultExceptionEvent.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.util.internal.StackTraceSimplifier;
+import io.netty.util.internal.StackTraceSimplifier;
 
 /**
  * The default {@link ExceptionEvent} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/DefaultFileRegion.java b/src/main/java/org/jboss/netty/channel/DefaultFileRegion.java
index d4f335211e..fce2b50aac 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultFileRegion.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultFileRegion.java
@@ -1,11 +1,11 @@
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.WritableByteChannel;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 public class DefaultFileRegion implements FileRegion {
 
diff --git a/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java b/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java
index e7b6b140dc..3b2de73506 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultServerChannelConfig.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.HeapChannelBufferFactory;
+import io.netty.channel.socket.ServerSocketChannelConfig;
 
 /**
  * The default {@link ServerSocketChannelConfig} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/DefaultWriteCompletionEvent.java b/src/main/java/org/jboss/netty/channel/DefaultWriteCompletionEvent.java
index b9700b05ac..41111c3420 100644
--- a/src/main/java/org/jboss/netty/channel/DefaultWriteCompletionEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultWriteCompletionEvent.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 /**
  * The default {@link WriteCompletionEvent} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/DownstreamChannelStateEvent.java b/src/main/java/org/jboss/netty/channel/DownstreamChannelStateEvent.java
index 6485b93372..494f99bdfe 100644
--- a/src/main/java/org/jboss/netty/channel/DownstreamChannelStateEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DownstreamChannelStateEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * The default downstream {@link ChannelStateEvent} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java b/src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java
index 9badd152b7..db6883a19b 100644
--- a/src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DownstreamMessageEvent.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.util.internal.StringUtil;
+import io.netty.util.internal.StringUtil;
 
 /**
  * The default downstream {@link MessageEvent} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/ExceptionEvent.java b/src/main/java/org/jboss/netty/channel/ExceptionEvent.java
index 1df615e9aa..973d49d36a 100644
--- a/src/main/java/org/jboss/netty/channel/ExceptionEvent.java
+++ b/src/main/java/org/jboss/netty/channel/ExceptionEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * A {@link ChannelEvent} which represents the notification of an exception
diff --git a/src/main/java/org/jboss/netty/channel/FailedChannelFuture.java b/src/main/java/org/jboss/netty/channel/FailedChannelFuture.java
index de438918c3..9093778a88 100644
--- a/src/main/java/org/jboss/netty/channel/FailedChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/FailedChannelFuture.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * The {@link CompleteChannelFuture} which is failed already.  It is
diff --git a/src/main/java/org/jboss/netty/channel/FileRegion.java b/src/main/java/org/jboss/netty/channel/FileRegion.java
index fef19021a9..f605ac4d2b 100644
--- a/src/main/java/org/jboss/netty/channel/FileRegion.java
+++ b/src/main/java/org/jboss/netty/channel/FileRegion.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.WritableByteChannel;
 
-import org.jboss.netty.util.ExternalResourceReleasable;
+import io.netty.util.ExternalResourceReleasable;
 
 /**
  * A region of a file that is sent via a {@link Channel} which supports
diff --git a/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictor.java b/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictor.java
index 138c44d444..0913528d8b 100644
--- a/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictor.java
+++ b/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java b/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java
index 559f329c34..a4f9459927 100644
--- a/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java
+++ b/src/main/java/org/jboss/netty/channel/FixedReceiveBufferSizePredictorFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/channel/LifeCycleAwareChannelHandler.java b/src/main/java/org/jboss/netty/channel/LifeCycleAwareChannelHandler.java
index 61b337602c..e4133bd0f1 100644
--- a/src/main/java/org/jboss/netty/channel/LifeCycleAwareChannelHandler.java
+++ b/src/main/java/org/jboss/netty/channel/LifeCycleAwareChannelHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * A {@link ChannelHandler} that is notified when it is added to or removed
diff --git a/src/main/java/org/jboss/netty/channel/MessageEvent.java b/src/main/java/org/jboss/netty/channel/MessageEvent.java
index 37ca4efcc1..f4665574f5 100644
--- a/src/main/java/org/jboss/netty/channel/MessageEvent.java
+++ b/src/main/java/org/jboss/netty/channel/MessageEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictor.java b/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictor.java
index 2997c168d2..ae6624afcd 100644
--- a/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictor.java
+++ b/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictor.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * Predicts the number of readable bytes in the receive buffer of a
diff --git a/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java b/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java
index c1e209fb93..5951943759 100644
--- a/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java
+++ b/src/main/java/org/jboss/netty/channel/ReceiveBufferSizePredictorFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * Creates a new {@link ReceiveBufferSizePredictor}.
@@ -21,7 +21,7 @@ package org.jboss.netty.channel;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.has        org.jboss.netty.channel.ReceiveBufferSizePredictor oneway - - creates
+ * @apiviz.has        io.netty.channel.ReceiveBufferSizePredictor oneway - - creates
  */
 public interface ReceiveBufferSizePredictorFactory {
 
diff --git a/src/main/java/org/jboss/netty/channel/ServerChannel.java b/src/main/java/org/jboss/netty/channel/ServerChannel.java
index a59d9678f1..99cc20291a 100644
--- a/src/main/java/org/jboss/netty/channel/ServerChannel.java
+++ b/src/main/java/org/jboss/netty/channel/ServerChannel.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import org.jboss.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannel;
 
 /**
  * A {@link Channel} that accepts an incoming connection attempt and creates
diff --git a/src/main/java/org/jboss/netty/channel/ServerChannelFactory.java b/src/main/java/org/jboss/netty/channel/ServerChannelFactory.java
index e61a1cfaa6..eb47609461 100644
--- a/src/main/java/org/jboss/netty/channel/ServerChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/ServerChannelFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * A {@link ChannelFactory} that creates a {@link ServerChannel}.
@@ -21,7 +21,7 @@ package org.jboss.netty.channel;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.has        org.jboss.netty.channel.ServerChannel oneway - - creates
+ * @apiviz.has        io.netty.channel.ServerChannel oneway - - creates
  */
 public interface ServerChannelFactory extends ChannelFactory {
     @Override
diff --git a/src/main/java/org/jboss/netty/channel/SimpleChannelDownstreamHandler.java b/src/main/java/org/jboss/netty/channel/SimpleChannelDownstreamHandler.java
index 4b9f95b245..eeb739166c 100644
--- a/src/main/java/org/jboss/netty/channel/SimpleChannelDownstreamHandler.java
+++ b/src/main/java/org/jboss/netty/channel/SimpleChannelDownstreamHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java b/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
index 08b0ed66ca..c5daa9d25b 100644
--- a/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
+++ b/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java b/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java
index 160581e90a..5fe5111353 100644
--- a/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java
+++ b/src/main/java/org/jboss/netty/channel/SimpleChannelUpstreamHandler.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/channel/StaticChannelPipeline.java b/src/main/java/org/jboss/netty/channel/StaticChannelPipeline.java
index 071b24eb3a..783b744cc9 100644
--- a/src/main/java/org/jboss/netty/channel/StaticChannelPipeline.java
+++ b/src/main/java/org/jboss/netty/channel/StaticChannelPipeline.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -21,9 +21,9 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.ConversionUtil;
 
 /**
  * A {@link ChannelPipeline} that might perform better at the cost of
diff --git a/src/main/java/org/jboss/netty/channel/SucceededChannelFuture.java b/src/main/java/org/jboss/netty/channel/SucceededChannelFuture.java
index d3605df9f4..7820fe71c2 100644
--- a/src/main/java/org/jboss/netty/channel/SucceededChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/SucceededChannelFuture.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * The {@link CompleteChannelFuture} which is succeeded already.  It is
diff --git a/src/main/java/org/jboss/netty/channel/UpstreamChannelStateEvent.java b/src/main/java/org/jboss/netty/channel/UpstreamChannelStateEvent.java
index e52c2894b7..493abcd295 100644
--- a/src/main/java/org/jboss/netty/channel/UpstreamChannelStateEvent.java
+++ b/src/main/java/org/jboss/netty/channel/UpstreamChannelStateEvent.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 /**
  * The default upstream {@link ChannelStateEvent} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java b/src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java
index 3531f7c043..ba449af281 100644
--- a/src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java
+++ b/src/main/java/org/jboss/netty/channel/UpstreamMessageEvent.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.util.internal.StringUtil;
+import io.netty.util.internal.StringUtil;
 
 /**
  * The default upstream {@link MessageEvent} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/WriteCompletionEvent.java b/src/main/java/org/jboss/netty/channel/WriteCompletionEvent.java
index f25a27c64a..0dbbacaf64 100644
--- a/src/main/java/org/jboss/netty/channel/WriteCompletionEvent.java
+++ b/src/main/java/org/jboss/netty/channel/WriteCompletionEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 /**
  * A {@link ChannelEvent} which represents the notification of the completion
diff --git a/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java b/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java
index 7577c2c297..a892dde4fa 100644
--- a/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java
+++ b/src/main/java/org/jboss/netty/channel/group/ChannelGroup.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.group;
+package io.netty.channel.group;
 
 import java.net.SocketAddress;
 import java.util.Set;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ServerChannel;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ServerChannel;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.util.CharsetUtil;
 
 /**
  * A thread-safe {@link Set} that contains open {@link Channel}s and provides
@@ -92,7 +92,7 @@ import org.jboss.netty.util.CharsetUtil;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.channel.group.ChannelGroupFuture oneway - - returns
+ * @apiviz.has io.netty.channel.group.ChannelGroupFuture oneway - - returns
  */
 public interface ChannelGroup extends Set, Comparable {
 
diff --git a/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java b/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java
index b73aaee994..bf1f970a03 100644
--- a/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java
+++ b/src/main/java/org/jboss/netty/channel/group/ChannelGroupFuture.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.group;
+package io.netty.channel.group;
 
 import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.handler.execution.ExecutionHandler;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.MessageEvent;
+import io.netty.handler.execution.ExecutionHandler;
 
 /**
  * The result of an asynchronous {@link ChannelGroup} operation.
@@ -111,7 +111,7 @@ import org.jboss.netty.handler.execution.ExecutionHandler;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.owns org.jboss.netty.channel.group.ChannelGroupFutureListener - - notifies
+ * @apiviz.owns io.netty.channel.group.ChannelGroupFutureListener - - notifies
  */
 public interface ChannelGroupFuture extends Iterable {
 
diff --git a/src/main/java/org/jboss/netty/channel/group/ChannelGroupFutureListener.java b/src/main/java/org/jboss/netty/channel/group/ChannelGroupFutureListener.java
index dfd73c7aa3..226d5f0c02 100644
--- a/src/main/java/org/jboss/netty/channel/group/ChannelGroupFutureListener.java
+++ b/src/main/java/org/jboss/netty/channel/group/ChannelGroupFutureListener.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.group;
+package io.netty.channel.group;
 
 import java.util.EventListener;
 
diff --git a/src/main/java/org/jboss/netty/channel/group/CombinedIterator.java b/src/main/java/org/jboss/netty/channel/group/CombinedIterator.java
index 9a93febf56..a99c715e7e 100644
--- a/src/main/java/org/jboss/netty/channel/group/CombinedIterator.java
+++ b/src/main/java/org/jboss/netty/channel/group/CombinedIterator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.group;
+package io.netty.channel.group;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
diff --git a/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java b/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
index e648a25215..6be85f2376 100644
--- a/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
+++ b/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroup.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.group;
+package io.netty.channel.group;
 
 import java.net.SocketAddress;
 import java.util.AbstractSet;
@@ -25,12 +25,12 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ServerChannel;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ServerChannel;
+import io.netty.util.internal.ConcurrentHashMap;
 
 /**
  * The default {@link ChannelGroup} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java b/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java
index f965de26ce..f5316f56fb 100644
--- a/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java
+++ b/src/main/java/org/jboss/netty/channel/group/DefaultChannelGroupFuture.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.group;
+package io.netty.channel.group;
 
 import static java.util.concurrent.TimeUnit.*;
 
@@ -26,12 +26,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.DeadLockProofWorker;
 
 /**
  * The default {@link ChannelGroupFuture} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/group/package-info.java b/src/main/java/org/jboss/netty/channel/group/package-info.java
index 67919da5f4..6e3ae83fd9 100644
--- a/src/main/java/org/jboss/netty/channel/group/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/group/package-info.java
@@ -16,9 +16,9 @@
 
 /**
  * A channel registry which helps a user maintain the list of open
- * {@link org.jboss.netty.channel.Channel}s and perform bulk operations on them.
+ * {@link io.netty.channel.Channel}s and perform bulk operations on them.
  *
  * @apiviz.exclude ^java
  * @apiviz.exclude \.DefaultChannelGroupFuture$
  */
-package org.jboss.netty.channel.group;
+package io.netty.channel.group;
diff --git a/src/main/java/org/jboss/netty/channel/iostream/IOStreamAddress.java b/src/main/java/org/jboss/netty/channel/iostream/IOStreamAddress.java
index 9f9fc29730..7266cab972 100755
--- a/src/main/java/org/jboss/netty/channel/iostream/IOStreamAddress.java
+++ b/src/main/java/org/jboss/netty/channel/iostream/IOStreamAddress.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.iostream;
+package io.netty.channel.iostream;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannel.java b/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannel.java
index 980ac68123..d922825724 100755
--- a/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannel.java
+++ b/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannel.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.iostream;
+package io.netty.channel.iostream;
 
-import org.jboss.netty.channel.*;
+import io.netty.channel.*;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannelFactory.java b/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannelFactory.java
index 5b7c9548cd..1b95af8d40 100755
--- a/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannelFactory.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.iostream;
+package io.netty.channel.iostream;
 
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.ChannelGroupFuture;
-import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.ChannelGroupFuture;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.util.internal.ExecutorUtil;
 
 import java.util.concurrent.ExecutorService;
 
 /**
- * A {@link org.jboss.netty.channel.ChannelFactory} for creating {@link IOStreamChannel} instances.
+ * A {@link io.netty.channel.ChannelFactory} for creating {@link IOStreamChannel} instances.
  *
  * @author Daniel Bimschas
  * @author Dennis Pfisterer
diff --git a/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannelSink.java b/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannelSink.java
index a7599f9455..0b0a674efa 100755
--- a/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/iostream/IOStreamChannelSink.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.iostream;
+package io.netty.channel.iostream;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.*;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.*;
 
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
 import java.util.concurrent.ExecutorService;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 /**
- * A {@link org.jboss.netty.channel.ChannelSink} implementation which reads from
+ * A {@link io.netty.channel.ChannelSink} implementation which reads from
  * an {@link java.io.InputStream} and writes to an {@link java.io.OutputStream}.
  * 
  * @author Daniel Bimschas
diff --git a/src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java b/src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java
index 97fc9334fc..68e6040ff0 100644
--- a/src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java
+++ b/src/main/java/org/jboss/netty/channel/local/DefaultLocalChannel.java
@@ -13,27 +13,27 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.nio.channels.ClosedChannelException;
 import java.nio.channels.NotYetConnectedException;
 import java.util.Queue;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.internal.QueueFactory;
-import org.jboss.netty.util.internal.ThreadLocalBoolean;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.MessageEvent;
+import io.netty.util.internal.QueueFactory;
+import io.netty.util.internal.ThreadLocalBoolean;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/local/DefaultLocalClientChannelFactory.java b/src/main/java/org/jboss/netty/channel/local/DefaultLocalClientChannelFactory.java
index 091cca8436..3a1cf34ec0 100644
--- a/src/main/java/org/jboss/netty/channel/local/DefaultLocalClientChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/local/DefaultLocalClientChannelFactory.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
 
 /**
  * The default {@link LocalClientChannelFactory} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/local/DefaultLocalServerChannel.java b/src/main/java/org/jboss/netty/channel/local/DefaultLocalServerChannel.java
index a1f67143fd..adfb50f797 100644
--- a/src/main/java/org/jboss/netty/channel/local/DefaultLocalServerChannel.java
+++ b/src/main/java/org/jboss/netty/channel/local/DefaultLocalServerChannel.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.jboss.netty.channel.AbstractServerChannel;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.DefaultServerChannelConfig;
+import io.netty.channel.AbstractServerChannel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.DefaultServerChannelConfig;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/local/DefaultLocalServerChannelFactory.java b/src/main/java/org/jboss/netty/channel/local/DefaultLocalServerChannelFactory.java
index e74741dc4b..85290a218f 100644
--- a/src/main/java/org/jboss/netty/channel/local/DefaultLocalServerChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/local/DefaultLocalServerChannelFactory.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
 
 /**
  * The default {@link LocalServerChannelFactory} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/local/LocalAddress.java b/src/main/java/org/jboss/netty/channel/local/LocalAddress.java
index bd7cfa7d70..da92483310 100644
--- a/src/main/java/org/jboss/netty/channel/local/LocalAddress.java
+++ b/src/main/java/org/jboss/netty/channel/local/LocalAddress.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/jboss/netty/channel/local/LocalChannel.java b/src/main/java/org/jboss/netty/channel/local/LocalChannel.java
index 72ec25f268..a030e6e43b 100644
--- a/src/main/java/org/jboss/netty/channel/local/LocalChannel.java
+++ b/src/main/java/org/jboss/netty/channel/local/LocalChannel.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import org.jboss.netty.channel.Channel;
+import io.netty.channel.Channel;
 
 /**
  * A {@link Channel} for the local transport.
diff --git a/src/main/java/org/jboss/netty/channel/local/LocalChannelRegistry.java b/src/main/java/org/jboss/netty/channel/local/LocalChannelRegistry.java
index dc22676e92..333474b3f9 100644
--- a/src/main/java/org/jboss/netty/channel/local/LocalChannelRegistry.java
+++ b/src/main/java/org/jboss/netty/channel/local/LocalChannelRegistry.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.util.internal.ConcurrentHashMap;
+import io.netty.channel.Channel;
+import io.netty.util.internal.ConcurrentHashMap;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/local/LocalClientChannelFactory.java b/src/main/java/org/jboss/netty/channel/local/LocalClientChannelFactory.java
index ab59a7a3fc..6bfa36e942 100644
--- a/src/main/java/org/jboss/netty/channel/local/LocalClientChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/local/LocalClientChannelFactory.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
 
 /**
  * A {@link ChannelFactory} that creates a client-side {@link LocalChannel}.
diff --git a/src/main/java/org/jboss/netty/channel/local/LocalClientChannelSink.java b/src/main/java/org/jboss/netty/channel/local/LocalClientChannelSink.java
index bc2b66e84c..f498e1dab6 100644
--- a/src/main/java/org/jboss/netty/channel/local/LocalClientChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/local/LocalClientChannelSink.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.ConnectException;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/local/LocalServerChannel.java b/src/main/java/org/jboss/netty/channel/local/LocalServerChannel.java
index 438805650a..58ec4e3cd8 100644
--- a/src/main/java/org/jboss/netty/channel/local/LocalServerChannel.java
+++ b/src/main/java/org/jboss/netty/channel/local/LocalServerChannel.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import org.jboss.netty.channel.ServerChannel;
+import io.netty.channel.ServerChannel;
 
 /**
  * A {@link ServerChannel} for the local transport.
diff --git a/src/main/java/org/jboss/netty/channel/local/LocalServerChannelFactory.java b/src/main/java/org/jboss/netty/channel/local/LocalServerChannelFactory.java
index 62216af917..6d88242aa1 100644
--- a/src/main/java/org/jboss/netty/channel/local/LocalServerChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/local/LocalServerChannelFactory.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ServerChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ServerChannelFactory;
 
 /**
  * A {@link ServerChannelFactory} that creates a {@link LocalServerChannel}.
diff --git a/src/main/java/org/jboss/netty/channel/local/LocalServerChannelSink.java b/src/main/java/org/jboss/netty/channel/local/LocalServerChannelSink.java
index 65ee5c9081..3d94eb7d89 100644
--- a/src/main/java/org/jboss/netty/channel/local/LocalServerChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/local/LocalServerChannelSink.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/local/package-info.java b/src/main/java/org/jboss/netty/channel/local/package-info.java
index 0011f6d205..adc6dcb375 100644
--- a/src/main/java/org/jboss/netty/channel/local/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/local/package-info.java
@@ -21,4 +21,4 @@
  * @apiviz.exclude ^java\.lang\.
  * @apiviz.exclude Channel$
  */
-package org.jboss.netty.channel.local;
+package io.netty.channel.local;
diff --git a/src/main/java/org/jboss/netty/channel/package-info.java b/src/main/java/org/jboss/netty/channel/package-info.java
index e1200429d8..0b646dac35 100644
--- a/src/main/java/org/jboss/netty/channel/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/package-info.java
@@ -33,4 +33,4 @@
  * @apiviz.exclude \.[^\.]+ReceiveBufferSizePredictor(Factory)?$
  * @apiviz.exclude \.FileRegion$
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
diff --git a/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannel.java b/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannel.java
index 9510057900..f997d4a91c 100644
--- a/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannel.java
+++ b/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannel.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.rxtx;
+package io.netty.channel.rxtx;
 
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
 
 /**
  * A channel to a serial device using the RXTX library.
diff --git a/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelConfig.java b/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelConfig.java
index a787b543e3..334d6a381e 100644
--- a/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelConfig.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.rxtx;
+package io.netty.channel.rxtx;
 
 import gnu.io.SerialPort;
 
-import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.util.internal.ConversionUtil;
 
 /**
  * A configuration class for RXTX device connections.
diff --git a/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelFactory.java b/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelFactory.java
index c622cb7460..df2c48dd63 100644
--- a/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelFactory.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.rxtx;
+package io.netty.channel.rxtx;
 
 
 import java.util.concurrent.ExecutorService;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.ChannelGroupFuture;
-import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.ChannelGroupFuture;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link ChannelFactory} for creating {@link RXTXChannel} instances.
diff --git a/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelSink.java b/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelSink.java
index a2f503f63e..deb7d8bbf6 100644
--- a/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/rxtx/RXTXChannelSink.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.rxtx;
+package io.netty.channel.rxtx;
 
 import gnu.io.CommPort;
 import gnu.io.CommPortIdentifier;
@@ -30,20 +30,20 @@ import java.io.IOException;
 import java.util.TooManyListenersException;
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.DefaultChannelFuture;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.UpstreamMessageEvent;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.DefaultChannelFuture;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.UpstreamMessageEvent;
 
 /**
  * A {@link ChannelSink} implementation of the RXTX support for JBoss Netty.
diff --git a/src/main/java/org/jboss/netty/channel/rxtx/RXTXDeviceAddress.java b/src/main/java/org/jboss/netty/channel/rxtx/RXTXDeviceAddress.java
index 677059f939..b15c342b69 100644
--- a/src/main/java/org/jboss/netty/channel/rxtx/RXTXDeviceAddress.java
+++ b/src/main/java/org/jboss/netty/channel/rxtx/RXTXDeviceAddress.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.rxtx;
+package io.netty.channel.rxtx;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/jboss/netty/channel/socket/ClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/ClientSocketChannelFactory.java
index 743deef98e..0bf5f2ef63 100644
--- a/src/main/java/org/jboss/netty/channel/socket/ClientSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/ClientSocketChannelFactory.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
 
 /**
  * A {@link ChannelFactory} which creates a client-side {@link SocketChannel}.
@@ -24,7 +24,7 @@ import org.jboss.netty.channel.ChannelPipeline;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.has org.jboss.netty.channel.socket.SocketChannel oneway - - creates
+ * @apiviz.has io.netty.channel.socket.SocketChannel oneway - - creates
  */
 public interface ClientSocketChannelFactory extends ChannelFactory {
     @Override
diff --git a/src/main/java/org/jboss/netty/channel/socket/DatagramChannel.java b/src/main/java/org/jboss/netty/channel/socket/DatagramChannel.java
index 9155535e33..7cc12bd9e2 100644
--- a/src/main/java/org/jboss/netty/channel/socket/DatagramChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/DatagramChannel.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.NetworkInterface;
 
-import org.jboss.netty.channel.Channel;
+import io.netty.channel.Channel;
 
 /**
  * A UDP/IP {@link Channel} which is created by {@link DatagramChannelFactory}.
@@ -28,7 +28,7 @@ import org.jboss.netty.channel.Channel;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.composedOf org.jboss.netty.channel.socket.DatagramChannelConfig
+ * @apiviz.composedOf io.netty.channel.socket.DatagramChannelConfig
  */
 public interface DatagramChannel extends Channel {
     @Override
diff --git a/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java
index a05e647f2e..c1a7b4c830 100644
--- a/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/DatagramChannelConfig.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.FixedReceiveBufferSizePredictor;
-import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
-import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.FixedReceiveBufferSizePredictor;
+import io.netty.channel.FixedReceiveBufferSizePredictorFactory;
+import io.netty.channel.ReceiveBufferSizePredictor;
+import io.netty.channel.ReceiveBufferSizePredictorFactory;
 
 /**
  * A {@link ChannelConfig} for a {@link DatagramChannel}.
diff --git a/src/main/java/org/jboss/netty/channel/socket/DatagramChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/DatagramChannelFactory.java
index aee3b27214..a66a72e6fc 100644
--- a/src/main/java/org/jboss/netty/channel/socket/DatagramChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/DatagramChannelFactory.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
 
 /**
  * A {@link ChannelFactory} which creates a {@link DatagramChannel}.
@@ -24,7 +24,7 @@ import org.jboss.netty.channel.ChannelPipeline;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.has org.jboss.netty.channel.socket.DatagramChannel oneway - - creates
+ * @apiviz.has io.netty.channel.socket.DatagramChannel oneway - - creates
  */
 public interface DatagramChannelFactory extends ChannelFactory {
     @Override
diff --git a/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java
index ab579eec2c..ee61f30b6d 100644
--- a/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/DefaultDatagramChannelConfig.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.io.IOException;
 import java.net.DatagramSocket;
@@ -22,12 +22,12 @@ import java.net.MulticastSocket;
 import java.net.NetworkInterface;
 import java.net.SocketException;
 
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
-import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.channel.ChannelException;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.FixedReceiveBufferSizePredictorFactory;
+import io.netty.channel.ReceiveBufferSizePredictor;
+import io.netty.channel.ReceiveBufferSizePredictorFactory;
+import io.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link DatagramChannelConfig} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java
index 7fe0310b6a..1b464f8f11 100644
--- a/src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.net.ServerSocket;
 import java.net.SocketException;
 
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.DefaultServerChannelConfig;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.channel.ChannelException;
+import io.netty.channel.DefaultServerChannelConfig;
+import io.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link ServerSocketChannelConfig} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java
index d492216b56..10ef6a2572 100644
--- a/src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.net.Socket;
 import java.net.SocketException;
 
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.channel.ChannelException;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link SocketChannelConfig} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannel.java
index 804f19462a..e6ea5d98d4 100644
--- a/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannel.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.channel.ServerChannel;
+import io.netty.channel.ServerChannel;
 
 /**
  * A TCP/IP {@link ServerChannel} which accepts incoming TCP/IP connections.
@@ -26,7 +26,7 @@ import org.jboss.netty.channel.ServerChannel;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.composedOf org.jboss.netty.channel.socket.ServerSocketChannelConfig
+ * @apiviz.composedOf io.netty.channel.socket.ServerSocketChannelConfig
  */
 public interface ServerSocketChannel extends ServerChannel {
     @Override
diff --git a/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelConfig.java
index 46439d80a0..079ee8a149 100644
--- a/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelConfig.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.net.ServerSocket;
 
-import org.jboss.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelConfig;
 
 /**
  * A {@link ChannelConfig} for a {@link ServerSocketChannel}.
diff --git a/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelFactory.java
index 1f602a6e5f..2211be1b18 100644
--- a/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelFactory.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ServerChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ServerChannelFactory;
 
 /**
  * A {@link ChannelFactory} which creates a {@link ServerSocketChannel}.
@@ -25,7 +25,7 @@ import org.jboss.netty.channel.ServerChannelFactory;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.has org.jboss.netty.channel.socket.ServerSocketChannel oneway - - creates
+ * @apiviz.has io.netty.channel.socket.ServerSocketChannel oneway - - creates
  */
 public interface ServerSocketChannelFactory extends ServerChannelFactory {
     @Override
diff --git a/src/main/java/org/jboss/netty/channel/socket/SocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/SocketChannel.java
index 59713baf15..03a88bee01 100644
--- a/src/main/java/org/jboss/netty/channel/socket/SocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/SocketChannel.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.channel.Channel;
+import io.netty.channel.Channel;
 
 /**
  * A TCP/IP socket {@link Channel} which was either accepted by
@@ -27,7 +27,7 @@ import org.jboss.netty.channel.Channel;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.composedOf org.jboss.netty.channel.socket.SocketChannelConfig
+ * @apiviz.composedOf io.netty.channel.socket.SocketChannelConfig
  */
 public interface SocketChannel extends Channel {
     @Override
diff --git a/src/main/java/org/jboss/netty/channel/socket/SocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/SocketChannelConfig.java
index 31cf40249f..5e290b9e6b 100644
--- a/src/main/java/org/jboss/netty/channel/socket/SocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/SocketChannelConfig.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.net.Socket;
 
-import org.jboss.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelConfig;
 
 /**
  * A {@link ChannelConfig} for a {@link SocketChannel}.
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelPipelineFactory.java b/src/main/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelPipelineFactory.java
index cbe52ca678..0a79c2b31f 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelPipelineFactory.java
@@ -14,14 +14,14 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.handler.codec.http.HttpChunkAggregator;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
 
 /**
  * Creates pipelines for incoming http tunnel connections, capable of decoding the incoming HTTP
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelRequestDispatch.java b/src/main/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelRequestDispatch.java
index a7803991e4..df25322bc7 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelRequestDispatch.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelRequestDispatch.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * Upstream handler which is responsible for determining whether a received HTTP request is a legal
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/DefaultTunnelIdGenerator.java b/src/main/java/org/jboss/netty/channel/socket/http/DefaultTunnelIdGenerator.java
index b7db90d5d3..4e64bf9993 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/DefaultTunnelIdGenerator.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/DefaultTunnelIdGenerator.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.security.SecureRandom;
 
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannel.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannel.java
index 6aa8c81405..5b5bcac4a1 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannel.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import static org.jboss.netty.channel.Channels.fireChannelBound;
-import static org.jboss.netty.channel.Channels.fireChannelConnected;
-import static org.jboss.netty.channel.Channels.fireChannelOpen;
+import static io.netty.channel.Channels.fireChannelBound;
+import static io.netty.channel.Channels.fireChannelConnected;
+import static io.netty.channel.Channels.fireChannelOpen;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.SocketChannelConfig;
 
 /**
  * Represents the server end of an HTTP tunnel, created after a legal tunnel creation
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelConfig.java
index e42e6b7c5b..811e6f64b9 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelConfig.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 /**
  * Configuration the server end of an http tunnel.
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelFactory.java
index 52633c5ca1..e385525651 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelReceiver.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelReceiver.java
index e9c51aeea8..3250c1c375 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelReceiver.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelReceiver.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * Interface from the server message switch and channel sink to an
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelSink.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelSink.java
index aa44cbd53e..5064b057a6 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelSink.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
 
 /**
  * Sink for the server end of an http tunnel. Data sent down through the server end is dispatched
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelChannelConfig.java
index ac843590fa..94ff1a435a 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelChannelConfig.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
-import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.socket.SocketChannelConfig;
+import io.netty.channel.socket.nio.NioSocketChannelConfig;
 
 /**
  * Configuration for HTTP tunnels. Where possible, properties set on this configuration will
@@ -81,15 +81,15 @@ public abstract class HttpTunnelChannelConfig extends DefaultChannelConfig
     }
 
     /**
-     * Similarly to {@link org.jboss.netty.channel.socket.nio.NioSocketChannelConfig#setWriteBufferHighWaterMark(int)
+     * Similarly to {@link io.netty.channel.socket.nio.NioSocketChannelConfig#setWriteBufferHighWaterMark(int)
      * NioSocketChannelConfig.setWriteBufferHighWaterMark()},
      * the high water mark refers to the buffer size at which a user of the channel should stop writing. When the
-     * number of queued bytes exceeds the high water mark, {@link org.jboss.netty.channel.Channel#isWritable() Channel.isWritable()} will
+     * number of queued bytes exceeds the high water mark, {@link io.netty.channel.Channel#isWritable() Channel.isWritable()} will
      * return false. Once the number of queued bytes falls below the {@link #setWriteBufferLowWaterMark(int) low water mark},
-     * {@link org.jboss.netty.channel.Channel#isWritable() Channel.isWritable()} will return true again, indicating that the client
+     * {@link io.netty.channel.Channel#isWritable() Channel.isWritable()} will return true again, indicating that the client
      * can begin to send more data.
      *
-     * @param level the number of queued bytes required to flip {@link org.jboss.netty.channel.Channel#isWritable()} to
+     * @param level the number of queued bytes required to flip {@link io.netty.channel.Channel#isWritable()} to
      * false.
      *
      * @see NioSocketChannelConfig#setWriteBufferHighWaterMark(int)
@@ -118,11 +118,11 @@ public abstract class HttpTunnelChannelConfig extends DefaultChannelConfig
 
     /**
      * The low water mark refers to the "safe" size of the queued byte buffer at which more data can be enqueued. When
-     * the {@link #setWriteBufferHighWaterMark(int) high water mark} is exceeded, {@link org.jboss.netty.channel.Channel#isWritable() Channel.isWriteable()}
+     * the {@link #setWriteBufferHighWaterMark(int) high water mark} is exceeded, {@link io.netty.channel.Channel#isWritable() Channel.isWriteable()}
      * will return false until the buffer drops below this level. By creating a sufficient gap between the high and low
      * water marks, rapid oscillation between "write enabled" and "write disabled" can be avoided.
      *
-     * @see org.jboss.netty.channel.socket.nio.NioSocketChannelConfig#setWriteBufferLowWaterMark(int)
+     * @see io.netty.channel.socket.nio.NioSocketChannelConfig#setWriteBufferLowWaterMark(int)
      */
     public void setWriteBufferLowWaterMark(int level) {
         if (level >= writeBufferHighWaterMark) {
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannel.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannel.java
index c2573e03df..97fe2f7d1a 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannel.java
@@ -13,28 +13,28 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
-import org.jboss.netty.handler.codec.http.HttpRequestEncoder;
-import org.jboss.netty.handler.codec.http.HttpResponseDecoder;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.socket.ClientSocketChannelFactory;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.codec.http.HttpChunkAggregator;
+import io.netty.handler.codec.http.HttpRequestEncoder;
+import io.netty.handler.codec.http.HttpResponseDecoder;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * The client end of an HTTP tunnel, created by an {@link HttpTunnelClientChannelFactory}. Channels of
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelConfig.java
index 20fd552ed9..e2fab0feea 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelConfig.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.channel.socket.SocketChannelConfig;
+import io.netty.channel.socket.SocketChannelConfig;
 
 /**
  * Configuration for the client end of an HTTP tunnel. Any socket channel properties set here
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelFactory.java
index 082b9229f7..78cda7aab1 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelFactory.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.channel.socket.ClientSocketChannelFactory;
 
 /**
  * Factory used to create new client channels.
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelSink.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelSink.java
index 86addc36d4..c799895056 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelSink.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
 
 /**
  * Sink of a client channel, deals with sunk events and then makes appropriate calls
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientPollHandler.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientPollHandler.java
index 1ee0556316..c4b96b9e28 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientPollHandler.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientPollHandler.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelHandler;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * Pipeline component which controls the client poll loop to the server.
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientSendHandler.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientSendHandler.java
index 5a44364e4f..3be7527672 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientSendHandler.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientSendHandler.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.DownstreamMessageEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.DownstreamMessageEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelHandler;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * Pipeline component which deals with sending data from the client to server.
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientWorkerOwner.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientWorkerOwner.java
index 41ae229f5c..bb53d1ae62 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientWorkerOwner.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelClientWorkerOwner.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelFuture;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelFuture;
 
 /**
  * Interface which is used by the send and poll "worker" channels
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelMessageUtils.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelMessageUtils.java
index 736fe28df3..f914eb98f5 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelMessageUtils.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelMessageUtils.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
@@ -25,16 +25,16 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Arrays;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpMethod;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpVersion;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
 
 /**
  * Utility class for creating http requests for the operation of the full duplex
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannel.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannel.java
index 34d08efdee..b51e89d5ad 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannel.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.channel.AbstractServerChannel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineException;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.channel.AbstractServerChannel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineException;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannelConfig;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelConfig.java
index 4a8f404f7b..acae1c1ce9 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelConfig.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannelConfig;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelFactory.java
index 32f3088e30..2348dbb160 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelFactory.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannelFactory;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSink.java b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSink.java
index aad8dcfc56..5c5c3395c4 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSink.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.socket.ServerSocketChannel;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/SaturationManager.java b/src/main/java/org/jboss/netty/channel/socket/http/SaturationManager.java
index 95b10e9cab..cb11502034 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/SaturationManager.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/SaturationManager.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import static org.jboss.netty.channel.socket.http.SaturationStateChange.DESATURATED;
-import static org.jboss.netty.channel.socket.http.SaturationStateChange.NO_CHANGE;
-import static org.jboss.netty.channel.socket.http.SaturationStateChange.SATURATED;
+import static io.netty.channel.socket.http.SaturationStateChange.DESATURATED;
+import static io.netty.channel.socket.http.SaturationStateChange.NO_CHANGE;
+import static io.netty.channel.socket.http.SaturationStateChange.SATURATED;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/SaturationStateChange.java b/src/main/java/org/jboss/netty/channel/socket/http/SaturationStateChange.java
index bef8741d6c..8c7078fc9c 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/SaturationStateChange.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/SaturationStateChange.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 /**
  * Represents the state change of a chanel in response in the amount of pending data to be
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitch.java b/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitch.java
index 5a008e6895..173e4cdfa2 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitch.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitch.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 import java.util.List;
@@ -24,15 +24,15 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureAggregator;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureAggregator;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.Channels;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * This is the gateway between the accepted TCP channels that are used to communicate with the client
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchDownstreamInterface.java b/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchDownstreamInterface.java
index 477fae65a2..a75d230406 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchDownstreamInterface.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchDownstreamInterface.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelFuture;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelFuture;
 
 /**
  * The interface from a HttpTunnelAcceptedChannel to the ServerMessageSwitch.
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchUpstreamInterface.java b/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchUpstreamInterface.java
index 91d3fa2eda..f62130ce0d 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchUpstreamInterface.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchUpstreamInterface.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
 
 /**
  * The interface from a TCP channel which is being used to communicate with the client
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/TunnelIdGenerator.java b/src/main/java/org/jboss/netty/channel/socket/http/TunnelIdGenerator.java
index ac82b195cd..1dc63395f8 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/TunnelIdGenerator.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/TunnelIdGenerator.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 /**
  * This interface is used by the server end of an http tunnel to generate new
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/TunnelWrappedServerChannelHandler.java b/src/main/java/org/jboss/netty/channel/socket/http/TunnelWrappedServerChannelHandler.java
index 37943a7e4a..24d8554ed4 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/TunnelWrappedServerChannelHandler.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/TunnelWrappedServerChannelHandler.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.ChildChannelStateEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.group.ChannelGroup;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.ChildChannelStateEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.group.ChannelGroup;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/WriteFragmenter.java b/src/main/java/org/jboss/netty/channel/socket/http/WriteFragmenter.java
index a7bf30520b..e58303d4de 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/WriteFragmenter.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/WriteFragmenter.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.util.List;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureAggregator;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelDownstreamHandler;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureAggregator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelDownstreamHandler;
 
 /**
  * Downstream handler which places an upper bound on the size of written
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/WriteSplitter.java b/src/main/java/org/jboss/netty/channel/socket/http/WriteSplitter.java
index 37a9f772e5..4a9ef2deb0 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/WriteSplitter.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/WriteSplitter.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * Provides functionality to split a provided ChannelBuffer into multiple fragments which fit
diff --git a/src/main/java/org/jboss/netty/channel/socket/http/package-info.java b/src/main/java/org/jboss/netty/channel/socket/http/package-info.java
index db6e44ec8c..a8259b390f 100644
--- a/src/main/java/org/jboss/netty/channel/socket/http/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/socket/http/package-info.java
@@ -15,13 +15,13 @@
  */
 
 /**
- * An HTTP-based client-side {@link org.jboss.netty.channel.socket.SocketChannel}
+ * An HTTP-based client-side {@link io.netty.channel.socket.SocketChannel}
  * and its corresponding server-side Servlet implementation that make your
  * existing server application work in a firewalled network.
  *
  * 
Deploying the HTTP tunnel as a Servlet

  *
- * First, {@link org.jboss.netty.channel.socket.http.HttpTunnelingServlet} must be
+ * First, {@link io.netty.channel.socket.http.HttpTunnelingServlet} must be
  * configured in a web.xml.
  *
  * 
@@ -33,7 +33,7 @@
  *
  *   <servlet>
  *     <servlet-name>NettyTunnelingServlet</servlet-name>
- *     <servlet-class>org.jboss.netty.channel.socket.http.HttpTunnelingServlet</servlet-class>
+ *     <servlet-class>io.netty.channel.socket.http.HttpTunnelingServlet</servlet-class>
  *     <!--
  *       The name of the channel, this should be a registered local channel.
  *       See LocalTransportRegister.
@@ -54,18 +54,18 @@
  *
  * Second, you have to bind your Netty-based server application in the same
  * Servlet context or shared class loader space using the local transport
- * (see {@link org.jboss.netty.channel.local.LocalServerChannelFactory}.)
+ * (see {@link io.netty.channel.local.LocalServerChannelFactory}.)
  * You can use your favorite IoC framework such as JBoss Microcontainer, Guice,
  * and Spring to do this.  The following example shows how to bind an echo
  * server to the endpoint specifed above (web.xml) in JBossAS 5:
  *
  * 
  * <bean name="my-local-echo-server"
- *       class="org.jboss.netty.example.http.tunnel.LocalEchoServerRegistration" />
+ *       class="io.netty.example.http.tunnel.LocalEchoServerRegistration" />
  *
  * ...
  *
- * package org.jboss.netty.example.http.tunnel;
+ * package io.netty.example.http.tunnel;
  * ...
  *
  * public class LocalEchoServerRegistration {
@@ -109,7 +109,7 @@
  * 

  *
  * For more configuration parameters such as HTTPS options,
- * refer to {@link org.jboss.netty.channel.socket.http.HttpTunnelingSocketChannelConfig}.
+ * refer to {@link io.netty.channel.socket.http.HttpTunnelingSocketChannelConfig}.
  */
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractWriteRequestQueue.java b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractWriteRequestQueue.java
index a73678cdeb..a06758cc15 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/AbstractWriteRequestQueue.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/AbstractWriteRequestQueue.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.channel.MessageEvent;
+import io.netty.util.internal.QueueFactory;
 
 /**
  * 
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java
index 29264a98ae..30648af817 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.net.DatagramSocket;
 import java.util.Map;
 
-import org.jboss.netty.channel.socket.DefaultDatagramChannelConfig;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.channel.socket.DefaultDatagramChannelConfig;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link NioSocketChannelConfig} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
index 862c6d3aab..ee48358bf7 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.net.Socket;
 import java.util.Map;
 
-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
-import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.socket.DefaultSocketChannelConfig;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ReceiveBufferSizePredictor;
+import io.netty.channel.ReceiveBufferSizePredictorFactory;
+import io.netty.channel.socket.DefaultSocketChannelConfig;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.ConversionUtil;
 
 /**
  * The default {@link NioSocketChannelConfig} implementation.
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
index 1219cf3248..c99e8c3f74 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.nio.channels.SocketChannel;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java
index 7eb2150369..cd99c615bd 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.nio.channels.SocketChannel;
 
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java
index e4674e5282..f1ecf3af5b 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.nio.channels.Selector;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.socket.ClientSocketChannelFactory;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link ClientSocketChannelFactory} which creates a client-side NIO-based
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
index 4a042dfe44..e1a9734864 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -31,19 +31,19 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.DeadLockProofWorker;
+import io.netty.util.internal.QueueFactory;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
index c2728d4784..b91905c577 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannel.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -27,29 +27,29 @@ import java.util.Queue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.socket.DatagramChannelConfig;
-import org.jboss.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
-import org.jboss.netty.util.internal.LegacyLinkedTransferQueue;
-import org.jboss.netty.util.internal.ThreadLocalBoolean;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.socket.DatagramChannelConfig;
+import io.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
+import io.netty.util.internal.LegacyLinkedTransferQueue;
+import io.netty.util.internal.ThreadLocalBoolean;
 
 /**
- * Provides an NIO based {@link org.jboss.netty.channel.socket.DatagramChannel}.
+ * Provides an NIO based {@link io.netty.channel.socket.DatagramChannel}.
  *
  * @author The Netty Project
  * @author Trustin Lee
  * @author Daniel Bevenius (dbevenius@jboss.com)
  */
 class NioDatagramChannel extends AbstractChannel
-                                implements org.jboss.netty.channel.socket.DatagramChannel {
+                                implements io.netty.channel.socket.DatagramChannel {
 
     /**
      * The {@link DatagramChannelConfig}.
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java
index 5f3aef53ea..f960b34d11 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelConfig.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.socket.DatagramChannel;
-import org.jboss.netty.channel.socket.DatagramChannelConfig;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.DatagramChannelConfig;
 
 /**
  * A {@link DatagramChannelConfig} for a NIO TCP/IP {@link DatagramChannel}.
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java
index 43b3478e78..4b6b8d80fc 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelFactory.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.nio.channels.Selector;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.socket.DatagramChannel;
-import org.jboss.netty.channel.socket.DatagramChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioDatagramChannelFactory;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.DatagramChannelFactory;
+import io.netty.channel.socket.oio.OioDatagramChannelFactory;
+import io.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link DatagramChannelFactory} that creates a NIO-based connectionless
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramPipelineSink.java
index b2c26cb57e..6018fc9ef0 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramPipelineSink.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
 
 /**
  * Receives downstream events from a {@link ChannelPipeline}.  It contains
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
index 4ce2983610..98e73fe8f9 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioDatagramWorker.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -36,16 +36,16 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
-import org.jboss.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.ReceiveBufferSizePredictor;
+import io.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.QueueFactory;
 
 /**
  * A class responsible for registering channels with {@link Selector}.
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java
index e433b6f6c2..3f72ba1675 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioProviderMetadata.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -29,9 +29,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.SystemPropertyUtil;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.SystemPropertyUtil;
 
 /**
  * Provides information which is specific to a NIO service provider
@@ -45,7 +45,7 @@ class NioProviderMetadata {
         InternalLoggerFactory.getInstance(NioProviderMetadata.class);
 
     private static final String CONSTRAINT_LEVEL_PROPERTY =
-        "org.jboss.netty.channel.socket.nio.constraintLevel";
+        "io.netty.channel.socket.nio.constraintLevel";
 
     /**
      * 0 - no need to wake up to get / set interestOps (most cases)
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java
index cb479e6235..4726c083b9 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -24,15 +24,15 @@ import java.nio.channels.ServerSocketChannel;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.jboss.netty.channel.AbstractServerChannel;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.socket.DefaultServerSocketChannelConfig;
-import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.channel.AbstractServerChannel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.socket.DefaultServerSocketChannelConfig;
+import io.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  *
@@ -40,7 +40,7 @@ import org.jboss.netty.logging.InternalLoggerFactory;
  * @author Trustin Lee
  */
 class NioServerSocketChannel extends AbstractServerChannel
-                             implements org.jboss.netty.channel.socket.ServerSocketChannel {
+                             implements io.netty.channel.socket.ServerSocketChannel {
 
     private static final InternalLogger logger =
         InternalLoggerFactory.getInstance(NioServerSocketChannel.class);
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java
index 2262925e9f..16a95dc69b 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.nio.channels.Selector;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.RejectedExecutionException;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannelFactory;
+import io.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link ServerSocketChannelFactory} which creates a server-side NIO-based
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java
index 57ee0eaba4..2a8efdb40b 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -29,17 +29,17 @@ import java.nio.channels.SocketChannel;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.DeadLockProofWorker;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
index 16b91f16a9..d39ccf6cf9 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -24,23 +24,23 @@ import java.util.Queue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
-import org.jboss.netty.util.internal.ThreadLocalBoolean;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
+import io.netty.util.internal.ThreadLocalBoolean;
 
 /**
  * @author The Netty Project
  * @author Trustin Lee
  */
 class NioSocketChannel extends AbstractChannel
-                                implements org.jboss.netty.channel.socket.SocketChannel {
+                                implements io.netty.channel.socket.SocketChannel {
 
     private static final int ST_OPEN = 0;
     private static final int ST_BOUND = 1;
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
index c4dbd36514..b31cf02dc8 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor;
-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
-import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
+import io.netty.channel.AdaptiveReceiveBufferSizePredictor;
+import io.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ReceiveBufferSizePredictor;
+import io.netty.channel.ReceiveBufferSizePredictorFactory;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.SocketChannelConfig;
 
 /**
  * A {@link SocketChannelConfig} for a NIO TCP/IP {@link SocketChannel}.
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
index 4032db0a33..bab8b52faa 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -36,18 +36,18 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
-import org.jboss.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.ReceiveBufferSizePredictor;
+import io.netty.channel.socket.nio.SocketSendBufferPool.SendBuffer;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.DeadLockProofWorker;
+import io.netty.util.internal.QueueFactory;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java b/src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java
index db47890522..6b6b3b7167 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/SelectorUtil.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.io.IOException;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.Selector;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/SocketReceiveBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/nio/SocketReceiveBufferPool.java
index 55809f0794..8553cbe3af 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/SocketReceiveBufferPool.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/SocketReceiveBufferPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.lang.ref.SoftReference;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java
index 43400c395a..7332a51786 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/SocketSendBufferPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.io.IOException;
 import java.lang.ref.SoftReference;
@@ -22,8 +22,8 @@ import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.WritableByteChannel;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.FileRegion;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.FileRegion;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/package-info.java b/src/main/java/org/jboss/netty/channel/socket/nio/package-info.java
index 07cf8d724c..771b88aeb3 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/package-info.java
@@ -18,4 +18,4 @@
  * NIO-based socket channel
  * API implementation - recommended for a large number of connections (>= 1000).
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java
index 869f539fdb..ecc949c1fb 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
 import java.net.Socket;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java
index ca67b9bbca..dc97d9f466 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
 import java.net.Socket;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java
index 0c67de1011..c3ce188206 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.socket.ClientSocketChannelFactory;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link ClientSocketChannelFactory} which creates a client-side blocking
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
index a6844aac22..74aa3f31bb 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.PushbackInputStream;
 import java.net.SocketAddress;
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.util.internal.DeadLockProofWorker;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java
index 9b26401c51..03b3e45b51 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannel.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -25,15 +25,15 @@ import java.net.NetworkInterface;
 import java.net.SocketAddress;
 import java.net.SocketException;
 
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.socket.DatagramChannel;
-import org.jboss.netty.channel.socket.DatagramChannelConfig;
-import org.jboss.netty.channel.socket.DefaultDatagramChannelConfig;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.DatagramChannelConfig;
+import io.netty.channel.socket.DefaultDatagramChannelConfig;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannelFactory.java
index f3c2602a23..adba485ffe 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramChannelFactory.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.socket.DatagramChannel;
-import org.jboss.netty.channel.socket.DatagramChannelFactory;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.DatagramChannelFactory;
+import io.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link DatagramChannelFactory} which creates a blocking I/O based
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java
index 36362b0c73..874ca77611 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramPipelineSink.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.net.SocketAddress;
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.util.internal.DeadLockProofWorker;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramWorker.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramWorker.java
index c3c1ebe381..5ed31625fd 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramWorker.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramWorker.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.InterruptedIOException;
 import java.net.DatagramPacket;
@@ -23,10 +23,10 @@ import java.net.MulticastSocket;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ReceiveBufferSizePredictor;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java
index c4a73e156f..8b96a66b0c 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -23,16 +23,16 @@ import java.net.ServerSocket;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import org.jboss.netty.channel.AbstractServerChannel;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.socket.DefaultServerSocketChannelConfig;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.channel.AbstractServerChannel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.socket.DefaultServerSocketChannelConfig;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java
index 21188a41fe..720a3e8187 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.RejectedExecutionException;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannelFactory;
+import io.netty.util.internal.ExecutorUtil;
 
 /**
  * A {@link ServerSocketChannelFactory} which creates a server-side blocking
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
index 75661106a8..e03943c3e0 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -24,17 +24,17 @@ import java.net.SocketTimeoutException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.DeadLockProofWorker;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java
index 5ab1c3a9a4..3037ca3624 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
@@ -21,15 +21,15 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
 
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.socket.DefaultSocketChannelConfig;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.socket.DefaultSocketChannelConfig;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.SocketChannelConfig;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java
index 737e256e20..fe221cfcab 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
@@ -25,10 +25,10 @@ import java.nio.channels.ClosedChannelException;
 import java.nio.channels.WritableByteChannel;
 import java.util.regex.Pattern;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.FileRegion;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.FileRegion;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/oio/package-info.java b/src/main/java/org/jboss/netty/channel/socket/oio/package-info.java
index bcd7851730..0c424f352d 100644
--- a/src/main/java/org/jboss/netty/channel/socket/oio/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/package-info.java
@@ -18,4 +18,4 @@
  * Old blocking I/O based socket channel API implementation - recommended for
  * a small number of connections (< 1000).
  */
-package org.jboss.netty.channel.socket.oio;
+package io.netty.channel.socket.oio;
diff --git a/src/main/java/org/jboss/netty/channel/socket/package-info.java b/src/main/java/org/jboss/netty/channel/socket/package-info.java
index e5abad68d9..583c76fb1a 100644
--- a/src/main/java/org/jboss/netty/channel/socket/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/socket/package-info.java
@@ -21,4 +21,4 @@
  * @apiviz.exclude \.socket\.[a-z]+\.
  * @apiviz.exclude \.channel\.[A-Z]
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultNioSctpChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultNioSctpChannelConfig.java
index 04de933b00..4c3975440a 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultNioSctpChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultNioSctpChannelConfig.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
 import java.util.Map;
 
-import org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
-import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.channel.AdaptiveReceiveBufferSizePredictorFactory;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ReceiveBufferSizePredictor;
+import io.netty.channel.ReceiveBufferSizePredictorFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.ConversionUtil;
 
 /**
- * The default {@link org.jboss.netty.channel.socket.nio.NioSocketChannelConfig} implementation for SCTP.
+ * The default {@link io.netty.channel.socket.nio.NioSocketChannelConfig} implementation for SCTP.
  *
  * @author The Netty Project
  * @author Trustin Lee
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultSctpChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultSctpChannelConfig.java
index e73af2af0d..6787705902 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultSctpChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultSctpChannelConfig.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
 import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.channel.ChannelException;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.socket.nio.NioSocketChannelConfig;
+import io.netty.util.internal.ConversionUtil;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultSctpServerChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultSctpServerChannelConfig.java
index 527b0f046c..90027dab71 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultSctpServerChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/DefaultSctpServerChannelConfig.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
 
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.DefaultServerChannelConfig;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.channel.ChannelException;
+import io.netty.channel.DefaultServerChannelConfig;
+import io.netty.util.internal.ConversionUtil;
 
 import java.io.IOException;
 
 /**
- * The default {@link org.jboss.netty.channel.socket.ServerSocketChannelConfig} implementation for SCTP.
+ * The default {@link io.netty.channel.socket.ServerSocketChannelConfig} implementation for SCTP.
  *
  * @author The Netty Project
  * @author Trustin Lee
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/NioSctpChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/sctp/NioSctpChannelConfig.java
index 4f9d861c4f..8f977cd915 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/NioSctpChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/NioSctpChannelConfig.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
-import org.jboss.netty.channel.ReceiveBufferSizePredictor;
-import org.jboss.netty.channel.ReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
+import io.netty.channel.ReceiveBufferSizePredictor;
+import io.netty.channel.ReceiveBufferSizePredictorFactory;
+import io.netty.channel.socket.SocketChannelConfig;
 
 /**
- * A {@link org.jboss.netty.channel.socket.sctp.SctpChannelConfig} for a NIO SCTP/IP {@link org.jboss.netty.channel.socket.sctp.SctpChannel}.
+ * A {@link io.netty.channel.socket.sctp.SctpChannelConfig} for a NIO SCTP/IP {@link io.netty.channel.socket.sctp.SctpChannel}.
  *
  * 
Available options

  *
- * In addition to the options provided by {@link org.jboss.netty.channel.ChannelConfig} and
- * {@link org.jboss.netty.channel.socket.sctp.SctpChannelConfig}, {@link org.jboss.netty.channel.socket.sctp.NioSctpChannelConfig} allows the
+ * In addition to the options provided by {@link io.netty.channel.ChannelConfig} and
+ * {@link io.netty.channel.socket.sctp.SctpChannelConfig}, {@link io.netty.channel.socket.sctp.NioSctpChannelConfig} allows the
  * following options in the option map:
  *
  * 
@@ -38,9 +38,9 @@ import org.jboss.netty.channel.socket.SocketChannelConfig;
  * 
  * 
  * 
- * 
+ * 
  * 
- * 
+ * 
  * 
  * 
{@code "writeSpinCount"}{@link #setWriteSpinCount(int)}
{@code "receiveBufferSizePredictor"}{@link #setReceiveBufferSizePredictor(org.jboss.netty.channel.ReceiveBufferSizePredictor)}{@code "receiveBufferSizePredictor"}{@link #setReceiveBufferSizePredictor(io.netty.channel.ReceiveBufferSizePredictor)}
{@code "receiveBufferSizePredictorFactory"}{@link #setReceiveBufferSizePredictorFactory(org.jboss.netty.channel.ReceiveBufferSizePredictorFactory)}{@code "receiveBufferSizePredictorFactory"}{@link #setReceiveBufferSizePredictorFactory(io.netty.channel.ReceiveBufferSizePredictorFactory)}

  *
@@ -52,14 +52,14 @@ public interface NioSctpChannelConfig extends SctpChannelConfig {
 
     /**
      * Returns the high water mark of the write buffer.  If the number of bytes
-     * queued in the write buffer exceeds this value, {@link org.jboss.netty.channel.Channel#isWritable()}
+     * queued in the write buffer exceeds this value, {@link io.netty.channel.Channel#isWritable()}
      * will start to return {@code false}.
      */
     int getWriteBufferHighWaterMark();
 
     /**
      * Sets the high water mark of the write buffer.  If the number of bytes
-     * queued in the write buffer exceeds this value, {@link org.jboss.netty.channel.Channel#isWritable()}
+     * queued in the write buffer exceeds this value, {@link io.netty.channel.Channel#isWritable()}
      * will start to return {@code false}.
      */
     void setWriteBufferHighWaterMark(int writeBufferHighWaterMark);
@@ -68,7 +68,7 @@ public interface NioSctpChannelConfig extends SctpChannelConfig {
      * Returns the low water mark of the write buffer.  Once the number of bytes
      * queued in the write buffer exceeded the
      * {@linkplain #setWriteBufferHighWaterMark(int) high water mark} and then
-     * dropped down below this value, {@link org.jboss.netty.channel.Channel#isWritable()} will return
+     * dropped down below this value, {@link io.netty.channel.Channel#isWritable()} will return
      * {@code true} again.
      */
     int getWriteBufferLowWaterMark();
@@ -77,7 +77,7 @@ public interface NioSctpChannelConfig extends SctpChannelConfig {
      * Sets the low water mark of the write buffer.  Once the number of bytes
      * queued in the write buffer exceeded the
      * {@linkplain #setWriteBufferHighWaterMark(int) high water mark} and then
-     * dropped down below this value, {@link org.jboss.netty.channel.Channel#isWritable()} will return
+     * dropped down below this value, {@link io.netty.channel.Channel#isWritable()} will return
      * {@code true} again.
      */
     void setWriteBufferLowWaterMark(int writeBufferLowWaterMark);
@@ -104,36 +104,36 @@ public interface NioSctpChannelConfig extends SctpChannelConfig {
     void setWriteSpinCount(int writeSpinCount);
 
     /**
-     * Returns the {@link org.jboss.netty.channel.ReceiveBufferSizePredictor} which predicts the
+     * Returns the {@link io.netty.channel.ReceiveBufferSizePredictor} which predicts the
      * number of readable bytes in the socket receive buffer.  The default
-     * predictor is {@link org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536).
+     * predictor is {@link io.netty.channel.AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536).
      */
     ReceiveBufferSizePredictor getReceiveBufferSizePredictor();
 
     /**
-     * Sets the {@link org.jboss.netty.channel.ReceiveBufferSizePredictor} which predicts the
+     * Sets the {@link io.netty.channel.ReceiveBufferSizePredictor} which predicts the
      * number of readable bytes in the socket receive buffer.  The default
-     * predictor is {@link org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536).
+     * predictor is {@link io.netty.channel.AdaptiveReceiveBufferSizePredictor}(64, 1024, 65536).
      */
     void setReceiveBufferSizePredictor(ReceiveBufferSizePredictor predictor);
 
     /**
-     * Returns the {@link org.jboss.netty.channel.ReceiveBufferSizePredictorFactory} which creates a new
-     * {@link org.jboss.netty.channel.ReceiveBufferSizePredictor} when a new channel is created and
-     * no {@link org.jboss.netty.channel.ReceiveBufferSizePredictor} was set.  If no predictor was set
-     * for the channel, {@link #setReceiveBufferSizePredictor(org.jboss.netty.channel.ReceiveBufferSizePredictor)}
+     * Returns the {@link io.netty.channel.ReceiveBufferSizePredictorFactory} which creates a new
+     * {@link io.netty.channel.ReceiveBufferSizePredictor} when a new channel is created and
+     * no {@link io.netty.channel.ReceiveBufferSizePredictor} was set.  If no predictor was set
+     * for the channel, {@link #setReceiveBufferSizePredictor(io.netty.channel.ReceiveBufferSizePredictor)}
      * will be called with the new predictor.  The default factory is
-     * {@link org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536).
+     * {@link io.netty.channel.AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536).
      */
     ReceiveBufferSizePredictorFactory getReceiveBufferSizePredictorFactory();
 
     /**
-     * Sets the {@link org.jboss.netty.channel.ReceiveBufferSizePredictor} which creates a new
-     * {@link org.jboss.netty.channel.ReceiveBufferSizePredictor} when a new channel is created and
-     * no {@link org.jboss.netty.channel.ReceiveBufferSizePredictor} was set.  If no predictor was set
-     * for the channel, {@link #setReceiveBufferSizePredictor(org.jboss.netty.channel.ReceiveBufferSizePredictor)}
+     * Sets the {@link io.netty.channel.ReceiveBufferSizePredictor} which creates a new
+     * {@link io.netty.channel.ReceiveBufferSizePredictor} when a new channel is created and
+     * no {@link io.netty.channel.ReceiveBufferSizePredictor} was set.  If no predictor was set
+     * for the channel, {@link #setReceiveBufferSizePredictor(io.netty.channel.ReceiveBufferSizePredictor)}
      * will be called with the new predictor.  The default factory is
-     * {@link org.jboss.netty.channel.AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536).
+     * {@link io.netty.channel.AdaptiveReceiveBufferSizePredictorFactory}(64, 1024, 65536).
      */
     void setReceiveBufferSizePredictorFactory(
             ReceiveBufferSizePredictorFactory predictorFactory);
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpAcceptedChannel.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpAcceptedChannel.java
index 381cbb9f45..a82e9df132 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpAcceptedChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpAcceptedChannel.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannel.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannel.java
index 378037872c..96ae440a29 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannel.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.Association;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
-import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig;
+import io.netty.channel.Channel;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.SocketChannelConfig;
+import io.netty.channel.socket.nio.NioSocketChannelConfig;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannelConfig.java
index d29a981c69..5e8954cce3 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannelConfig.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
-import org.jboss.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelConfig;
 
 /**
- * A {@link org.jboss.netty.channel.ChannelConfig} for a {@link org.jboss.netty.channel.socket.sctp.SctpChannel}.
+ * A {@link io.netty.channel.ChannelConfig} for a {@link io.netty.channel.socket.sctp.SctpChannel}.
  * 

  * 
Available options

  * 

- * In addition to the options provided by {@link org.jboss.netty.channel.ChannelConfig},
- * {@link org.jboss.netty.channel.socket.sctp.SctpChannelConfig} allows the following options in the option map:
+ * In addition to the options provided by {@link io.netty.channel.ChannelConfig},
+ * {@link io.netty.channel.socket.sctp.SctpChannelConfig} allows the following options in the option map:
  * 

  * 
  * 
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannelImpl.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannelImpl.java
index d3f42fb9ef..1a2e3c9db3 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannelImpl.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpChannelImpl.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.Association;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.*;
-import org.jboss.netty.channel.socket.sctp.SctpSendBufferPool.SendBuffer;
-import org.jboss.netty.util.internal.ThreadLocalBoolean;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.*;
+import io.netty.channel.socket.sctp.SctpSendBufferPool.SendBuffer;
+import io.netty.util.internal.ThreadLocalBoolean;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -28,7 +28,7 @@ import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.jboss.netty.channel.Channels.fireChannelInterestChanged;
+import static io.netty.channel.Channels.fireChannelInterestChanged;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientChannel.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientChannel.java
index c0a053d81c..37a88a3a77 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientChannel.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
-import org.jboss.netty.channel.*;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.channel.*;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 import java.io.IOException;
 
-import static org.jboss.netty.channel.Channels.fireChannelOpen;
+import static io.netty.channel.Channels.fireChannelOpen;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientPipelineSink.java
index d77d0a9824..547914f37a 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientPipelineSink.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
-import org.jboss.netty.channel.*;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
+import io.netty.channel.*;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.DeadLockProofWorker;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -35,7 +35,7 @@ import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientSocketChannelFactory.java
index a10a5accf8..9b0b6c1e16 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpClientSocketChannelFactory.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.util.internal.ExecutorUtil;
 
 import java.util.concurrent.Executor;
 
 /**
- * A {@link org.jboss.netty.channel.socket.ClientSocketChannelFactory} which creates a client-side NIO-based
- * {@link org.jboss.netty.channel.socket.SocketChannel}.  It utilizes the non-blocking I/O mode which was
+ * A {@link io.netty.channel.socket.ClientSocketChannelFactory} which creates a client-side NIO-based
+ * {@link io.netty.channel.socket.SocketChannel}.  It utilizes the non-blocking I/O mode which was
  * introduced with NIO to serve many number of concurrent connections
  * efficiently.
  *
@@ -36,14 +36,14 @@ import java.util.concurrent.Executor;
  * 

  * One {@link SctpClientSocketChannelFactory} has one boss thread.  It makes
  * a connection attempt on request.  Once a connection attempt succeeds,
- * the boss thread passes the connected {@link org.jboss.netty.channel.Channel} to one of the worker
+ * the boss thread passes the connected {@link io.netty.channel.Channel} to one of the worker
  * threads that the {@link SctpClientSocketChannelFactory} manages.
  *
  * 
Worker threads

  * 

  * One {@link SctpClientSocketChannelFactory} can have one or more worker
  * threads.  A worker thread performs non-blocking read and write for one or
- * more {@link org.jboss.netty.channel.Channel}s in a non-blocking mode.
+ * more {@link io.netty.channel.Channel}s in a non-blocking mode.
  *
  * 
Life cycle of threads and graceful shutdown

  * 

@@ -62,7 +62,7 @@ import java.util.concurrent.Executor;
  *
  * 
    
  * 
  1. close all channels created by the factory usually using
- *     {@link org.jboss.netty.channel.group.ChannelGroup#close()}, and
    2. 
+ *     {@link io.netty.channel.group.ChannelGroup#close()}, and
  * 
  2. call {@link #releaseExternalResources()}.
    3. 
  * 

  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpNotificationEvent.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpNotificationEvent.java
index ed7de49e1b..9cfab11d54 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpNotificationEvent.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpNotificationEvent.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.Notification;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.Channels;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.Channels;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpNotificationHandler.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpNotificationHandler.java
index d01240c168..f13468315b 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpNotificationHandler.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpNotificationHandler.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.*;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.channel.Channels;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpPayload.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpPayload.java
index 6d375e2eb8..a81b276876 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpPayload.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpPayload.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpProviderMetadata.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpProviderMetadata.java
index 46d51faa20..5dbef5c3b8 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpProviderMetadata.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpProviderMetadata.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.SctpServerChannel;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.SystemPropertyUtil;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.SystemPropertyUtil;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -46,7 +46,7 @@ class SctpProviderMetadata {
         InternalLoggerFactory.getInstance(SctpProviderMetadata.class);
 
     private static final String CONSTRAINT_LEVEL_PROPERTY =
-        "org.jboss.netty.channel.socket.sctp.constraintLevel";
+        "io.netty.channel.socket.sctp.constraintLevel";
 
     /**
      * 0 - no need to wake up to get / set interestOps (most cases)
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpReceiveBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpReceiveBufferPool.java
index b873fe9bad..c31bf42f7e 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpReceiveBufferPool.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpReceiveBufferPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import java.lang.ref.SoftReference;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpSendBufferPool.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpSendBufferPool.java
index bdac36b6f6..f2f93862b4 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpSendBufferPool.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpSendBufferPool.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.MessageInfo;
 import com.sun.nio.sctp.SctpChannel;
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 import java.io.IOException;
 import java.lang.ref.SoftReference;
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannel.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannel.java
index 8cc560e293..a619653914 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannel.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
-import org.jboss.netty.channel.ServerChannel;
+import io.netty.channel.ServerChannel;
 
 import java.net.InetSocketAddress;
 import java.util.Set;
 
 /**
- * A SCTP {@link org.jboss.netty.channel.ServerChannel} which accepts incoming SCTP connections.
+ * A SCTP {@link io.netty.channel.ServerChannel} which accepts incoming SCTP connections.
  *
  * @author The Netty Project
  * @author Trustin Lee
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannelConfig.java
index f8c28a2dd0..3d8e626d74 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannelConfig.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
 
-import org.jboss.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelConfig;
 
 /**
- * A {@link org.jboss.netty.channel.ChannelConfig} for a {@link SctpServerChannelConfig}.
+ * A {@link io.netty.channel.ChannelConfig} for a {@link SctpServerChannelConfig}.
  * 

  * 
Available options

  * 

- * In addition to the options provided by {@link org.jboss.netty.channel.ChannelConfig},
+ * In addition to the options provided by {@link io.netty.channel.ChannelConfig},
  * {@link SctpServerChannelConfig} allows the following options in the
  * option map:
  * 

diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannelImpl.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannelImpl.java
index 453abc99ce..20e28ab91f 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannelImpl.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerChannelImpl.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
-import org.jboss.netty.channel.*;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.channel.*;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -30,7 +30,7 @@ import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static org.jboss.netty.channel.Channels.fireChannelOpen;
+import static io.netty.channel.Channels.fireChannelOpen;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerPipelineSink.java
index 3addb37cce..06276ffcfc 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerPipelineSink.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
-import org.jboss.netty.channel.*;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
+import io.netty.channel.*;
+import io.netty.channel.Channel;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.DeadLockProofWorker;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -29,7 +29,7 @@ import java.nio.channels.*;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 /**
  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerSocketChannelFactory.java
index b8a6c65bf1..0acbc84cde 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpServerSocketChannelFactory.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.ServerChannelFactory;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.ServerChannelFactory;
+import io.netty.util.internal.ExecutorUtil;
 
 import java.util.concurrent.Executor;
 
 /**
- * A {@link org.jboss.netty.channel.socket.ServerSocketChannelFactory} which creates a server-side NIO-based
- * {@link org.jboss.netty.channel.socket.ServerSocketChannel}.  It utilizes the non-blocking I/O mode which
+ * A {@link io.netty.channel.socket.ServerSocketChannelFactory} which creates a server-side NIO-based
+ * {@link io.netty.channel.socket.ServerSocketChannel}.  It utilizes the non-blocking I/O mode which
  * was introduced with NIO to serve many number of concurrent connections
  * efficiently.
  *
@@ -35,18 +35,18 @@ import java.util.concurrent.Executor;
  *
  * 
Boss threads

  * 

- * Each bound {@link org.jboss.netty.channel.socket.ServerSocketChannel} has its own boss thread.
+ * Each bound {@link io.netty.channel.socket.ServerSocketChannel} has its own boss thread.
  * For example, if you opened two server ports such as 80 and 443, you will
  * have two boss threads.  A boss thread accepts incoming connections until
  * the port is unbound.  Once a connection is accepted successfully, the boss
- * thread passes the accepted {@link org.jboss.netty.channel.Channel} to one of the worker
+ * thread passes the accepted {@link io.netty.channel.Channel} to one of the worker
  * threads that the {@link SctpServerSocketChannelFactory} manages.
  *
  * 
Worker threads

  * 

  * One {@link SctpServerSocketChannelFactory} can have one or more worker
  * threads.  A worker thread performs non-blocking read and write for one or
- * more {@link org.jboss.netty.channel.Channel}s in a non-blocking mode.
+ * more {@link io.netty.channel.Channel}s in a non-blocking mode.
  *
  * 
Life cycle of threads and graceful shutdown

  * 

@@ -66,7 +66,7 @@ import java.util.concurrent.Executor;
  * 
    
  * 
  1. unbind all channels created by the factory,
  * 
  2. close all child channels accepted by the unbound channels, and
- *     (these two steps so far is usually done using {@link org.jboss.netty.channel.group.ChannelGroup#close()})
    3. 
+ *     (these two steps so far is usually done using {@link io.netty.channel.group.ChannelGroup#close()})
  * 
  3. call {@link #releaseExternalResources()}.
    4. 
  * 

  *
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpWorker.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpWorker.java
index 0c8941136b..fab08c16ee 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SctpWorker.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SctpWorker.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
 import com.sun.nio.sctp.*;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.*;
-import org.jboss.netty.channel.socket.sctp.SctpSendBufferPool.SendBuffer;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.channel.Channel;
+import io.netty.channel.*;
+import io.netty.channel.socket.sctp.SctpSendBufferPool.SendBuffer;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.DeadLockProofWorker;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -39,7 +39,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/SelectorUtil.java b/src/main/java/org/jboss/netty/channel/socket/sctp/SelectorUtil.java
index 51020e6ad8..ca84eeba4f 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/SelectorUtil.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/SelectorUtil.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.nio.channels.CancelledKeyException;
diff --git a/src/main/java/org/jboss/netty/channel/socket/sctp/package-info.java b/src/main/java/org/jboss/netty/channel/socket/sctp/package-info.java
index 853bd6eee8..95e64a58eb 100644
--- a/src/main/java/org/jboss/netty/channel/socket/sctp/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/socket/sctp/package-info.java
@@ -18,4 +18,4 @@
  * NIO-based socket channel
  * API implementation - recommended for a large number of connections (>= 1000).
  */
-package org.jboss.netty.channel.socket.sctp;
+package io.netty.channel.socket.sctp;
diff --git a/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java b/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java
index 3e1c505c05..9200d12861 100644
--- a/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java
+++ b/src/main/java/org/jboss/netty/container/microcontainer/NettyLoggerConfigurator.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.container.microcontainer;
+package io.netty.container.microcontainer;
 
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.logging.JBossLoggerFactory;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.logging.JBossLoggerFactory;
 
 /**
  * A bean that configures the default {@link InternalLoggerFactory}.
diff --git a/src/main/java/org/jboss/netty/container/microcontainer/package-info.java b/src/main/java/org/jboss/netty/container/microcontainer/package-info.java
index 2955c35a4e..079cbffb12 100644
--- a/src/main/java/org/jboss/netty/container/microcontainer/package-info.java
+++ b/src/main/java/org/jboss/netty/container/microcontainer/package-info.java
@@ -19,4 +19,4 @@
  *
  * @apiviz.exclude
  */
-package org.jboss.netty.container.microcontainer;
+package io.netty.container.microcontainer;
diff --git a/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java b/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
index f05e5970c3..13055b9fee 100644
--- a/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
+++ b/src/main/java/org/jboss/netty/container/osgi/NettyBundleActivator.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.container.osgi;
+package io.netty.container.osgi;
 
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.logging.OsgiLoggerFactory;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.logging.OsgiLoggerFactory;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 
diff --git a/src/main/java/org/jboss/netty/container/osgi/package-info.java b/src/main/java/org/jboss/netty/container/osgi/package-info.java
index 6244586b99..851ddb9736 100644
--- a/src/main/java/org/jboss/netty/container/osgi/package-info.java
+++ b/src/main/java/org/jboss/netty/container/osgi/package-info.java
@@ -19,4 +19,4 @@
  *
  * @apiviz.exclude
  */
-package org.jboss.netty.container.osgi;
+package io.netty.container.osgi;
diff --git a/src/main/java/org/jboss/netty/container/spring/NettyLoggerConfigurator.java b/src/main/java/org/jboss/netty/container/spring/NettyLoggerConfigurator.java
index 7123089927..7f243a8744 100644
--- a/src/main/java/org/jboss/netty/container/spring/NettyLoggerConfigurator.java
+++ b/src/main/java/org/jboss/netty/container/spring/NettyLoggerConfigurator.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.container.spring;
+package io.netty.container.spring;
 
-import org.jboss.netty.logging.CommonsLoggerFactory;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.CommonsLoggerFactory;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * A bean that configures the default {@link InternalLoggerFactory}.
diff --git a/src/main/java/org/jboss/netty/container/spring/package-info.java b/src/main/java/org/jboss/netty/container/spring/package-info.java
index 1823162048..38f7e3d595 100644
--- a/src/main/java/org/jboss/netty/container/spring/package-info.java
+++ b/src/main/java/org/jboss/netty/container/spring/package-info.java
@@ -19,4 +19,4 @@
  *
  * @apiviz.exclude
  */
-package org.jboss.netty.container.spring;
+package io.netty.container.spring;
diff --git a/src/main/java/org/jboss/netty/example/discard/DiscardClient.java b/src/main/java/org/jboss/netty/example/discard/DiscardClient.java
index f221c2c875..a4abdb23a1 100644
--- a/src/main/java/org/jboss/netty/example/discard/DiscardClient.java
+++ b/src/main/java/org/jboss/netty/example/discard/DiscardClient.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.discard;
+package io.netty.example.discard;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 /**
  * Keeps sending random data to the specified address.
diff --git a/src/main/java/org/jboss/netty/example/discard/DiscardClientHandler.java b/src/main/java/org/jboss/netty/example/discard/DiscardClientHandler.java
index 5285df6d1b..c3ee734fe8 100644
--- a/src/main/java/org/jboss/netty/example/discard/DiscardClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/discard/DiscardClientHandler.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.discard;
+package io.netty.example.discard;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.WriteCompletionEvent;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.WriteCompletionEvent;
 
 /**
  * Handles a client-side channel.
diff --git a/src/main/java/org/jboss/netty/example/discard/DiscardServer.java b/src/main/java/org/jboss/netty/example/discard/DiscardServer.java
index e1783e372a..44a25e75bd 100644
--- a/src/main/java/org/jboss/netty/example/discard/DiscardServer.java
+++ b/src/main/java/org/jboss/netty/example/discard/DiscardServer.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.discard;
+package io.netty.example.discard;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * Discards any incoming data.
diff --git a/src/main/java/org/jboss/netty/example/discard/DiscardServerHandler.java b/src/main/java/org/jboss/netty/example/discard/DiscardServerHandler.java
index abf7b5b2f6..96c07f365f 100644
--- a/src/main/java/org/jboss/netty/example/discard/DiscardServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/discard/DiscardServerHandler.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.discard;
+package io.netty.example.discard;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * Handles a server-side channel.
diff --git a/src/main/java/org/jboss/netty/example/echo/EchoClient.java b/src/main/java/org/jboss/netty/example/echo/EchoClient.java
index 46ee47485e..f2608bd338 100644
--- a/src/main/java/org/jboss/netty/example/echo/EchoClient.java
+++ b/src/main/java/org/jboss/netty/example/echo/EchoClient.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.echo;
+package io.netty.example.echo;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 /**
  * Sends one message when a connection is open and echoes back any received
diff --git a/src/main/java/org/jboss/netty/example/echo/EchoClientHandler.java b/src/main/java/org/jboss/netty/example/echo/EchoClientHandler.java
index 3c3d5a0765..98ccc7ac84 100644
--- a/src/main/java/org/jboss/netty/example/echo/EchoClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/echo/EchoClientHandler.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.echo;
+package io.netty.example.echo;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * Handler implementation for the echo client.  It initiates the ping-pong
diff --git a/src/main/java/org/jboss/netty/example/echo/EchoServer.java b/src/main/java/org/jboss/netty/example/echo/EchoServer.java
index 65bf9064d8..8689cb83ed 100644
--- a/src/main/java/org/jboss/netty/example/echo/EchoServer.java
+++ b/src/main/java/org/jboss/netty/example/echo/EchoServer.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.echo;
+package io.netty.example.echo;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * Echoes back any received data from a client.
diff --git a/src/main/java/org/jboss/netty/example/echo/EchoServerHandler.java b/src/main/java/org/jboss/netty/example/echo/EchoServerHandler.java
index f2e6018494..92e71394b8 100644
--- a/src/main/java/org/jboss/netty/example/echo/EchoServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/echo/EchoServerHandler.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.echo;
+package io.netty.example.echo;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * Handler implementation for the echo server.
diff --git a/src/main/java/org/jboss/netty/example/factorial/BigIntegerDecoder.java b/src/main/java/org/jboss/netty/example/factorial/BigIntegerDecoder.java
index 0660f1a5b7..ebd1b7961b 100644
--- a/src/main/java/org/jboss/netty/example/factorial/BigIntegerDecoder.java
+++ b/src/main/java/org/jboss/netty/example/factorial/BigIntegerDecoder.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.factorial;
+package io.netty.example.factorial;
 
 import java.math.BigInteger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.CorruptedFrameException;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.frame.CorruptedFrameException;
+import io.netty.handler.codec.frame.FrameDecoder;
 
 /**
  * Decodes the binary representation of a {@link BigInteger} prepended
diff --git a/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java b/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java
index 05c8d4f413..c1ec7c400b 100644
--- a/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.factorial;
+package io.netty.example.factorial;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 /**
  * Sends a sequence of integers to a {@link FactorialServer} to calculate
diff --git a/src/main/java/org/jboss/netty/example/factorial/FactorialClientHandler.java b/src/main/java/org/jboss/netty/example/factorial/FactorialClientHandler.java
index 417be9803c..beb0b03588 100644
--- a/src/main/java/org/jboss/netty/example/factorial/FactorialClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialClientHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.factorial;
+package io.netty.example.factorial;
 
 import java.math.BigInteger;
 import java.util.concurrent.BlockingQueue;
@@ -21,15 +21,15 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * Handler for a client-side channel.  This handler maintains stateful
diff --git a/src/main/java/org/jboss/netty/example/factorial/FactorialClientPipelineFactory.java b/src/main/java/org/jboss/netty/example/factorial/FactorialClientPipelineFactory.java
index 735e7a03c6..46c72015dc 100644
--- a/src/main/java/org/jboss/netty/example/factorial/FactorialClientPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialClientPipelineFactory.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.factorial;
+package io.netty.example.factorial;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.compression.ZlibDecoder;
-import org.jboss.netty.handler.codec.compression.ZlibEncoder;
-import org.jboss.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.compression.ZlibDecoder;
+import io.netty.handler.codec.compression.ZlibEncoder;
+import io.netty.handler.codec.compression.ZlibWrapper;
 
 /**
  * Creates a newly configured {@link ChannelPipeline} for a client-side channel.
diff --git a/src/main/java/org/jboss/netty/example/factorial/FactorialServer.java b/src/main/java/org/jboss/netty/example/factorial/FactorialServer.java
index 66817a6780..ffaa1ac4e5 100644
--- a/src/main/java/org/jboss/netty/example/factorial/FactorialServer.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialServer.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.factorial;
+package io.netty.example.factorial;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * Receives a sequence of integers from a {@link FactorialClient} to calculate
diff --git a/src/main/java/org/jboss/netty/example/factorial/FactorialServerHandler.java b/src/main/java/org/jboss/netty/example/factorial/FactorialServerHandler.java
index aeec139c13..11612b7904 100644
--- a/src/main/java/org/jboss/netty/example/factorial/FactorialServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialServerHandler.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.factorial;
+package io.netty.example.factorial;
 
 import java.math.BigInteger;
 import java.util.Formatter;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * Handler for a server-side channel.  This handler maintains stateful
diff --git a/src/main/java/org/jboss/netty/example/factorial/FactorialServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/factorial/FactorialServerPipelineFactory.java
index 4eba5a537b..f044f2b798 100644
--- a/src/main/java/org/jboss/netty/example/factorial/FactorialServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialServerPipelineFactory.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.factorial;
+package io.netty.example.factorial;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.compression.ZlibDecoder;
-import org.jboss.netty.handler.codec.compression.ZlibEncoder;
-import org.jboss.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.compression.ZlibDecoder;
+import io.netty.handler.codec.compression.ZlibEncoder;
+import io.netty.handler.codec.compression.ZlibWrapper;
 
 /**
  * Creates a newly configured {@link ChannelPipeline} for a server-side channel.
diff --git a/src/main/java/org/jboss/netty/example/factorial/NumberEncoder.java b/src/main/java/org/jboss/netty/example/factorial/NumberEncoder.java
index ce02300069..810e603f97 100644
--- a/src/main/java/org/jboss/netty/example/factorial/NumberEncoder.java
+++ b/src/main/java/org/jboss/netty/example/factorial/NumberEncoder.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.factorial;
+package io.netty.example.factorial;
 
 import java.math.BigInteger;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 /**
  * Encodes a {@link Number} into the binary representation prepended with
diff --git a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServer.java b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServer.java
index 2a9e15702f..bff3e0cbde 100644
--- a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServer.java
+++ b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServer.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.file;
+package io.netty.example.http.file;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java
index f3cf358bcd..d11835e1ff 100644
--- a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerHandler.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.file;
+package io.netty.example.http.file;
 
-import static org.jboss.netty.handler.codec.http.HttpHeaders.*;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
-import static org.jboss.netty.handler.codec.http.HttpMethod.*;
-import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*;
-import static org.jboss.netty.handler.codec.http.HttpVersion.*;
+import static io.netty.handler.codec.http.HttpHeaders.*;
+import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpMethod.*;
+import static io.netty.handler.codec.http.HttpResponseStatus.*;
+import static io.netty.handler.codec.http.HttpVersion.*;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -35,26 +35,26 @@ import java.util.TimeZone;
 
 import javax.activation.MimetypesFileTypeMap;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelFutureProgressListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.DefaultFileRegion;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.FileRegion;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.ssl.SslHandler;
-import org.jboss.netty.handler.stream.ChunkedFile;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelFutureProgressListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.DefaultFileRegion;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.FileRegion;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.handler.stream.ChunkedFile;
+import io.netty.util.CharsetUtil;
 
 /**
  * A simple handler that serves incoming HTTP requests to send their respective
diff --git a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerPipelineFactory.java
index bedaf32ad7..c6b4ff9f87 100644
--- a/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/file/HttpStaticFileServerPipelineFactory.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.file;
+package io.netty.example.http.file;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
-import org.jboss.netty.handler.stream.ChunkedWriteHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.http.HttpChunkAggregator;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.stream.ChunkedWriteHandler;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpClient.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpClient.java
index 16949489de..00e1fe1ded 100644
--- a/src/main/java/org/jboss/netty/example/http/snoop/HttpClient.java
+++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpClient.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.snoop;
+package io.netty.example.http.snoop;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.handler.codec.http.CookieEncoder;
-import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpMethod;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpVersion;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.handler.codec.http.CookieEncoder;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpVersion;
 
 /**
  * A simple HTTP client that prints out the content of the HTTP response to
diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java
index d5af1bcee7..fff7038fba 100644
--- a/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpClientPipelineFactory.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.snoop;
+package io.netty.example.http.snoop;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import javax.net.ssl.SSLEngine;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.example.securechat.SecureChatSslContextFactory;
-import org.jboss.netty.handler.codec.http.HttpClientCodec;
-import org.jboss.netty.handler.codec.http.HttpContentDecompressor;
-import org.jboss.netty.handler.logging.LoggingHandler;
-import org.jboss.netty.handler.ssl.SslHandler;
-import org.jboss.netty.logging.InternalLogLevel;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.example.securechat.SecureChatSslContextFactory;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpContentDecompressor;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.logging.InternalLogLevel;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpRequestHandler.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpRequestHandler.java
index ad677e7f87..73eb1eb199 100644
--- a/src/main/java/org/jboss/netty/example/http/snoop/HttpRequestHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpRequestHandler.java
@@ -13,36 +13,36 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.snoop;
+package io.netty.example.http.snoop;
 
-import static org.jboss.netty.handler.codec.http.HttpHeaders.*;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
-import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*;
-import static org.jboss.netty.handler.codec.http.HttpVersion.*;
+import static io.netty.handler.codec.http.HttpHeaders.*;
+import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpResponseStatus.*;
+import static io.netty.handler.codec.http.HttpVersion.*;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.Cookie;
-import org.jboss.netty.handler.codec.http.CookieDecoder;
-import org.jboss.netty.handler.codec.http.CookieEncoder;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpChunk;
-import org.jboss.netty.handler.codec.http.HttpChunkTrailer;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.QueryStringDecoder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.Cookie;
+import io.netty.handler.codec.http.CookieDecoder;
+import io.netty.handler.codec.http.CookieEncoder;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpChunk;
+import io.netty.handler.codec.http.HttpChunkTrailer;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.QueryStringDecoder;
+import io.netty.util.CharsetUtil;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpResponseHandler.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpResponseHandler.java
index 14ea9e3a23..bb14207442 100644
--- a/src/main/java/org/jboss/netty/example/http/snoop/HttpResponseHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpResponseHandler.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.snoop;
+package io.netty.example.http.snoop;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.HttpChunk;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.HttpChunk;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.util.CharsetUtil;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpServer.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpServer.java
index 24c819e064..81362f1102 100644
--- a/src/main/java/org/jboss/netty/example/http/snoop/HttpServer.java
+++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpServer.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.snoop;
+package io.netty.example.http.snoop;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * An HTTP server that sends back the content of the received HTTP request
diff --git a/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java
index 3415979f82..f61655930b 100644
--- a/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/snoop/HttpServerPipelineFactory.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.snoop;
+package io.netty.example.http.snoop;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.http.HttpContentCompressor;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
-import org.jboss.netty.handler.logging.LoggingHandler;
-import org.jboss.netty.logging.InternalLogLevel;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.http.HttpContentCompressor;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.logging.InternalLogLevel;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/upload/HttpClient.java b/src/main/java/org/jboss/netty/example/http/upload/HttpClient.java
index 290e2679fb..296432e45b 100644
--- a/src/main/java/org/jboss/netty/example/http/upload/HttpClient.java
+++ b/src/main/java/org/jboss/netty/example/http/upload/HttpClient.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.upload;
+package io.netty.example.http.upload;
 
 import java.io.File;
 import java.net.InetSocketAddress;
@@ -23,24 +23,24 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.handler.codec.http.QueryStringEncoder;
-import org.jboss.netty.handler.codec.http.CookieEncoder;
-import org.jboss.netty.handler.codec.http.DefaultHttpDataFactory;
-import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
-import org.jboss.netty.handler.codec.http.DiskAttribute;
-import org.jboss.netty.handler.codec.http.DiskFileUpload;
-import org.jboss.netty.handler.codec.http.InterfaceHttpData;
-import org.jboss.netty.handler.codec.http.HttpPostRequestEncoder;
-import org.jboss.netty.handler.codec.http.HttpDataFactory;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpMethod;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpVersion;
-import org.jboss.netty.handler.codec.http.HttpPostRequestEncoder.ErrorDataEncoderException;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.handler.codec.http.QueryStringEncoder;
+import io.netty.handler.codec.http.CookieEncoder;
+import io.netty.handler.codec.http.DefaultHttpDataFactory;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.DiskAttribute;
+import io.netty.handler.codec.http.DiskFileUpload;
+import io.netty.handler.codec.http.InterfaceHttpData;
+import io.netty.handler.codec.http.HttpPostRequestEncoder;
+import io.netty.handler.codec.http.HttpDataFactory;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.HttpPostRequestEncoder.ErrorDataEncoderException;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/upload/HttpClientPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/upload/HttpClientPipelineFactory.java
index 2116053d6b..c4a1cc002f 100644
--- a/src/main/java/org/jboss/netty/example/http/upload/HttpClientPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/upload/HttpClientPipelineFactory.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.upload;
+package io.netty.example.http.upload;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import javax.net.ssl.SSLEngine;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.example.securechat.SecureChatSslContextFactory;
-import org.jboss.netty.handler.codec.http.HttpClientCodec;
-import org.jboss.netty.handler.codec.http.HttpContentDecompressor;
-import org.jboss.netty.handler.ssl.SslHandler;
-import org.jboss.netty.handler.stream.ChunkedWriteHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.example.securechat.SecureChatSslContextFactory;
+import io.netty.handler.codec.http.HttpClientCodec;
+import io.netty.handler.codec.http.HttpContentDecompressor;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.handler.stream.ChunkedWriteHandler;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/upload/HttpRequestHandler.java b/src/main/java/org/jboss/netty/example/http/upload/HttpRequestHandler.java
index 468087cf2a..ced0d2d113 100644
--- a/src/main/java/org/jboss/netty/example/http/upload/HttpRequestHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/upload/HttpRequestHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package org.jboss.netty.example.http.upload;
+package io.netty.example.http.upload;
 
 import java.io.IOException;
 import java.net.URI;
@@ -23,42 +23,42 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.Attribute;
-import org.jboss.netty.handler.codec.http.Cookie;
-import org.jboss.netty.handler.codec.http.CookieDecoder;
-import org.jboss.netty.handler.codec.http.CookieEncoder;
-import org.jboss.netty.handler.codec.http.DefaultHttpDataFactory;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.DiskAttribute;
-import org.jboss.netty.handler.codec.http.DiskFileUpload;
-import org.jboss.netty.handler.codec.http.FileUpload;
-import org.jboss.netty.handler.codec.http.HttpChunk;
-import org.jboss.netty.handler.codec.http.HttpDataFactory;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpPostRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpPostRequestDecoder.EndOfDataDecoderException;
-import org.jboss.netty.handler.codec.http.HttpPostRequestDecoder.ErrorDataDecoderException;
-import org.jboss.netty.handler.codec.http.HttpPostRequestDecoder.IncompatibleDataDecoderException;
-import org.jboss.netty.handler.codec.http.HttpPostRequestDecoder.NotEnoughDataDecoderException;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpVersion;
-import org.jboss.netty.handler.codec.http.InterfaceHttpData;
-import org.jboss.netty.handler.codec.http.InterfaceHttpData.HttpDataType;
-import org.jboss.netty.handler.codec.http.QueryStringDecoder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.Attribute;
+import io.netty.handler.codec.http.Cookie;
+import io.netty.handler.codec.http.CookieDecoder;
+import io.netty.handler.codec.http.CookieEncoder;
+import io.netty.handler.codec.http.DefaultHttpDataFactory;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.DiskAttribute;
+import io.netty.handler.codec.http.DiskFileUpload;
+import io.netty.handler.codec.http.FileUpload;
+import io.netty.handler.codec.http.HttpChunk;
+import io.netty.handler.codec.http.HttpDataFactory;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpPostRequestDecoder;
+import io.netty.handler.codec.http.HttpPostRequestDecoder.EndOfDataDecoderException;
+import io.netty.handler.codec.http.HttpPostRequestDecoder.ErrorDataDecoderException;
+import io.netty.handler.codec.http.HttpPostRequestDecoder.IncompatibleDataDecoderException;
+import io.netty.handler.codec.http.HttpPostRequestDecoder.NotEnoughDataDecoderException;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.InterfaceHttpData;
+import io.netty.handler.codec.http.InterfaceHttpData.HttpDataType;
+import io.netty.handler.codec.http.QueryStringDecoder;
+import io.netty.util.CharsetUtil;
 
 /**
  * @author The Netty Project
@@ -92,9 +92,9 @@ public class HttpRequestHandler extends SimpleChannelUpstreamHandler {
      * (non-Javadoc)
      *
      * @see
-     * org.jboss.netty.channel.SimpleChannelUpstreamHandler#channelClosed(org
+     * io.netty.channel.SimpleChannelUpstreamHandler#channelClosed(org
      * .jboss.netty.channel.ChannelHandlerContext,
-     * org.jboss.netty.channel.ChannelStateEvent)
+     * io.netty.channel.ChannelStateEvent)
      */
     @Override
     public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e)
diff --git a/src/main/java/org/jboss/netty/example/http/upload/HttpResponseHandler.java b/src/main/java/org/jboss/netty/example/http/upload/HttpResponseHandler.java
index 23fed8779a..77513abb49 100644
--- a/src/main/java/org/jboss/netty/example/http/upload/HttpResponseHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/upload/HttpResponseHandler.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.upload;
+package io.netty.example.http.upload;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.HttpChunk;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.HttpChunk;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.util.CharsetUtil;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/upload/HttpServer.java b/src/main/java/org/jboss/netty/example/http/upload/HttpServer.java
index 9c575abd76..6270d18e91 100644
--- a/src/main/java/org/jboss/netty/example/http/upload/HttpServer.java
+++ b/src/main/java/org/jboss/netty/example/http/upload/HttpServer.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.upload;
+package io.netty.example.http.upload;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/upload/HttpServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/upload/HttpServerPipelineFactory.java
index be210f3175..2d2d5b1ab1 100644
--- a/src/main/java/org/jboss/netty/example/http/upload/HttpServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/upload/HttpServerPipelineFactory.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.upload;
+package io.netty.example.http.upload;
 
-import static org.jboss.netty.channel.Channels.pipeline;
+import static io.netty.channel.Channels.pipeline;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.http.HttpContentCompressor;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.http.HttpContentCompressor;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServer.java b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServer.java
index 4d65a4f964..606f073cda 100644
--- a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServer.java
+++ b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServer.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocket;
+package io.netty.example.http.websocket;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * An HTTP server which serves Web Socket requests at:
diff --git a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerHandler.java b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerHandler.java
index 714a1aa6b1..a3ce6ccc22 100644
--- a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerHandler.java
@@ -13,38 +13,38 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocket;
+package io.netty.example.http.websocket;
 
-import static org.jboss.netty.handler.codec.http.HttpHeaders.*;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.*;
-import static org.jboss.netty.handler.codec.http.HttpMethod.*;
-import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*;
-import static org.jboss.netty.handler.codec.http.HttpVersion.*;
+import static io.netty.handler.codec.http.HttpHeaders.*;
+import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpHeaders.Values.*;
+import static io.netty.handler.codec.http.HttpMethod.*;
+import static io.netty.handler.codec.http.HttpResponseStatus.*;
+import static io.netty.handler.codec.http.HttpVersion.*;
 
 import java.security.MessageDigest;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
-import org.jboss.netty.handler.codec.http.websocket.DefaultWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocket.WebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocket.WebSocketFrameDecoder;
-import org.jboss.netty.handler.codec.http.websocket.WebSocketFrameEncoder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaders.Values;
+import io.netty.handler.codec.http.websocket.DefaultWebSocketFrame;
+import io.netty.handler.codec.http.websocket.WebSocketFrame;
+import io.netty.handler.codec.http.websocket.WebSocketFrameDecoder;
+import io.netty.handler.codec.http.websocket.WebSocketFrameEncoder;
+import io.netty.util.CharsetUtil;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerIndexPage.java b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerIndexPage.java
index ba37c4e506..e3f8fc3cd3 100644
--- a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerIndexPage.java
+++ b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerIndexPage.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocket;
+package io.netty.example.http.websocket;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.util.CharsetUtil;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerPipelineFactory.java
index b180008aae..6a6efa308e 100644
--- a/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/websocket/WebSocketServerPipelineFactory.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocket;
+package io.netty.example.http.websocket;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.http.HttpChunkAggregator;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServer.java b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServer.java
index 30610be285..d4df12c1a8 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServer.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.autobahn;
+package io.netty.example.http.websocketx.autobahn;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
@@ -21,8 +21,8 @@ import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * A Web Socket echo server for running the autobahn
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java
index b51517760f..607a1e5524 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java
@@ -13,36 +13,36 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.autobahn;
+package io.netty.example.http.websocketx.autobahn;
 
-import static org.jboss.netty.handler.codec.http.HttpHeaders.*;
-import static org.jboss.netty.handler.codec.http.HttpMethod.*;
-import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*;
-import static org.jboss.netty.handler.codec.http.HttpVersion.*;
+import static io.netty.handler.codec.http.HttpHeaders.*;
+import static io.netty.handler.codec.http.HttpMethod.*;
+import static io.netty.handler.codec.http.HttpResponseStatus.*;
+import static io.netty.handler.codec.http.HttpVersion.*;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PingWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PongWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.ContinuationWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
+import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.CharsetUtil;
 
 /**
  * Handles handshakes and messages
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java
index e1bdd1c959..0e5431eba6 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.autobahn;
+package io.netty.example.http.websocketx.autobahn;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.http.HttpChunkAggregator;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/package-info.java b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/package-info.java
index 3d010b0da2..a1e262fa4d 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/package-info.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/autobahn/package-info.java
@@ -53,5 +53,5 @@
  *   
  * 
11. See the results in reports/servers/index.html
  */
-package org.jboss.netty.example.http.websocketx.autobahn;
+package io.netty.example.http.websocketx.autobahn;
 
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/App.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/App.java
index ba8ea8681a..9b2c802007 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/App.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/App.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.example.http.websocketx.client;
+package io.netty.example.http.websocketx.client;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -22,13 +22,13 @@ import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PingWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PongWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketSpecificationVersion;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketSpecificationVersion;
 
 /**
  * A HTTP client demo app
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketCallback.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketCallback.java
index 26c1d2edd2..ddd4b98c39 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketCallback.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketCallback.java
@@ -20,9 +20,9 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //THE SOFTWARE.
 
-package org.jboss.netty.example.http.websocketx.client;
+package io.netty.example.http.websocketx.client;
 
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClient.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClient.java
index a992cdc646..fc336fabd6 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClient.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClient.java
@@ -19,10 +19,10 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //THE SOFTWARE.
-package org.jboss.netty.example.http.websocketx.client;
+package io.netty.example.http.websocketx.client;
 
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.channel.ChannelFuture;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
 
 /**
  * Copied from https://github.com/cgbystrom/netty-tools
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientFactory.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientFactory.java
index 253d7dbe2f..29a0aef08a 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientFactory.java
@@ -20,15 +20,15 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //THE SOFTWARE.
 
-package org.jboss.netty.example.http.websocketx.client;
+package io.netty.example.http.websocketx.client;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.handler.codec.http.HttpRequestEncoder;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketSpecificationVersion;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.handler.codec.http.HttpRequestEncoder;
+import io.netty.handler.codec.http.websocketx.WebSocketSpecificationVersion;
 
 import java.net.URI;
 import java.util.concurrent.Executors;
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientHandler.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientHandler.java
index 58725d3ece..6ace8e49e7 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketClientHandler.java
@@ -20,25 +20,25 @@
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //THE SOFTWARE.
 
-package org.jboss.netty.example.http.websocketx.client;
+package io.netty.example.http.websocketx.client;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketClientHandshaker;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketSpecificationVersion;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker;
+import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketSpecificationVersion;
+import io.netty.util.CharsetUtil;
 
 /**
  * Copied from https://github.com/cgbystrom/netty-tools
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketException.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketException.java
index aa0c439ec0..a0e376fd2a 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketException.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketException.java
@@ -19,7 +19,7 @@
 //LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 //THE SOFTWARE.
-package org.jboss.netty.example.http.websocketx.client;
+package io.netty.example.http.websocketx.client;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java
index ec9bb20fb8..a506891334 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.client;
+package io.netty.example.http.websocketx.client;
 
-import org.jboss.netty.handler.codec.http.HttpMessage;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseDecoder;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseDecoder;
 
 /**
  * Fix bug in standard HttpResponseDecoder for web socket clients. When status 101 is received for Hybi00, there are 16
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/client/package-info.java b/src/main/java/org/jboss/netty/example/http/websocketx/client/package-info.java
index 05da751a10..d49212803b 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/client/package-info.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/client/package-info.java
@@ -17,8 +17,8 @@
 /**
  * 
This is an example web service client.
  * 
To run this example, you must first start 
- * org.jboss.netty.example.http.websocketx.server.WebSocketServer
- * 
Next, run org.jboss.netty.example.http.websocketx.client.App. 
+ * io.netty.example.http.websocketx.server.WebSocketServer
+ * 
Next, run io.netty.example.http.websocketx.client.App. 
  */
-package org.jboss.netty.example.http.websocketx.client;
+package io.netty.example.http.websocketx.client;
 
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServer.java b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServer.java
index c32c710e04..a2821e77e3 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServer.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.server;
+package io.netty.example.http.websocketx.server;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
@@ -21,8 +21,8 @@ import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * A HTTP server which serves Web Socket requests at:
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java
index 98aff22afb..daf334f3fe 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerHandler.java
@@ -13,36 +13,36 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.server;
+package io.netty.example.http.websocketx.server;
 
-import static org.jboss.netty.handler.codec.http.HttpHeaders.*;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
-import static org.jboss.netty.handler.codec.http.HttpMethod.*;
-import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*;
-import static org.jboss.netty.handler.codec.http.HttpVersion.*;
+import static io.netty.handler.codec.http.HttpHeaders.*;
+import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpMethod.*;
+import static io.netty.handler.codec.http.HttpResponseStatus.*;
+import static io.netty.handler.codec.http.HttpVersion.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PingWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PongWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
+import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.CharsetUtil;
 
 /**
  * Handles handshakes and messages
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerIndexPage.java b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerIndexPage.java
index 2b0db7b3c3..e9ac239162 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerIndexPage.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerIndexPage.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.server;
+package io.netty.example.http.websocketx.server;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.util.CharsetUtil;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java
index ae9d62af6b..91b3a8a9fa 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.server;
+package io.netty.example.http.websocketx.server;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.http.HttpChunkAggregator;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/server/package-info.java b/src/main/java/org/jboss/netty/example/http/websocketx/server/package-info.java
index ade9c22eb1..8d9ab6f096 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/server/package-info.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/server/package-info.java
@@ -23,5 +23,5 @@
  * 
You can also test it with a web socket client. Send web socket traffic to 
  * ws://localhost:8080/websocket. 
  */
-package org.jboss.netty.example.http.websocketx.server;
+package io.netty.example.http.websocketx.server;
 
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServer.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServer.java
index a6642c4754..517bb083fd 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServer.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.sslserver;
+package io.netty.example.http.websocketx.sslserver;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
@@ -21,8 +21,8 @@ import java.util.logging.ConsoleHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * A HTTP server which serves Web Socket requests at:
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java
index ac17f32a0e..4e58a4ca8a 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java
@@ -13,36 +13,36 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.sslserver;
+package io.netty.example.http.websocketx.sslserver;
 
-import static org.jboss.netty.handler.codec.http.HttpHeaders.*;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.*;
-import static org.jboss.netty.handler.codec.http.HttpMethod.*;
-import static org.jboss.netty.handler.codec.http.HttpResponseStatus.*;
-import static org.jboss.netty.handler.codec.http.HttpVersion.*;
+import static io.netty.handler.codec.http.HttpHeaders.*;
+import static io.netty.handler.codec.http.HttpHeaders.Names.*;
+import static io.netty.handler.codec.http.HttpMethod.*;
+import static io.netty.handler.codec.http.HttpResponseStatus.*;
+import static io.netty.handler.codec.http.HttpVersion.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PingWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.PongWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketFrame;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
-import org.jboss.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PingWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketFrame;
+import io.netty.handler.codec.http.websocketx.WebSocketServerHandshaker;
+import io.netty.handler.codec.http.websocketx.WebSocketServerHandshakerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.CharsetUtil;
 
 /**
  * Handles handshakes and messages
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java
index bfc4099099..5904efe682 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.sslserver;
+package io.netty.example.http.websocketx.sslserver;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.util.CharsetUtil;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java
index 00f89ad0ab..2846f8d3b0 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.sslserver;
+package io.netty.example.http.websocketx.sslserver;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import javax.net.ssl.SSLEngine;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
-import org.jboss.netty.handler.ssl.SslHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.http.HttpChunkAggregator;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.ssl.SslHandler;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
index e7f8588ce8..7b1275f716 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.http.websocketx.sslserver;
+package io.netty.example.http.websocketx.sslserver;
 
 import java.io.FileInputStream;
 import java.security.KeyStore;
@@ -22,8 +22,8 @@ import java.security.Security;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * Creates a {@link SSLContext} for just server certificates.
diff --git a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/package-info.java b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/package-info.java
index 3e91cb30a8..477cdd67ae 100644
--- a/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/package-info.java
+++ b/src/main/java/org/jboss/netty/example/http/websocketx/sslserver/package-info.java
@@ -35,5 +35,5 @@
  * 
To find out more about setting up key stores, refer to this
  * giude.
  */
-package org.jboss.netty.example.http.websocketx.sslserver;
+package io.netty.example.http.websocketx.sslserver;
 
diff --git a/src/main/java/org/jboss/netty/example/iostream/IOStream.java b/src/main/java/org/jboss/netty/example/iostream/IOStream.java
index 66690c0e6b..738a69b01e 100755
--- a/src/main/java/org/jboss/netty/example/iostream/IOStream.java
+++ b/src/main/java/org/jboss/netty/example/iostream/IOStream.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.iostream;
+package io.netty.example.iostream;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.*;
-import org.jboss.netty.channel.iostream.IOStreamAddress;
-import org.jboss.netty.channel.iostream.IOStreamChannelFactory;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.*;
+import io.netty.channel.iostream.IOStreamAddress;
+import io.netty.channel.iostream.IOStreamChannelFactory;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
- * An example demonstrating the use of the {@link org.jboss.netty.channel.iostream.IOStreamChannel}.
+ * An example demonstrating the use of the {@link io.netty.channel.iostream.IOStreamChannel}.
  *
  * @author Daniel Bimschas
  * @author Dennis Pfisterer
diff --git a/src/main/java/org/jboss/netty/example/local/LocalExample.java b/src/main/java/org/jboss/netty/example/local/LocalExample.java
index 5044064f17..a289cc7933 100644
--- a/src/main/java/org/jboss/netty/example/local/LocalExample.java
+++ b/src/main/java/org/jboss/netty/example/local/LocalExample.java
@@ -13,25 +13,25 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.local;
+package io.netty.example.local;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.local.DefaultLocalClientChannelFactory;
-import org.jboss.netty.channel.local.DefaultLocalServerChannelFactory;
-import org.jboss.netty.channel.local.LocalAddress;
-import org.jboss.netty.example.echo.EchoServerHandler;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.jboss.netty.handler.logging.LoggingHandler;
-import org.jboss.netty.logging.InternalLogLevel;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.local.DefaultLocalClientChannelFactory;
+import io.netty.channel.local.DefaultLocalServerChannelFactory;
+import io.netty.channel.local.LocalAddress;
+import io.netty.example.echo.EchoServerHandler;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.logging.InternalLogLevel;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java b/src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java
index 27669d9376..71c8f47ad3 100644
--- a/src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java
+++ b/src/main/java/org/jboss/netty/example/local/LocalExampleMultthreaded.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.local;
+package io.netty.example.local;
 
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.local.DefaultLocalClientChannelFactory;
-import org.jboss.netty.channel.local.DefaultLocalServerChannelFactory;
-import org.jboss.netty.channel.local.LocalAddress;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
-import org.jboss.netty.handler.logging.LoggingHandler;
-import org.jboss.netty.logging.InternalLogLevel;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.local.DefaultLocalClientChannelFactory;
+import io.netty.channel.local.DefaultLocalServerChannelFactory;
+import io.netty.channel.local.LocalAddress;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+import io.netty.handler.logging.LoggingHandler;
+import io.netty.logging.InternalLogLevel;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java
index 80e65dc76f..fdd0e9fa57 100644
--- a/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/local/LocalServerPipelineFactory.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.local;
+package io.netty.example.local;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.jboss.netty.handler.execution.ExecutionHandler;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.handler.execution.ExecutionHandler;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClient.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClient.java
index f9f20e6baf..90200363e5 100644
--- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClient.java
+++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClient.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.localtime;
+package io.netty.example.localtime;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -22,10 +22,10 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 /**
  * Sends a list of continent/city pairs to a {@link LocalTimeServer} to
diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientHandler.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientHandler.java
index 7cbf79b566..be88ea3b25 100644
--- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.localtime;
+package io.netty.example.localtime;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,18 +24,18 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.Continent;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.Location;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.Locations;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.example.localtime.LocalTimeProtocol.Continent;
+import io.netty.example.localtime.LocalTimeProtocol.LocalTime;
+import io.netty.example.localtime.LocalTimeProtocol.LocalTimes;
+import io.netty.example.localtime.LocalTimeProtocol.Location;
+import io.netty.example.localtime.LocalTimeProtocol.Locations;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientPipelineFactory.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientPipelineFactory.java
index 11caacc5f9..9e64319241 100644
--- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeClientPipelineFactory.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.localtime;
+package io.netty.example.localtime;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.protobuf.ProtobufDecoder;
-import org.jboss.netty.handler.codec.protobuf.ProtobufEncoder;
-import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
-import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.protobuf.ProtobufDecoder;
+import io.netty.handler.codec.protobuf.ProtobufEncoder;
+import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
+import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.java
index 2d894fe7e2..d49c11c3a8 100644
--- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.java
+++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.proto
+// source: src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto
 
-package org.jboss.netty.example.localtime;
+package io.netty.example.localtime;
 
 @SuppressWarnings("all")
 public final class LocalTimeProtocol {
@@ -78,7 +78,7 @@ public final class LocalTimeProtocol {
     }
     public static final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.getDescriptor().getEnumTypes().get(0);
+      return io.netty.example.localtime.LocalTimeProtocol.getDescriptor().getEnumTypes().get(0);
     }
     
     private static final Continent[] VALUES = {
@@ -102,7 +102,7 @@ public final class LocalTimeProtocol {
       this.value = value;
     }
     
-    // @@protoc_insertion_point(enum_scope:org.jboss.netty.example.localtime.Continent)
+    // @@protoc_insertion_point(enum_scope:io.netty.example.localtime.Continent)
   }
   
   public enum DayOfWeek
@@ -162,7 +162,7 @@ public final class LocalTimeProtocol {
     }
     public static final com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.getDescriptor().getEnumTypes().get(1);
+      return io.netty.example.localtime.LocalTimeProtocol.getDescriptor().getEnumTypes().get(1);
     }
     
     private static final DayOfWeek[] VALUES = {
@@ -186,15 +186,15 @@ public final class LocalTimeProtocol {
       this.value = value;
     }
     
-    // @@protoc_insertion_point(enum_scope:org.jboss.netty.example.localtime.DayOfWeek)
+    // @@protoc_insertion_point(enum_scope:io.netty.example.localtime.DayOfWeek)
   }
   
   public interface LocationOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // required .org.jboss.netty.example.localtime.Continent continent = 1;
+    // required .io.netty.example.localtime.Continent continent = 1;
     boolean hasContinent();
-    org.jboss.netty.example.localtime.LocalTimeProtocol.Continent getContinent();
+    io.netty.example.localtime.LocalTimeProtocol.Continent getContinent();
     
     // required string city = 2;
     boolean hasCity();
@@ -220,22 +220,22 @@ public final class LocalTimeProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Location_descriptor;
+      return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Location_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Location_fieldAccessorTable;
+      return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Location_fieldAccessorTable;
     }
     
     private int bitField0_;
-    // required .org.jboss.netty.example.localtime.Continent continent = 1;
+    // required .io.netty.example.localtime.Continent continent = 1;
     public static final int CONTINENT_FIELD_NUMBER = 1;
-    private org.jboss.netty.example.localtime.LocalTimeProtocol.Continent continent_;
+    private io.netty.example.localtime.LocalTimeProtocol.Continent continent_;
     public boolean hasContinent() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
-    public org.jboss.netty.example.localtime.LocalTimeProtocol.Continent getContinent() {
+    public io.netty.example.localtime.LocalTimeProtocol.Continent getContinent() {
       return continent_;
     }
     
@@ -272,7 +272,7 @@ public final class LocalTimeProtocol {
     }
     
     private void initFields() {
-      continent_ = org.jboss.netty.example.localtime.LocalTimeProtocol.Continent.AFRICA;
+      continent_ = io.netty.example.localtime.LocalTimeProtocol.Continent.AFRICA;
       city_ = "";
     }
     private byte memoizedIsInitialized = -1;
@@ -330,41 +330,41 @@ public final class LocalTimeProtocol {
       return super.writeReplace();
     }
     
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseFrom(byte[] data)
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseFrom(java.io.InputStream input)
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseDelimitedFrom(java.io.InputStream input)
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -373,7 +373,7 @@ public final class LocalTimeProtocol {
         return null;
       }
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseDelimitedFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -384,12 +384,12 @@ public final class LocalTimeProtocol {
         return null;
       }
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Location parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -399,7 +399,7 @@ public final class LocalTimeProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jboss.netty.example.localtime.LocalTimeProtocol.Location prototype) {
+    public static Builder newBuilder(io.netty.example.localtime.LocalTimeProtocol.Location prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -412,18 +412,18 @@ public final class LocalTimeProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
-       implements org.jboss.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder {
+       implements io.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Location_descriptor;
+        return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Location_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Location_fieldAccessorTable;
+        return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Location_fieldAccessorTable;
       }
       
-      // Construct using org.jboss.netty.example.localtime.LocalTimeProtocol.Location.newBuilder()
+      // Construct using io.netty.example.localtime.LocalTimeProtocol.Location.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -442,7 +442,7 @@ public final class LocalTimeProtocol {
       
       public Builder clear() {
         super.clear();
-        continent_ = org.jboss.netty.example.localtime.LocalTimeProtocol.Continent.AFRICA;
+        continent_ = io.netty.example.localtime.LocalTimeProtocol.Continent.AFRICA;
         bitField0_ = (bitField0_ & ~0x00000001);
         city_ = "";
         bitField0_ = (bitField0_ & ~0x00000002);
@@ -455,24 +455,24 @@ public final class LocalTimeProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.Location.getDescriptor();
+        return io.netty.example.localtime.LocalTimeProtocol.Location.getDescriptor();
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Location getDefaultInstanceForType() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.Location.getDefaultInstance();
+      public io.netty.example.localtime.LocalTimeProtocol.Location getDefaultInstanceForType() {
+        return io.netty.example.localtime.LocalTimeProtocol.Location.getDefaultInstance();
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Location build() {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.Location result = buildPartial();
+      public io.netty.example.localtime.LocalTimeProtocol.Location build() {
+        io.netty.example.localtime.LocalTimeProtocol.Location result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private org.jboss.netty.example.localtime.LocalTimeProtocol.Location buildParsed()
+      private io.netty.example.localtime.LocalTimeProtocol.Location buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.Location result = buildPartial();
+        io.netty.example.localtime.LocalTimeProtocol.Location result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -480,8 +480,8 @@ public final class LocalTimeProtocol {
         return result;
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Location buildPartial() {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.Location result = new org.jboss.netty.example.localtime.LocalTimeProtocol.Location(this);
+      public io.netty.example.localtime.LocalTimeProtocol.Location buildPartial() {
+        io.netty.example.localtime.LocalTimeProtocol.Location result = new io.netty.example.localtime.LocalTimeProtocol.Location(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -498,16 +498,16 @@ public final class LocalTimeProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jboss.netty.example.localtime.LocalTimeProtocol.Location) {
-          return mergeFrom((org.jboss.netty.example.localtime.LocalTimeProtocol.Location)other);
+        if (other instanceof io.netty.example.localtime.LocalTimeProtocol.Location) {
+          return mergeFrom((io.netty.example.localtime.LocalTimeProtocol.Location)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(org.jboss.netty.example.localtime.LocalTimeProtocol.Location other) {
-        if (other == org.jboss.netty.example.localtime.LocalTimeProtocol.Location.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.netty.example.localtime.LocalTimeProtocol.Location other) {
+        if (other == io.netty.example.localtime.LocalTimeProtocol.Location.getDefaultInstance()) return this;
         if (other.hasContinent()) {
           setContinent(other.getContinent());
         }
@@ -555,7 +555,7 @@ public final class LocalTimeProtocol {
             }
             case 8: {
               int rawValue = input.readEnum();
-              org.jboss.netty.example.localtime.LocalTimeProtocol.Continent value = org.jboss.netty.example.localtime.LocalTimeProtocol.Continent.valueOf(rawValue);
+              io.netty.example.localtime.LocalTimeProtocol.Continent value = io.netty.example.localtime.LocalTimeProtocol.Continent.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(1, rawValue);
               } else {
@@ -575,15 +575,15 @@ public final class LocalTimeProtocol {
       
       private int bitField0_;
       
-      // required .org.jboss.netty.example.localtime.Continent continent = 1;
-      private org.jboss.netty.example.localtime.LocalTimeProtocol.Continent continent_ = org.jboss.netty.example.localtime.LocalTimeProtocol.Continent.AFRICA;
+      // required .io.netty.example.localtime.Continent continent = 1;
+      private io.netty.example.localtime.LocalTimeProtocol.Continent continent_ = io.netty.example.localtime.LocalTimeProtocol.Continent.AFRICA;
       public boolean hasContinent() {
         return ((bitField0_ & 0x00000001) == 0x00000001);
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Continent getContinent() {
+      public io.netty.example.localtime.LocalTimeProtocol.Continent getContinent() {
         return continent_;
       }
-      public Builder setContinent(org.jboss.netty.example.localtime.LocalTimeProtocol.Continent value) {
+      public Builder setContinent(io.netty.example.localtime.LocalTimeProtocol.Continent value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -594,7 +594,7 @@ public final class LocalTimeProtocol {
       }
       public Builder clearContinent() {
         bitField0_ = (bitField0_ & ~0x00000001);
-        continent_ = org.jboss.netty.example.localtime.LocalTimeProtocol.Continent.AFRICA;
+        continent_ = io.netty.example.localtime.LocalTimeProtocol.Continent.AFRICA;
         onChanged();
         return this;
       }
@@ -635,7 +635,7 @@ public final class LocalTimeProtocol {
         onChanged();
       }
       
-      // @@protoc_insertion_point(builder_scope:org.jboss.netty.example.localtime.Location)
+      // @@protoc_insertion_point(builder_scope:io.netty.example.localtime.Location)
     }
     
     static {
@@ -643,20 +643,20 @@ public final class LocalTimeProtocol {
       defaultInstance.initFields();
     }
     
-    // @@protoc_insertion_point(class_scope:org.jboss.netty.example.localtime.Location)
+    // @@protoc_insertion_point(class_scope:io.netty.example.localtime.Location)
   }
   
   public interface LocationsOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // repeated .org.jboss.netty.example.localtime.Location location = 1;
-    java.util.List 
+    // repeated .io.netty.example.localtime.Location location = 1;
+    java.util.List 
         getLocationList();
-    org.jboss.netty.example.localtime.LocalTimeProtocol.Location getLocation(int index);
+    io.netty.example.localtime.LocalTimeProtocol.Location getLocation(int index);
     int getLocationCount();
-    java.util.List 
+    java.util.List 
         getLocationOrBuilderList();
-    org.jboss.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder getLocationOrBuilder(
+    io.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder getLocationOrBuilder(
         int index);
   }
   public static final class Locations extends
@@ -679,31 +679,31 @@ public final class LocalTimeProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Locations_descriptor;
+      return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Locations_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Locations_fieldAccessorTable;
+      return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Locations_fieldAccessorTable;
     }
     
-    // repeated .org.jboss.netty.example.localtime.Location location = 1;
+    // repeated .io.netty.example.localtime.Location location = 1;
     public static final int LOCATION_FIELD_NUMBER = 1;
-    private java.util.List location_;
-    public java.util.List getLocationList() {
+    private java.util.List location_;
+    public java.util.List getLocationList() {
       return location_;
     }
-    public java.util.List 
+    public java.util.List 
         getLocationOrBuilderList() {
       return location_;
     }
     public int getLocationCount() {
       return location_.size();
     }
-    public org.jboss.netty.example.localtime.LocalTimeProtocol.Location getLocation(int index) {
+    public io.netty.example.localtime.LocalTimeProtocol.Location getLocation(int index) {
       return location_.get(index);
     }
-    public org.jboss.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder getLocationOrBuilder(
+    public io.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder getLocationOrBuilder(
         int index) {
       return location_.get(index);
     }
@@ -757,41 +757,41 @@ public final class LocalTimeProtocol {
       return super.writeReplace();
     }
     
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(byte[] data)
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(java.io.InputStream input)
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseDelimitedFrom(java.io.InputStream input)
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -800,7 +800,7 @@ public final class LocalTimeProtocol {
         return null;
       }
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseDelimitedFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -811,12 +811,12 @@ public final class LocalTimeProtocol {
         return null;
       }
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.Locations parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -826,7 +826,7 @@ public final class LocalTimeProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jboss.netty.example.localtime.LocalTimeProtocol.Locations prototype) {
+    public static Builder newBuilder(io.netty.example.localtime.LocalTimeProtocol.Locations prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -839,18 +839,18 @@ public final class LocalTimeProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
-       implements org.jboss.netty.example.localtime.LocalTimeProtocol.LocationsOrBuilder {
+       implements io.netty.example.localtime.LocalTimeProtocol.LocationsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Locations_descriptor;
+        return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Locations_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Locations_fieldAccessorTable;
+        return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_Locations_fieldAccessorTable;
       }
       
-      // Construct using org.jboss.netty.example.localtime.LocalTimeProtocol.Locations.newBuilder()
+      // Construct using io.netty.example.localtime.LocalTimeProtocol.Locations.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -885,24 +885,24 @@ public final class LocalTimeProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.Locations.getDescriptor();
+        return io.netty.example.localtime.LocalTimeProtocol.Locations.getDescriptor();
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Locations getDefaultInstanceForType() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.Locations.getDefaultInstance();
+      public io.netty.example.localtime.LocalTimeProtocol.Locations getDefaultInstanceForType() {
+        return io.netty.example.localtime.LocalTimeProtocol.Locations.getDefaultInstance();
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Locations build() {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.Locations result = buildPartial();
+      public io.netty.example.localtime.LocalTimeProtocol.Locations build() {
+        io.netty.example.localtime.LocalTimeProtocol.Locations result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private org.jboss.netty.example.localtime.LocalTimeProtocol.Locations buildParsed()
+      private io.netty.example.localtime.LocalTimeProtocol.Locations buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.Locations result = buildPartial();
+        io.netty.example.localtime.LocalTimeProtocol.Locations result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -910,8 +910,8 @@ public final class LocalTimeProtocol {
         return result;
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Locations buildPartial() {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.Locations result = new org.jboss.netty.example.localtime.LocalTimeProtocol.Locations(this);
+      public io.netty.example.localtime.LocalTimeProtocol.Locations buildPartial() {
+        io.netty.example.localtime.LocalTimeProtocol.Locations result = new io.netty.example.localtime.LocalTimeProtocol.Locations(this);
         int from_bitField0_ = bitField0_;
         if (locationBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -927,16 +927,16 @@ public final class LocalTimeProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jboss.netty.example.localtime.LocalTimeProtocol.Locations) {
-          return mergeFrom((org.jboss.netty.example.localtime.LocalTimeProtocol.Locations)other);
+        if (other instanceof io.netty.example.localtime.LocalTimeProtocol.Locations) {
+          return mergeFrom((io.netty.example.localtime.LocalTimeProtocol.Locations)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(org.jboss.netty.example.localtime.LocalTimeProtocol.Locations other) {
-        if (other == org.jboss.netty.example.localtime.LocalTimeProtocol.Locations.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.netty.example.localtime.LocalTimeProtocol.Locations other) {
+        if (other == io.netty.example.localtime.LocalTimeProtocol.Locations.getDefaultInstance()) return this;
         if (locationBuilder_ == null) {
           if (!other.location_.isEmpty()) {
             if (location_.isEmpty()) {
@@ -1001,7 +1001,7 @@ public final class LocalTimeProtocol {
               break;
             }
             case 10: {
-              org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder subBuilder = org.jboss.netty.example.localtime.LocalTimeProtocol.Location.newBuilder();
+              io.netty.example.localtime.LocalTimeProtocol.Location.Builder subBuilder = io.netty.example.localtime.LocalTimeProtocol.Location.newBuilder();
               input.readMessage(subBuilder, extensionRegistry);
               addLocation(subBuilder.buildPartial());
               break;
@@ -1012,20 +1012,20 @@ public final class LocalTimeProtocol {
       
       private int bitField0_;
       
-      // repeated .org.jboss.netty.example.localtime.Location location = 1;
-      private java.util.List location_ =
+      // repeated .io.netty.example.localtime.Location location = 1;
+      private java.util.List location_ =
         java.util.Collections.emptyList();
       private void ensureLocationIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          location_ = new java.util.ArrayList(location_);
+          location_ = new java.util.ArrayList(location_);
           bitField0_ |= 0x00000001;
          }
       }
       
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jboss.netty.example.localtime.LocalTimeProtocol.Location, org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder, org.jboss.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder> locationBuilder_;
+          io.netty.example.localtime.LocalTimeProtocol.Location, io.netty.example.localtime.LocalTimeProtocol.Location.Builder, io.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder> locationBuilder_;
       
-      public java.util.List getLocationList() {
+      public java.util.List getLocationList() {
         if (locationBuilder_ == null) {
           return java.util.Collections.unmodifiableList(location_);
         } else {
@@ -1039,7 +1039,7 @@ public final class LocalTimeProtocol {
           return locationBuilder_.getCount();
         }
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Location getLocation(int index) {
+      public io.netty.example.localtime.LocalTimeProtocol.Location getLocation(int index) {
         if (locationBuilder_ == null) {
           return location_.get(index);
         } else {
@@ -1047,7 +1047,7 @@ public final class LocalTimeProtocol {
         }
       }
       public Builder setLocation(
-          int index, org.jboss.netty.example.localtime.LocalTimeProtocol.Location value) {
+          int index, io.netty.example.localtime.LocalTimeProtocol.Location value) {
         if (locationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1061,7 +1061,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder setLocation(
-          int index, org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder builderForValue) {
+          int index, io.netty.example.localtime.LocalTimeProtocol.Location.Builder builderForValue) {
         if (locationBuilder_ == null) {
           ensureLocationIsMutable();
           location_.set(index, builderForValue.build());
@@ -1071,7 +1071,7 @@ public final class LocalTimeProtocol {
         }
         return this;
       }
-      public Builder addLocation(org.jboss.netty.example.localtime.LocalTimeProtocol.Location value) {
+      public Builder addLocation(io.netty.example.localtime.LocalTimeProtocol.Location value) {
         if (locationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1085,7 +1085,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder addLocation(
-          int index, org.jboss.netty.example.localtime.LocalTimeProtocol.Location value) {
+          int index, io.netty.example.localtime.LocalTimeProtocol.Location value) {
         if (locationBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1099,7 +1099,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder addLocation(
-          org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder builderForValue) {
+          io.netty.example.localtime.LocalTimeProtocol.Location.Builder builderForValue) {
         if (locationBuilder_ == null) {
           ensureLocationIsMutable();
           location_.add(builderForValue.build());
@@ -1110,7 +1110,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder addLocation(
-          int index, org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder builderForValue) {
+          int index, io.netty.example.localtime.LocalTimeProtocol.Location.Builder builderForValue) {
         if (locationBuilder_ == null) {
           ensureLocationIsMutable();
           location_.add(index, builderForValue.build());
@@ -1121,7 +1121,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder addAllLocation(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (locationBuilder_ == null) {
           ensureLocationIsMutable();
           super.addAll(values, location_);
@@ -1151,18 +1151,18 @@ public final class LocalTimeProtocol {
         }
         return this;
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder getLocationBuilder(
+      public io.netty.example.localtime.LocalTimeProtocol.Location.Builder getLocationBuilder(
           int index) {
         return getLocationFieldBuilder().getBuilder(index);
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder getLocationOrBuilder(
+      public io.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder getLocationOrBuilder(
           int index) {
         if (locationBuilder_ == null) {
           return location_.get(index);  } else {
           return locationBuilder_.getMessageOrBuilder(index);
         }
       }
-      public java.util.List 
+      public java.util.List 
            getLocationOrBuilderList() {
         if (locationBuilder_ != null) {
           return locationBuilder_.getMessageOrBuilderList();
@@ -1170,25 +1170,25 @@ public final class LocalTimeProtocol {
           return java.util.Collections.unmodifiableList(location_);
         }
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder addLocationBuilder() {
+      public io.netty.example.localtime.LocalTimeProtocol.Location.Builder addLocationBuilder() {
         return getLocationFieldBuilder().addBuilder(
-            org.jboss.netty.example.localtime.LocalTimeProtocol.Location.getDefaultInstance());
+            io.netty.example.localtime.LocalTimeProtocol.Location.getDefaultInstance());
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder addLocationBuilder(
+      public io.netty.example.localtime.LocalTimeProtocol.Location.Builder addLocationBuilder(
           int index) {
         return getLocationFieldBuilder().addBuilder(
-            index, org.jboss.netty.example.localtime.LocalTimeProtocol.Location.getDefaultInstance());
+            index, io.netty.example.localtime.LocalTimeProtocol.Location.getDefaultInstance());
       }
-      public java.util.List 
+      public java.util.List 
            getLocationBuilderList() {
         return getLocationFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jboss.netty.example.localtime.LocalTimeProtocol.Location, org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder, org.jboss.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder> 
+          io.netty.example.localtime.LocalTimeProtocol.Location, io.netty.example.localtime.LocalTimeProtocol.Location.Builder, io.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder> 
           getLocationFieldBuilder() {
         if (locationBuilder_ == null) {
           locationBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jboss.netty.example.localtime.LocalTimeProtocol.Location, org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder, org.jboss.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder>(
+              io.netty.example.localtime.LocalTimeProtocol.Location, io.netty.example.localtime.LocalTimeProtocol.Location.Builder, io.netty.example.localtime.LocalTimeProtocol.LocationOrBuilder>(
                   location_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -1198,7 +1198,7 @@ public final class LocalTimeProtocol {
         return locationBuilder_;
       }
       
-      // @@protoc_insertion_point(builder_scope:org.jboss.netty.example.localtime.Locations)
+      // @@protoc_insertion_point(builder_scope:io.netty.example.localtime.Locations)
     }
     
     static {
@@ -1206,7 +1206,7 @@ public final class LocalTimeProtocol {
       defaultInstance.initFields();
     }
     
-    // @@protoc_insertion_point(class_scope:org.jboss.netty.example.localtime.Locations)
+    // @@protoc_insertion_point(class_scope:io.netty.example.localtime.Locations)
   }
   
   public interface LocalTimeOrBuilder
@@ -1224,9 +1224,9 @@ public final class LocalTimeProtocol {
     boolean hasDayOfMonth();
     int getDayOfMonth();
     
-    // required .org.jboss.netty.example.localtime.DayOfWeek dayOfWeek = 5;
+    // required .io.netty.example.localtime.DayOfWeek dayOfWeek = 5;
     boolean hasDayOfWeek();
-    org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek getDayOfWeek();
+    io.netty.example.localtime.LocalTimeProtocol.DayOfWeek getDayOfWeek();
     
     // required uint32 hour = 6;
     boolean hasHour();
@@ -1260,12 +1260,12 @@ public final class LocalTimeProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTime_descriptor;
+      return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTime_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTime_fieldAccessorTable;
+      return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTime_fieldAccessorTable;
     }
     
     private int bitField0_;
@@ -1299,13 +1299,13 @@ public final class LocalTimeProtocol {
       return dayOfMonth_;
     }
     
-    // required .org.jboss.netty.example.localtime.DayOfWeek dayOfWeek = 5;
+    // required .io.netty.example.localtime.DayOfWeek dayOfWeek = 5;
     public static final int DAYOFWEEK_FIELD_NUMBER = 5;
-    private org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek dayOfWeek_;
+    private io.netty.example.localtime.LocalTimeProtocol.DayOfWeek dayOfWeek_;
     public boolean hasDayOfWeek() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
-    public org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek getDayOfWeek() {
+    public io.netty.example.localtime.LocalTimeProtocol.DayOfWeek getDayOfWeek() {
       return dayOfWeek_;
     }
     
@@ -1343,7 +1343,7 @@ public final class LocalTimeProtocol {
       year_ = 0;
       month_ = 0;
       dayOfMonth_ = 0;
-      dayOfWeek_ = org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek.SUNDAY;
+      dayOfWeek_ = io.netty.example.localtime.LocalTimeProtocol.DayOfWeek.SUNDAY;
       hour_ = 0;
       minute_ = 0;
       second_ = 0;
@@ -1458,41 +1458,41 @@ public final class LocalTimeProtocol {
       return super.writeReplace();
     }
     
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(byte[] data)
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(java.io.InputStream input)
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseDelimitedFrom(java.io.InputStream input)
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -1501,7 +1501,7 @@ public final class LocalTimeProtocol {
         return null;
       }
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseDelimitedFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1512,12 +1512,12 @@ public final class LocalTimeProtocol {
         return null;
       }
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTime parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -1527,7 +1527,7 @@ public final class LocalTimeProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime prototype) {
+    public static Builder newBuilder(io.netty.example.localtime.LocalTimeProtocol.LocalTime prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -1540,18 +1540,18 @@ public final class LocalTimeProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
-       implements org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder {
+       implements io.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTime_descriptor;
+        return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTime_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTime_fieldAccessorTable;
+        return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTime_fieldAccessorTable;
       }
       
-      // Construct using org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.newBuilder()
+      // Construct using io.netty.example.localtime.LocalTimeProtocol.LocalTime.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -1576,7 +1576,7 @@ public final class LocalTimeProtocol {
         bitField0_ = (bitField0_ & ~0x00000002);
         dayOfMonth_ = 0;
         bitField0_ = (bitField0_ & ~0x00000004);
-        dayOfWeek_ = org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek.SUNDAY;
+        dayOfWeek_ = io.netty.example.localtime.LocalTimeProtocol.DayOfWeek.SUNDAY;
         bitField0_ = (bitField0_ & ~0x00000008);
         hour_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
@@ -1593,24 +1593,24 @@ public final class LocalTimeProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.getDescriptor();
+        return io.netty.example.localtime.LocalTimeProtocol.LocalTime.getDescriptor();
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime getDefaultInstanceForType() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.getDefaultInstance();
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTime getDefaultInstanceForType() {
+        return io.netty.example.localtime.LocalTimeProtocol.LocalTime.getDefaultInstance();
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime build() {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime result = buildPartial();
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTime build() {
+        io.netty.example.localtime.LocalTimeProtocol.LocalTime result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime buildParsed()
+      private io.netty.example.localtime.LocalTimeProtocol.LocalTime buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime result = buildPartial();
+        io.netty.example.localtime.LocalTimeProtocol.LocalTime result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -1618,8 +1618,8 @@ public final class LocalTimeProtocol {
         return result;
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime buildPartial() {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime result = new org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime(this);
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTime buildPartial() {
+        io.netty.example.localtime.LocalTimeProtocol.LocalTime result = new io.netty.example.localtime.LocalTimeProtocol.LocalTime(this);
         int from_bitField0_ = bitField0_;
         int to_bitField0_ = 0;
         if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1656,16 +1656,16 @@ public final class LocalTimeProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime) {
-          return mergeFrom((org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime)other);
+        if (other instanceof io.netty.example.localtime.LocalTimeProtocol.LocalTime) {
+          return mergeFrom((io.netty.example.localtime.LocalTimeProtocol.LocalTime)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime other) {
-        if (other == org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.netty.example.localtime.LocalTimeProtocol.LocalTime other) {
+        if (other == io.netty.example.localtime.LocalTimeProtocol.LocalTime.getDefaultInstance()) return this;
         if (other.hasYear()) {
           setYear(other.getYear());
         }
@@ -1763,7 +1763,7 @@ public final class LocalTimeProtocol {
             }
             case 40: {
               int rawValue = input.readEnum();
-              org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek value = org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek.valueOf(rawValue);
+              io.netty.example.localtime.LocalTimeProtocol.DayOfWeek value = io.netty.example.localtime.LocalTimeProtocol.DayOfWeek.valueOf(rawValue);
               if (value == null) {
                 unknownFields.mergeVarintField(5, rawValue);
               } else {
@@ -1856,15 +1856,15 @@ public final class LocalTimeProtocol {
         return this;
       }
       
-      // required .org.jboss.netty.example.localtime.DayOfWeek dayOfWeek = 5;
-      private org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek dayOfWeek_ = org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek.SUNDAY;
+      // required .io.netty.example.localtime.DayOfWeek dayOfWeek = 5;
+      private io.netty.example.localtime.LocalTimeProtocol.DayOfWeek dayOfWeek_ = io.netty.example.localtime.LocalTimeProtocol.DayOfWeek.SUNDAY;
       public boolean hasDayOfWeek() {
         return ((bitField0_ & 0x00000008) == 0x00000008);
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek getDayOfWeek() {
+      public io.netty.example.localtime.LocalTimeProtocol.DayOfWeek getDayOfWeek() {
         return dayOfWeek_;
       }
-      public Builder setDayOfWeek(org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek value) {
+      public Builder setDayOfWeek(io.netty.example.localtime.LocalTimeProtocol.DayOfWeek value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1875,7 +1875,7 @@ public final class LocalTimeProtocol {
       }
       public Builder clearDayOfWeek() {
         bitField0_ = (bitField0_ & ~0x00000008);
-        dayOfWeek_ = org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek.SUNDAY;
+        dayOfWeek_ = io.netty.example.localtime.LocalTimeProtocol.DayOfWeek.SUNDAY;
         onChanged();
         return this;
       }
@@ -1943,7 +1943,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       
-      // @@protoc_insertion_point(builder_scope:org.jboss.netty.example.localtime.LocalTime)
+      // @@protoc_insertion_point(builder_scope:io.netty.example.localtime.LocalTime)
     }
     
     static {
@@ -1951,20 +1951,20 @@ public final class LocalTimeProtocol {
       defaultInstance.initFields();
     }
     
-    // @@protoc_insertion_point(class_scope:org.jboss.netty.example.localtime.LocalTime)
+    // @@protoc_insertion_point(class_scope:io.netty.example.localtime.LocalTime)
   }
   
   public interface LocalTimesOrBuilder
       extends com.google.protobuf.MessageOrBuilder {
     
-    // repeated .org.jboss.netty.example.localtime.LocalTime localTime = 1;
-    java.util.List 
+    // repeated .io.netty.example.localtime.LocalTime localTime = 1;
+    java.util.List 
         getLocalTimeList();
-    org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime getLocalTime(int index);
+    io.netty.example.localtime.LocalTimeProtocol.LocalTime getLocalTime(int index);
     int getLocalTimeCount();
-    java.util.List 
+    java.util.List 
         getLocalTimeOrBuilderList();
-    org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder getLocalTimeOrBuilder(
+    io.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder getLocalTimeOrBuilder(
         int index);
   }
   public static final class LocalTimes extends
@@ -1987,31 +1987,31 @@ public final class LocalTimeProtocol {
     
     public static final com.google.protobuf.Descriptors.Descriptor
         getDescriptor() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTimes_descriptor;
+      return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTimes_descriptor;
     }
     
     protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
         internalGetFieldAccessorTable() {
-      return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTimes_fieldAccessorTable;
+      return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTimes_fieldAccessorTable;
     }
     
-    // repeated .org.jboss.netty.example.localtime.LocalTime localTime = 1;
+    // repeated .io.netty.example.localtime.LocalTime localTime = 1;
     public static final int LOCALTIME_FIELD_NUMBER = 1;
-    private java.util.List localTime_;
-    public java.util.List getLocalTimeList() {
+    private java.util.List localTime_;
+    public java.util.List getLocalTimeList() {
       return localTime_;
     }
-    public java.util.List 
+    public java.util.List 
         getLocalTimeOrBuilderList() {
       return localTime_;
     }
     public int getLocalTimeCount() {
       return localTime_.size();
     }
-    public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime getLocalTime(int index) {
+    public io.netty.example.localtime.LocalTimeProtocol.LocalTime getLocalTime(int index) {
       return localTime_.get(index);
     }
-    public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder getLocalTimeOrBuilder(
+    public io.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder getLocalTimeOrBuilder(
         int index) {
       return localTime_.get(index);
     }
@@ -2065,41 +2065,41 @@ public final class LocalTimeProtocol {
       return super.writeReplace();
     }
     
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(byte[] data)
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(java.io.InputStream input)
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseDelimitedFrom(java.io.InputStream input)
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -2108,7 +2108,7 @@ public final class LocalTimeProtocol {
         return null;
       }
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseDelimitedFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2119,12 +2119,12 @@ public final class LocalTimeProtocol {
         return null;
       }
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
+    public static io.netty.example.localtime.LocalTimeProtocol.LocalTimes parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -2134,7 +2134,7 @@ public final class LocalTimeProtocol {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes prototype) {
+    public static Builder newBuilder(io.netty.example.localtime.LocalTimeProtocol.LocalTimes prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
@@ -2147,18 +2147,18 @@ public final class LocalTimeProtocol {
     }
     public static final class Builder extends
         com.google.protobuf.GeneratedMessage.Builder
-       implements org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimesOrBuilder {
+       implements io.netty.example.localtime.LocalTimeProtocol.LocalTimesOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTimes_descriptor;
+        return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTimes_descriptor;
       }
       
       protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
           internalGetFieldAccessorTable() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTimes_fieldAccessorTable;
+        return io.netty.example.localtime.LocalTimeProtocol.internal_static_org_jboss_netty_example_localtime_LocalTimes_fieldAccessorTable;
       }
       
-      // Construct using org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes.newBuilder()
+      // Construct using io.netty.example.localtime.LocalTimeProtocol.LocalTimes.newBuilder()
       private Builder() {
         maybeForceBuilderInitialization();
       }
@@ -2193,24 +2193,24 @@ public final class LocalTimeProtocol {
       
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes.getDescriptor();
+        return io.netty.example.localtime.LocalTimeProtocol.LocalTimes.getDescriptor();
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes getDefaultInstanceForType() {
-        return org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes.getDefaultInstance();
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTimes getDefaultInstanceForType() {
+        return io.netty.example.localtime.LocalTimeProtocol.LocalTimes.getDefaultInstance();
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes build() {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes result = buildPartial();
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTimes build() {
+        io.netty.example.localtime.LocalTimeProtocol.LocalTimes result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return result;
       }
       
-      private org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes buildParsed()
+      private io.netty.example.localtime.LocalTimeProtocol.LocalTimes buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes result = buildPartial();
+        io.netty.example.localtime.LocalTimeProtocol.LocalTimes result = buildPartial();
         if (!result.isInitialized()) {
           throw newUninitializedMessageException(
             result).asInvalidProtocolBufferException();
@@ -2218,8 +2218,8 @@ public final class LocalTimeProtocol {
         return result;
       }
       
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes buildPartial() {
-        org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes result = new org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes(this);
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTimes buildPartial() {
+        io.netty.example.localtime.LocalTimeProtocol.LocalTimes result = new io.netty.example.localtime.LocalTimeProtocol.LocalTimes(this);
         int from_bitField0_ = bitField0_;
         if (localTimeBuilder_ == null) {
           if (((bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2235,16 +2235,16 @@ public final class LocalTimeProtocol {
       }
       
       public Builder mergeFrom(com.google.protobuf.Message other) {
-        if (other instanceof org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes) {
-          return mergeFrom((org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes)other);
+        if (other instanceof io.netty.example.localtime.LocalTimeProtocol.LocalTimes) {
+          return mergeFrom((io.netty.example.localtime.LocalTimeProtocol.LocalTimes)other);
         } else {
           super.mergeFrom(other);
           return this;
         }
       }
       
-      public Builder mergeFrom(org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes other) {
-        if (other == org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes.getDefaultInstance()) return this;
+      public Builder mergeFrom(io.netty.example.localtime.LocalTimeProtocol.LocalTimes other) {
+        if (other == io.netty.example.localtime.LocalTimeProtocol.LocalTimes.getDefaultInstance()) return this;
         if (localTimeBuilder_ == null) {
           if (!other.localTime_.isEmpty()) {
             if (localTime_.isEmpty()) {
@@ -2309,7 +2309,7 @@ public final class LocalTimeProtocol {
               break;
             }
             case 10: {
-              org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder subBuilder = org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.newBuilder();
+              io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder subBuilder = io.netty.example.localtime.LocalTimeProtocol.LocalTime.newBuilder();
               input.readMessage(subBuilder, extensionRegistry);
               addLocalTime(subBuilder.buildPartial());
               break;
@@ -2320,20 +2320,20 @@ public final class LocalTimeProtocol {
       
       private int bitField0_;
       
-      // repeated .org.jboss.netty.example.localtime.LocalTime localTime = 1;
-      private java.util.List localTime_ =
+      // repeated .io.netty.example.localtime.LocalTime localTime = 1;
+      private java.util.List localTime_ =
         java.util.Collections.emptyList();
       private void ensureLocalTimeIsMutable() {
         if (!((bitField0_ & 0x00000001) == 0x00000001)) {
-          localTime_ = new java.util.ArrayList(localTime_);
+          localTime_ = new java.util.ArrayList(localTime_);
           bitField0_ |= 0x00000001;
          }
       }
       
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder> localTimeBuilder_;
+          io.netty.example.localtime.LocalTimeProtocol.LocalTime, io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder, io.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder> localTimeBuilder_;
       
-      public java.util.List getLocalTimeList() {
+      public java.util.List getLocalTimeList() {
         if (localTimeBuilder_ == null) {
           return java.util.Collections.unmodifiableList(localTime_);
         } else {
@@ -2347,7 +2347,7 @@ public final class LocalTimeProtocol {
           return localTimeBuilder_.getCount();
         }
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime getLocalTime(int index) {
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTime getLocalTime(int index) {
         if (localTimeBuilder_ == null) {
           return localTime_.get(index);
         } else {
@@ -2355,7 +2355,7 @@ public final class LocalTimeProtocol {
         }
       }
       public Builder setLocalTime(
-          int index, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime value) {
+          int index, io.netty.example.localtime.LocalTimeProtocol.LocalTime value) {
         if (localTimeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2369,7 +2369,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder setLocalTime(
-          int index, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder builderForValue) {
+          int index, io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder builderForValue) {
         if (localTimeBuilder_ == null) {
           ensureLocalTimeIsMutable();
           localTime_.set(index, builderForValue.build());
@@ -2379,7 +2379,7 @@ public final class LocalTimeProtocol {
         }
         return this;
       }
-      public Builder addLocalTime(org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime value) {
+      public Builder addLocalTime(io.netty.example.localtime.LocalTimeProtocol.LocalTime value) {
         if (localTimeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2393,7 +2393,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder addLocalTime(
-          int index, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime value) {
+          int index, io.netty.example.localtime.LocalTimeProtocol.LocalTime value) {
         if (localTimeBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -2407,7 +2407,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder addLocalTime(
-          org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder builderForValue) {
+          io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder builderForValue) {
         if (localTimeBuilder_ == null) {
           ensureLocalTimeIsMutable();
           localTime_.add(builderForValue.build());
@@ -2418,7 +2418,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder addLocalTime(
-          int index, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder builderForValue) {
+          int index, io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder builderForValue) {
         if (localTimeBuilder_ == null) {
           ensureLocalTimeIsMutable();
           localTime_.add(index, builderForValue.build());
@@ -2429,7 +2429,7 @@ public final class LocalTimeProtocol {
         return this;
       }
       public Builder addAllLocalTime(
-          java.lang.Iterable values) {
+          java.lang.Iterable values) {
         if (localTimeBuilder_ == null) {
           ensureLocalTimeIsMutable();
           super.addAll(values, localTime_);
@@ -2459,18 +2459,18 @@ public final class LocalTimeProtocol {
         }
         return this;
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder getLocalTimeBuilder(
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder getLocalTimeBuilder(
           int index) {
         return getLocalTimeFieldBuilder().getBuilder(index);
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder getLocalTimeOrBuilder(
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder getLocalTimeOrBuilder(
           int index) {
         if (localTimeBuilder_ == null) {
           return localTime_.get(index);  } else {
           return localTimeBuilder_.getMessageOrBuilder(index);
         }
       }
-      public java.util.List 
+      public java.util.List 
            getLocalTimeOrBuilderList() {
         if (localTimeBuilder_ != null) {
           return localTimeBuilder_.getMessageOrBuilderList();
@@ -2478,25 +2478,25 @@ public final class LocalTimeProtocol {
           return java.util.Collections.unmodifiableList(localTime_);
         }
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder addLocalTimeBuilder() {
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder addLocalTimeBuilder() {
         return getLocalTimeFieldBuilder().addBuilder(
-            org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.getDefaultInstance());
+            io.netty.example.localtime.LocalTimeProtocol.LocalTime.getDefaultInstance());
       }
-      public org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder addLocalTimeBuilder(
+      public io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder addLocalTimeBuilder(
           int index) {
         return getLocalTimeFieldBuilder().addBuilder(
-            index, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.getDefaultInstance());
+            index, io.netty.example.localtime.LocalTimeProtocol.LocalTime.getDefaultInstance());
       }
-      public java.util.List 
+      public java.util.List 
            getLocalTimeBuilderList() {
         return getLocalTimeFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
-          org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder> 
+          io.netty.example.localtime.LocalTimeProtocol.LocalTime, io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder, io.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder> 
           getLocalTimeFieldBuilder() {
         if (localTimeBuilder_ == null) {
           localTimeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
-              org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder, org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder>(
+              io.netty.example.localtime.LocalTimeProtocol.LocalTime, io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder, io.netty.example.localtime.LocalTimeProtocol.LocalTimeOrBuilder>(
                   localTime_,
                   ((bitField0_ & 0x00000001) == 0x00000001),
                   getParentForChildren(),
@@ -2506,7 +2506,7 @@ public final class LocalTimeProtocol {
         return localTimeBuilder_;
       }
       
-      // @@protoc_insertion_point(builder_scope:org.jboss.netty.example.localtime.LocalTimes)
+      // @@protoc_insertion_point(builder_scope:io.netty.example.localtime.LocalTimes)
     }
     
     static {
@@ -2514,7 +2514,7 @@ public final class LocalTimeProtocol {
       defaultInstance.initFields();
     }
     
-    // @@protoc_insertion_point(class_scope:org.jboss.netty.example.localtime.LocalTimes)
+    // @@protoc_insertion_point(class_scope:io.netty.example.localtime.LocalTimes)
   }
   
   private static com.google.protobuf.Descriptors.Descriptor
@@ -2549,16 +2549,16 @@ public final class LocalTimeProtocol {
       "\nGsrc/main/java/org/jboss/netty/example/" +
       "localtime/LocalTimeProtocol.proto\022!org.j" +
       "boss.netty.example.localtime\"Y\n\010Location" +
-      "\022?\n\tcontinent\030\001 \002(\0162,.org.jboss.netty.ex" +
+      "\022?\n\tcontinent\030\001 \002(\0162,.io.netty.ex" +
       "ample.localtime.Continent\022\014\n\004city\030\002 \002(\t\"" +
       "J\n\tLocations\022=\n\010location\030\001 \003(\0132+.org.jbo" +
       "ss.netty.example.localtime.Location\"\253\001\n\t" +
       "LocalTime\022\014\n\004year\030\001 \002(\r\022\r\n\005month\030\002 \002(\r\022\022" +
       "\n\ndayOfMonth\030\004 \002(\r\022?\n\tdayOfWeek\030\005 \002(\0162,." +
-      "org.jboss.netty.example.localtime.DayOfW",
+      "io.netty.example.localtime.DayOfW",
       "eek\022\014\n\004hour\030\006 \002(\r\022\016\n\006minute\030\007 \002(\r\022\016\n\006sec" +
       "ond\030\010 \002(\r\"M\n\nLocalTimes\022?\n\tlocalTime\030\001 \003" +
-      "(\0132,.org.jboss.netty.example.localtime.L" +
+      "(\0132,.io.netty.example.localtime.L" +
       "ocalTime*\231\001\n\tContinent\022\n\n\006AFRICA\020\000\022\013\n\007AM" +
       "ERICA\020\001\022\016\n\nANTARCTICA\020\002\022\n\n\006ARCTIC\020\003\022\010\n\004A" +
       "SIA\020\004\022\014\n\010ATLANTIC\020\005\022\r\n\tAUSTRALIA\020\006\022\n\n\006EU" +
@@ -2578,32 +2578,32 @@ public final class LocalTimeProtocol {
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_org_jboss_netty_example_localtime_Location_descriptor,
               new java.lang.String[] { "Continent", "City", },
-              org.jboss.netty.example.localtime.LocalTimeProtocol.Location.class,
-              org.jboss.netty.example.localtime.LocalTimeProtocol.Location.Builder.class);
+              io.netty.example.localtime.LocalTimeProtocol.Location.class,
+              io.netty.example.localtime.LocalTimeProtocol.Location.Builder.class);
           internal_static_org_jboss_netty_example_localtime_Locations_descriptor =
             getDescriptor().getMessageTypes().get(1);
           internal_static_org_jboss_netty_example_localtime_Locations_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_org_jboss_netty_example_localtime_Locations_descriptor,
               new java.lang.String[] { "Location", },
-              org.jboss.netty.example.localtime.LocalTimeProtocol.Locations.class,
-              org.jboss.netty.example.localtime.LocalTimeProtocol.Locations.Builder.class);
+              io.netty.example.localtime.LocalTimeProtocol.Locations.class,
+              io.netty.example.localtime.LocalTimeProtocol.Locations.Builder.class);
           internal_static_org_jboss_netty_example_localtime_LocalTime_descriptor =
             getDescriptor().getMessageTypes().get(2);
           internal_static_org_jboss_netty_example_localtime_LocalTime_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_org_jboss_netty_example_localtime_LocalTime_descriptor,
               new java.lang.String[] { "Year", "Month", "DayOfMonth", "DayOfWeek", "Hour", "Minute", "Second", },
-              org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.class,
-              org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder.class);
+              io.netty.example.localtime.LocalTimeProtocol.LocalTime.class,
+              io.netty.example.localtime.LocalTimeProtocol.LocalTime.Builder.class);
           internal_static_org_jboss_netty_example_localtime_LocalTimes_descriptor =
             getDescriptor().getMessageTypes().get(3);
           internal_static_org_jboss_netty_example_localtime_LocalTimes_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_org_jboss_netty_example_localtime_LocalTimes_descriptor,
               new java.lang.String[] { "LocalTime", },
-              org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes.class,
-              org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes.Builder.class);
+              io.netty.example.localtime.LocalTimeProtocol.LocalTimes.class,
+              io.netty.example.localtime.LocalTimeProtocol.LocalTimes.Builder.class);
           return null;
         }
       };
diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.proto b/src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.proto
index 6dcec2faee..ec769ae3e4 100644
--- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.proto
+++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.proto
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.localtime;
+package io.netty.example.localtime;
 
 // How to generate
 // ===============
-// $ protoc src/main/java/org/jboss/netty/example/localtime/LocalTimeProtocol.proto \
+// $ protoc src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto \
 //          --java_out=src/main/java
 //
 // Add @SuppressWarnings("all") to the generated code not to pollute IDE task list.
diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServer.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServer.java
index 85b9ed8567..99e3d8c043 100644
--- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServer.java
+++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServer.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.localtime;
+package io.netty.example.localtime;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * Receives a list of continent/city pairs from a {@link LocalTimeClient} to
diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java
index 99a6e2f251..a359b28503 100644
--- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.localtime;
+package io.netty.example.localtime;
 
 import static java.util.Calendar.*;
 
@@ -22,18 +22,18 @@ import java.util.TimeZone;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.Continent;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.DayOfWeek;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTime;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.LocalTimes;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.Location;
-import org.jboss.netty.example.localtime.LocalTimeProtocol.Locations;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.example.localtime.LocalTimeProtocol.Continent;
+import io.netty.example.localtime.LocalTimeProtocol.DayOfWeek;
+import io.netty.example.localtime.LocalTimeProtocol.LocalTime;
+import io.netty.example.localtime.LocalTimeProtocol.LocalTimes;
+import io.netty.example.localtime.LocalTimeProtocol.Location;
+import io.netty.example.localtime.LocalTimeProtocol.Locations;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerPipelineFactory.java
index d177d83c7d..75cadde1a6 100644
--- a/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/localtime/LocalTimeServerPipelineFactory.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.localtime;
+package io.netty.example.localtime;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.protobuf.ProtobufDecoder;
-import org.jboss.netty.handler.codec.protobuf.ProtobufEncoder;
-import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
-import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.protobuf.ProtobufDecoder;
+import io.netty.handler.codec.protobuf.ProtobufEncoder;
+import io.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
+import io.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClient.java b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClient.java
index bdc75a63af..c3184a3c2f 100644
--- a/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClient.java
+++ b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClient.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.objectecho;
+package io.netty.example.objectecho;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.example.echo.EchoClient;
-import org.jboss.netty.handler.codec.serialization.ObjectDecoder;
-import org.jboss.netty.handler.codec.serialization.ObjectEncoder;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.example.echo.EchoClient;
+import io.netty.handler.codec.serialization.ObjectDecoder;
+import io.netty.handler.codec.serialization.ObjectEncoder;
 
 /**
  * Modification of {@link EchoClient} which utilizes Java object serialization.
diff --git a/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClientHandler.java b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClientHandler.java
index e16803fd75..a07fdcb1f7 100644
--- a/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClientHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.objectecho;
+package io.netty.example.objectecho;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,13 +21,13 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * Handler implementation for the object echo client.  It initiates the
diff --git a/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServer.java b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServer.java
index bd49afedc5..2b806a944d 100644
--- a/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServer.java
+++ b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServer.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.objectecho;
+package io.netty.example.objectecho;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.example.echo.EchoServer;
-import org.jboss.netty.handler.codec.serialization.ObjectDecoder;
-import org.jboss.netty.handler.codec.serialization.ObjectEncoder;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.example.echo.EchoServer;
+import io.netty.handler.codec.serialization.ObjectDecoder;
+import io.netty.handler.codec.serialization.ObjectEncoder;
 
 /**
  * Modification of {@link EchoServer} which utilizes Java object serialization.
diff --git a/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServerHandler.java b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServerHandler.java
index 1dad91d69d..489d838497 100644
--- a/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServerHandler.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.objectecho;
+package io.netty.example.objectecho;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * Handles both client-side and server-side handler depending on which
diff --git a/src/main/java/org/jboss/netty/example/portunification/PortUnificationServer.java b/src/main/java/org/jboss/netty/example/portunification/PortUnificationServer.java
index 2b189cf04f..1ccf5081b4 100644
--- a/src/main/java/org/jboss/netty/example/portunification/PortUnificationServer.java
+++ b/src/main/java/org/jboss/netty/example/portunification/PortUnificationServer.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.portunification;
+package io.netty.example.portunification;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * Serves two protocols (HTTP and Factorial) using only one port, enabling
diff --git a/src/main/java/org/jboss/netty/example/portunification/PortUnificationServerHandler.java b/src/main/java/org/jboss/netty/example/portunification/PortUnificationServerHandler.java
index 7e8463f828..24d92f7aa7 100644
--- a/src/main/java/org/jboss/netty/example/portunification/PortUnificationServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/portunification/PortUnificationServerHandler.java
@@ -13,27 +13,27 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.portunification;
+package io.netty.example.portunification;
 
 import javax.net.ssl.SSLEngine;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.example.factorial.BigIntegerDecoder;
-import org.jboss.netty.example.factorial.FactorialServerHandler;
-import org.jboss.netty.example.factorial.NumberEncoder;
-import org.jboss.netty.example.http.snoop.HttpRequestHandler;
-import org.jboss.netty.example.securechat.SecureChatSslContextFactory;
-import org.jboss.netty.handler.codec.compression.ZlibDecoder;
-import org.jboss.netty.handler.codec.compression.ZlibEncoder;
-import org.jboss.netty.handler.codec.compression.ZlibWrapper;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
-import org.jboss.netty.handler.codec.http.HttpContentCompressor;
-import org.jboss.netty.handler.codec.http.HttpRequestDecoder;
-import org.jboss.netty.handler.codec.http.HttpResponseEncoder;
-import org.jboss.netty.handler.ssl.SslHandler;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.example.factorial.BigIntegerDecoder;
+import io.netty.example.factorial.FactorialServerHandler;
+import io.netty.example.factorial.NumberEncoder;
+import io.netty.example.http.snoop.HttpRequestHandler;
+import io.netty.example.securechat.SecureChatSslContextFactory;
+import io.netty.handler.codec.compression.ZlibDecoder;
+import io.netty.handler.codec.compression.ZlibEncoder;
+import io.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.handler.codec.frame.FrameDecoder;
+import io.netty.handler.codec.http.HttpContentCompressor;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.ssl.SslHandler;
 
 /**
  * Manipulates the current pipeline dynamically to switch protocols or enable
diff --git a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxy.java b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxy.java
index 91bda5f7f7..75ed7d3aa0 100644
--- a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxy.java
+++ b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxy.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.proxy;
+package io.netty.example.proxy;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.ClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java
index 35a869b56b..8d91e2b6e4 100644
--- a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java
+++ b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyInboundHandler.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.proxy;
+package io.netty.example.proxy;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.socket.ClientSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyPipelineFactory.java b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyPipelineFactory.java
index 1bb2685fc5..b52ca67847 100644
--- a/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/proxy/HexDumpProxyPipelineFactory.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.proxy;
+package io.netty.example.proxy;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.socket.ClientSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java
index f725dfc29f..085bd0e5f6 100644
--- a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java
+++ b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClient.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.qotm;
+package io.netty.example.qotm;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.socket.DatagramChannel;
-import org.jboss.netty.channel.socket.DatagramChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioDatagramChannelFactory;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.bootstrap.ConnectionlessBootstrap;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.FixedReceiveBufferSizePredictorFactory;
+import io.netty.channel.socket.DatagramChannel;
+import io.netty.channel.socket.DatagramChannelFactory;
+import io.netty.channel.socket.nio.NioDatagramChannelFactory;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
 
 /**
  * A UDP broadcast client that asks for a quote of the moment (QOTM) to
diff --git a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClientHandler.java b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClientHandler.java
index 078cd3381b..8f5cca3149 100644
--- a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentClientHandler.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.qotm;
+package io.netty.example.qotm;
 
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java
index 914cbfb2c3..30553519b2 100644
--- a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java
+++ b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServer.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.qotm;
+package io.netty.example.qotm;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.FixedReceiveBufferSizePredictorFactory;
-import org.jboss.netty.channel.socket.DatagramChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioDatagramChannelFactory;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.bootstrap.ConnectionlessBootstrap;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.FixedReceiveBufferSizePredictorFactory;
+import io.netty.channel.socket.DatagramChannelFactory;
+import io.netty.channel.socket.nio.NioDatagramChannelFactory;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
 
 /**
  * A UDP server that responds to the QOTM (quote of the moment) request to a
diff --git a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java
index 0f9f933f9f..c936aa8ef4 100644
--- a/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/qotm/QuoteOfTheMomentServerHandler.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.qotm;
+package io.netty.example.qotm;
 
 import java.util.Random;
 
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/example/sctp/SctpClient.java b/src/main/java/org/jboss/netty/example/sctp/SctpClient.java
index a3b338ac49..b404a2860e 100644
--- a/src/main/java/org/jboss/netty/example/sctp/SctpClient.java
+++ b/src/main/java/org/jboss/netty/example/sctp/SctpClient.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.sctp;
+package io.netty.example.sctp;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.sctp.SctpClientSocketChannelFactory;
-import org.jboss.netty.handler.execution.ExecutionHandler;
-import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.sctp.SctpClientSocketChannelFactory;
+import io.netty.handler.execution.ExecutionHandler;
+import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
diff --git a/src/main/java/org/jboss/netty/example/sctp/SctpClientHandler.java b/src/main/java/org/jboss/netty/example/sctp/SctpClientHandler.java
index c261ad05c4..3ec776ee46 100644
--- a/src/main/java/org/jboss/netty/example/sctp/SctpClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/sctp/SctpClientHandler.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.sctp;
+package io.netty.example.sctp;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.*;
-import org.jboss.netty.channel.socket.sctp.SctpPayload;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.*;
+import io.netty.channel.socket.sctp.SctpPayload;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
diff --git a/src/main/java/org/jboss/netty/example/sctp/SctpServer.java b/src/main/java/org/jboss/netty/example/sctp/SctpServer.java
index 29c42518af..9dede93ea9 100644
--- a/src/main/java/org/jboss/netty/example/sctp/SctpServer.java
+++ b/src/main/java/org/jboss/netty/example/sctp/SctpServer.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.sctp;
+package io.netty.example.sctp;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.sctp.SctpServerSocketChannelFactory;
-import org.jboss.netty.handler.execution.ExecutionHandler;
-import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.sctp.SctpServerSocketChannelFactory;
+import io.netty.handler.execution.ExecutionHandler;
+import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
diff --git a/src/main/java/org/jboss/netty/example/sctp/SctpServerHandler.java b/src/main/java/org/jboss/netty/example/sctp/SctpServerHandler.java
index 80e8850d34..2823816ecf 100644
--- a/src/main/java/org/jboss/netty/example/sctp/SctpServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/sctp/SctpServerHandler.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.sctp;
+package io.netty.example.sctp;
 
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java
index 46a6b4a76c..0ad9c56681 100644
--- a/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.securechat;
+package io.netty.example.securechat;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.example.telnet.TelnetClient;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.example.telnet.TelnetClient;
 
 /**
  * Simple SSL chat client modified from {@link TelnetClient}.
diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatClientHandler.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatClientHandler.java
index 98019baac3..e14eee3810 100644
--- a/src/main/java/org/jboss/netty/example/securechat/SecureChatClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatClientHandler.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.securechat;
+package io.netty.example.securechat;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.ssl.SslHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.ssl.SslHandler;
 
 /**
  * Handles a client-side channel.
diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatClientPipelineFactory.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatClientPipelineFactory.java
index efa90c918d..ba6bf77235 100644
--- a/src/main/java/org/jboss/netty/example/securechat/SecureChatClientPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatClientPipelineFactory.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.securechat;
+package io.netty.example.securechat;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import javax.net.ssl.SSLEngine;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.jboss.netty.handler.ssl.SslHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.handler.ssl.SslHandler;
 
 /**
  * Creates a newly configured {@link ChannelPipeline} for a new channel.
diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatKeyStore.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatKeyStore.java
index 59ab55a320..c8618c1940 100644
--- a/src/main/java/org/jboss/netty/example/securechat/SecureChatKeyStore.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatKeyStore.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.securechat;
+package io.netty.example.securechat;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatServer.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatServer.java
index aa7e8c6e86..cd7b69fdac 100644
--- a/src/main/java/org/jboss/netty/example/securechat/SecureChatServer.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatServer.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.securechat;
+package io.netty.example.securechat;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.example.telnet.TelnetServer;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.example.telnet.TelnetServer;
 
 /**
  * Simple SSL chat server modified from {@link TelnetServer}.
diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java
index 32118d1e32..9cf198cf22 100644
--- a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.securechat;
+package io.netty.example.securechat;
 
 import java.net.InetAddress;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.handler.ssl.SslHandler;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.handler.ssl.SslHandler;
 
 /**
  * Handles a server-side channel.
diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerPipelineFactory.java
index 5ebef06c2e..0294659811 100644
--- a/src/main/java/org/jboss/netty/example/securechat/SecureChatServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerPipelineFactory.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.securechat;
+package io.netty.example.securechat;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import javax.net.ssl.SSLEngine;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.jboss.netty.handler.ssl.SslHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.handler.ssl.SslHandler;
 
 /**
  * Creates a newly configured {@link ChannelPipeline} for a new channel.
diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java
index 4ac6ccf07b..16c9c8f409 100644
--- a/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.securechat;
+package io.netty.example.securechat;
 
 import java.security.KeyStore;
 import java.security.Security;
@@ -24,7 +24,7 @@ import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.TrustManager;
 
-import org.jboss.netty.handler.ssl.SslHandler;
+import io.netty.handler.ssl.SslHandler;
 
 /**
  * Creates a bogus {@link SSLContext}.  A client-side context created by this
diff --git a/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java
index d534427e40..c65886d088 100644
--- a/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.securechat;
+package io.netty.example.securechat;
 
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java b/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java
index b24de1e1b0..1784610c57 100644
--- a/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.telnet;
+package io.netty.example.telnet;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 /**
  * Simplistic telnet client.
diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetClientHandler.java b/src/main/java/org/jboss/netty/example/telnet/TelnetClientHandler.java
index 31277b2ece..84fe506c6d 100644
--- a/src/main/java/org/jboss/netty/example/telnet/TelnetClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetClientHandler.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.telnet;
+package io.netty.example.telnet;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * Handles a client-side channel.
diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetClientPipelineFactory.java b/src/main/java/org/jboss/netty/example/telnet/TelnetClientPipelineFactory.java
index 3de45bd9a7..7ef3502247 100644
--- a/src/main/java/org/jboss/netty/example/telnet/TelnetClientPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetClientPipelineFactory.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.telnet;
+package io.netty.example.telnet;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
 
 /**
  * Creates a newly configured {@link ChannelPipeline} for a new channel.
diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetServer.java b/src/main/java/org/jboss/netty/example/telnet/TelnetServer.java
index 178caf6a09..e947074501 100644
--- a/src/main/java/org/jboss/netty/example/telnet/TelnetServer.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetServer.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.telnet;
+package io.netty.example.telnet;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * Simplistic telnet server.
diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java b/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java
index 89198cd0b6..4351adc57e 100644
--- a/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.telnet;
+package io.netty.example.telnet;
 
 import java.net.InetAddress;
 import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * Handles a server-side channel.
diff --git a/src/main/java/org/jboss/netty/example/telnet/TelnetServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/telnet/TelnetServerPipelineFactory.java
index 453c063fcd..97733793a4 100644
--- a/src/main/java/org/jboss/netty/example/telnet/TelnetServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetServerPipelineFactory.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.telnet;
+package io.netty.example.telnet;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.string.StringDecoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
 
 /**
  * Creates a newly configured {@link ChannelPipeline} for a new channel.
diff --git a/src/main/java/org/jboss/netty/example/uptime/UptimeClient.java b/src/main/java/org/jboss/netty/example/uptime/UptimeClient.java
index 12289aec8a..b3203d39db 100644
--- a/src/main/java/org/jboss/netty/example/uptime/UptimeClient.java
+++ b/src/main/java/org/jboss/netty/example/uptime/UptimeClient.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.uptime;
+package io.netty.example.uptime;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.handler.timeout.ReadTimeoutHandler;
-import org.jboss.netty.util.HashedWheelTimer;
-import org.jboss.netty.util.Timer;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.handler.timeout.ReadTimeoutHandler;
+import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timer;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/example/uptime/UptimeClientHandler.java b/src/main/java/org/jboss/netty/example/uptime/UptimeClientHandler.java
index b96e11ae38..9cf6ff7ac1 100644
--- a/src/main/java/org/jboss/netty/example/uptime/UptimeClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/uptime/UptimeClientHandler.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.example.uptime;
+package io.netty.example.uptime;
 
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.timeout.ReadTimeoutException;
-import org.jboss.netty.util.Timeout;
-import org.jboss.netty.util.Timer;
-import org.jboss.netty.util.TimerTask;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.timeout.ReadTimeoutException;
+import io.netty.util.Timeout;
+import io.netty.util.Timer;
+import io.netty.util.TimerTask;
 
 /**
  * Keep reconnecting to the server while printing out the current uptime and
diff --git a/src/main/java/org/jboss/netty/handler/codec/base64/Base64.java b/src/main/java/org/jboss/netty/handler/codec/base64/Base64.java
index 8aae3bfd06..a5f2a43a32 100644
--- a/src/main/java/org/jboss/netty/handler/codec/base64/Base64.java
+++ b/src/main/java/org/jboss/netty/handler/codec/base64/Base64.java
@@ -17,11 +17,11 @@
  * Written by Robert Harder and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.handler.codec.base64;
+package io.netty.handler.codec.base64;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.HeapChannelBufferFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.HeapChannelBufferFactory;
 
 /**
  * Utility class for {@link ChannelBuffer} that encodes and decodes to and from
@@ -35,7 +35,7 @@ import org.jboss.netty.buffer.HeapChannelBufferFactory;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.handler.codec.base64.Base64Dialect
+ * @apiviz.uses io.netty.handler.codec.base64.Base64Dialect
  */
 public class Base64 {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Decoder.java b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Decoder.java
index 8f01e2416b..ee71b2809b 100644
--- a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Decoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Decoder.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.base64;
+package io.netty.handler.codec.base64;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
-import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.frame.FrameDecoder;
+import io.netty.handler.codec.oneone.OneToOneDecoder;
+import io.netty.util.CharsetUtil;
 
 /**
  * Decodes a Base64-encoded {@link ChannelBuffer} or US-ASCII {@link String}
@@ -48,7 +48,7 @@ import org.jboss.netty.util.CharsetUtil;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.handler.codec.base64.Base64
+ * @apiviz.uses io.netty.handler.codec.base64.Base64
  */
 @Sharable
 public class Base64Decoder extends OneToOneDecoder {
diff --git a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Dialect.java b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Dialect.java
index 2a97205cc2..393981d0c2 100644
--- a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Dialect.java
+++ b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Dialect.java
@@ -17,7 +17,7 @@
  * Written by Robert Harder and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.handler.codec.base64;
+package io.netty.handler.codec.base64;
 
 /**
  * Enumeration of supported Base64 dialects.
diff --git a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Encoder.java b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Encoder.java
index 605e0df1b8..44fb11a7ec 100644
--- a/src/main/java/org/jboss/netty/handler/codec/base64/Base64Encoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/base64/Base64Encoder.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.base64;
+package io.netty.handler.codec.base64;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 /**
  * Encodes a {@link ChannelBuffer} into a Base64-encoded {@link ChannelBuffer}.
@@ -42,7 +42,7 @@ import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.handler.codec.base64.Base64
+ * @apiviz.uses io.netty.handler.codec.base64.Base64
  */
 @Sharable
 public class Base64Encoder extends OneToOneEncoder {
diff --git a/src/main/java/org/jboss/netty/handler/codec/base64/package-info.java b/src/main/java/org/jboss/netty/handler/codec/base64/package-info.java
index 86f9987759..edf714207d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/base64/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/base64/package-info.java
@@ -17,9 +17,9 @@
 /**
  * Encoder and decoder which transform a
  * Base64-encoded
- * {@link java.lang.String} or {@link org.jboss.netty.buffer.ChannelBuffer}
- * into a decoded {@link org.jboss.netty.buffer.ChannelBuffer} and vice versa.
+ * {@link java.lang.String} or {@link io.netty.buffer.ChannelBuffer}
+ * into a decoded {@link io.netty.buffer.ChannelBuffer} and vice versa.
  *
  * @apiviz.exclude OneToOne(Encoder|Decoder)$
  */
-package org.jboss.netty.handler.codec.base64;
+package io.netty.handler.codec.base64;
diff --git a/src/main/java/org/jboss/netty/handler/codec/bytes/ByteArrayDecoder.java b/src/main/java/org/jboss/netty/handler/codec/bytes/ByteArrayDecoder.java
index 1c257908bf..79ceefe0c3 100644
--- a/src/main/java/org/jboss/netty/handler/codec/bytes/ByteArrayDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/bytes/ByteArrayDecoder.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.bytes;
+package io.netty.handler.codec.bytes;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.LengthFieldPrepender;
-import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.MessageEvent;
+import io.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.frame.LengthFieldPrepender;
+import io.netty.handler.codec.oneone.OneToOneDecoder;
 
 /**
  * Decodes a received {@link ChannelBuffer} into an array of bytes.
diff --git a/src/main/java/org/jboss/netty/handler/codec/bytes/ByteArrayEncoder.java b/src/main/java/org/jboss/netty/handler/codec/bytes/ByteArrayEncoder.java
index 9188cb59ac..de3829e06e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/bytes/ByteArrayEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/bytes/ByteArrayEncoder.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.bytes;
+package io.netty.handler.codec.bytes;
 
-import static org.jboss.netty.buffer.ChannelBuffers.wrappedBuffer;
+import static io.netty.buffer.ChannelBuffers.wrappedBuffer;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.LengthFieldPrepender;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.MessageEvent;
+import io.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.frame.LengthFieldPrepender;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 /**
  * Encodes the requested array of bytes into a {@link ChannelBuffer}.
diff --git a/src/main/java/org/jboss/netty/handler/codec/bytes/package-info.java b/src/main/java/org/jboss/netty/handler/codec/bytes/package-info.java
index b09bfe8bfd..b07b19ef0a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/bytes/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/bytes/package-info.java
@@ -16,8 +16,8 @@
 
 /**
  * Encoder and decoder which transform an array of bytes into a
- * {@link org.jboss.netty.buffer.ChannelBuffer} and vice versa.
+ * {@link io.netty.buffer.ChannelBuffer} and vice versa.
  *
  * @apiviz.exclude \.oneone\.
  */
-package org.jboss.netty.handler.codec.bytes;
+package io.netty.handler.codec.bytes;
diff --git a/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java b/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
index fdb200b109..c633409c57 100644
--- a/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/compression/CompressionException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.compression;
+package io.netty.handler.codec.compression;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java
index fe36a2a846..411704ec0e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibDecoder.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.compression;
+package io.netty.handler.codec.compression;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
-import org.jboss.netty.util.internal.jzlib.JZlib;
-import org.jboss.netty.util.internal.jzlib.ZStream;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.oneone.OneToOneDecoder;
+import io.netty.util.internal.jzlib.JZlib;
+import io.netty.util.internal.jzlib.ZStream;
 
 
 /**
@@ -31,7 +31,7 @@ import org.jboss.netty.util.internal.jzlib.ZStream;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.handler.codec.compression.ZlibWrapper
+ * @apiviz.has io.netty.handler.codec.compression.ZlibWrapper
  */
 public class ZlibDecoder extends OneToOneDecoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
index 03af8f1808..6ce6e5645e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibEncoder.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.compression;
+package io.netty.handler.codec.compression;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.LifeCycleAwareChannelHandler;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
-import org.jboss.netty.util.internal.jzlib.JZlib;
-import org.jboss.netty.util.internal.jzlib.ZStream;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.LifeCycleAwareChannelHandler;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.util.internal.jzlib.JZlib;
+import io.netty.util.internal.jzlib.ZStream;
 
 
 /**
@@ -39,7 +39,7 @@ import org.jboss.netty.util.internal.jzlib.ZStream;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.handler.codec.compression.ZlibWrapper
+ * @apiviz.has io.netty.handler.codec.compression.ZlibWrapper
  */
 public class ZlibEncoder extends OneToOneEncoder implements LifeCycleAwareChannelHandler {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
index d0ad7e2117..fe9852b1c3 100644
--- a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
+++ b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibUtil.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.compression;
+package io.netty.handler.codec.compression;
 
-import org.jboss.netty.util.internal.jzlib.JZlib;
-import org.jboss.netty.util.internal.jzlib.ZStream;
+import io.netty.util.internal.jzlib.JZlib;
+import io.netty.util.internal.jzlib.ZStream;
 
 /**
  * Utility methods used by {@link ZlibEncoder} and {@link ZlibDecoder}.
diff --git a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java
index 37f8bd630d..158d2af9d9 100644
--- a/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java
+++ b/src/main/java/org/jboss/netty/handler/codec/compression/ZlibWrapper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.compression;
+package io.netty.handler.codec.compression;
 
 /**
  * The container file formats that wrap the stream compressed by the DEFLATE
diff --git a/src/main/java/org/jboss/netty/handler/codec/compression/package-info.java b/src/main/java/org/jboss/netty/handler/codec/compression/package-info.java
index 9849fca863..a519203a5f 100644
--- a/src/main/java/org/jboss/netty/handler/codec/compression/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/compression/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * Encoder and decoder which compresses and decompresses {@link org.jboss.netty.buffer.ChannelBuffer}s
+ * Encoder and decoder which compresses and decompresses {@link io.netty.buffer.ChannelBuffer}s
  * in a compression format such as zlib
  * and gzip.
  *
@@ -24,5 +24,5 @@
  * @apiviz.exclude \.channel\.
  * @apiviz.exclude Exception$
  */
-package org.jboss.netty.handler.codec.compression;
+package io.netty.handler.codec.compression;
 // TODO Implement bzip2 and lzma handlers
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java b/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
index 8c56208198..74ee0b8c21 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/AbstractCodecEmbedder.java
@@ -13,27 +13,27 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.embedder;
+package io.netty.handler.codec.embedder;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.lang.reflect.Array;
 import java.util.ConcurrentModificationException;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineException;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.channel.DefaultChannelPipeline;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineException;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.DefaultChannelPipeline;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
 
 /**
  * A skeletal {@link CodecEmbedder} implementation.
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java b/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java
index 1cec8adaf5..681a457bea 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedder.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.embedder;
+package io.netty.handler.codec.embedder;
 
 import java.util.Collection;
 
-import org.jboss.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipeline;
 
 /**
  * A helper that wraps an encoder or a decoder (codec) so that they can be used
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedderException.java b/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedderException.java
index 367ed7ef78..bc260e62cf 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedderException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/CodecEmbedderException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.embedder;
+package io.netty.handler.codec.embedder;
 
 /**
  * A {@link RuntimeException} which is thrown when a {@link CodecEmbedder}
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java b/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
index 23e3ea2496..cffc315036 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/DecoderEmbedder.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.embedder;
+package io.netty.handler.codec.embedder;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.base64.Base64Decoder;
-import org.jboss.netty.handler.codec.string.StringDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.handler.codec.base64.Base64Decoder;
+import io.netty.handler.codec.string.StringDecoder;
 
 /**
  * A helper that wraps a decoder so that it can be used without doing actual
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannel.java b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannel.java
index c5f2019ed9..4ce481c66b 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannel.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannel.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.embedder;
+package io.netty.handler.codec.embedder;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.DefaultChannelConfig;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.DefaultChannelConfig;
 
 /**
  * TODO Make EmbeddedChannel implement ChannelConfig and ChannelSink to reduce overhead.
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannelFactory.java b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannelFactory.java
index b4b3b0d831..554ceb1f3c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannelFactory.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedChannelFactory.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.embedder;
+package io.netty.handler.codec.embedder;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedSocketAddress.java b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedSocketAddress.java
index abc647a82c..fb45026c14 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedSocketAddress.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/EmbeddedSocketAddress.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.embedder;
+package io.netty.handler.codec.embedder;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java b/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java
index da3cc83c26..ea0c16e2f6 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/EncoderEmbedder.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.embedder;
+package io.netty.handler.codec.embedder;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.base64.Base64Encoder;
-import org.jboss.netty.handler.codec.string.StringEncoder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.base64.Base64Encoder;
+import io.netty.handler.codec.string.StringEncoder;
+import io.netty.util.CharsetUtil;
 
 /**
  * A helper that wraps an encoder so that it can be used without doing actual
diff --git a/src/main/java/org/jboss/netty/handler/codec/embedder/package-info.java b/src/main/java/org/jboss/netty/handler/codec/embedder/package-info.java
index 31086ec23b..adc00bec45 100644
--- a/src/main/java/org/jboss/netty/handler/codec/embedder/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/embedder/package-info.java
@@ -20,5 +20,5 @@
  *
  * @apiviz.exclude CodecEmbedder$
  */
-package org.jboss.netty.handler.codec.embedder;
+package io.netty.handler.codec.embedder;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/CorruptedFrameException.java b/src/main/java/org/jboss/netty/handler/codec/frame/CorruptedFrameException.java
index 99fbd1fcc1..bb28d44810 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/CorruptedFrameException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/CorruptedFrameException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
 /**
  * An {@link Exception} which is thrown when the received frame data can not
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
index 4bb88a1433..41bf742291 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.Channels;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.Channels;
 
 /**
  * A decoder that splits the received {@link ChannelBuffer}s by one or more
@@ -58,7 +58,7 @@ import org.jboss.netty.channel.Channels;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.uses org.jboss.netty.handler.codec.frame.Delimiters - - useful
+ * @apiviz.uses io.netty.handler.codec.frame.Delimiters - - useful
  */
 public class DelimiterBasedFrameDecoder extends FrameDecoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/Delimiters.java b/src/main/java/org/jboss/netty/handler/codec/frame/Delimiters.java
index 57bfe37daf..8070e2638d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/Delimiters.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/Delimiters.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * A set of commonly used delimiters for {@link DelimiterBasedFrameDecoder}.
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/FixedLengthFrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/frame/FixedLengthFrameDecoder.java
index 98a3774eff..26c88f1956 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/FixedLengthFrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/FixedLengthFrameDecoder.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
 
 /**
  * A decoder that splits the received {@link ChannelBuffer}s by the fixed number
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java
index 2323ab9967..482b78a820 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.Channels;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.replay.ReplayingDecoder;
 
 /**
  * Decodes the received {@link ChannelBuffer}s into a meaningful frame object.
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java
index 55851e7672..08c99985f0 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.handler.codec.serialization.ObjectDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.Channels;
+import io.netty.handler.codec.serialization.ObjectDecoder;
 
 /**
  * A decoder that splits the received {@link ChannelBuffer}s dynamically by the
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldPrepender.java b/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldPrepender.java
index 6ae8d57730..d46de5a27a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldPrepender.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/LengthFieldPrepender.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
 import java.nio.ByteOrder;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 /**
  * An encoder that prepends the length of the message.  The length value is
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java b/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java
index 58d09a0df9..ae40e7d23d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
 /**
  * An {@link Exception} which is thrown when the length of the frame
diff --git a/src/main/java/org/jboss/netty/handler/codec/frame/package-info.java b/src/main/java/org/jboss/netty/handler/codec/frame/package-info.java
index c47c8afe8c..97f2afda4e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/frame/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/package-info.java
@@ -24,4 +24,4 @@
  * @apiviz.exclude \.codec\.[a-eg-z][a-z0-9]*\.
  * @apiviz.exclude \.ssl\.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java b/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java
index 2d179d3a30..1bd969dd42 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/AbstractDiskHttpData.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,8 +24,8 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * Abstract Disk HttpData implementation
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/AbstractHttpData.java b/src/main/java/org/jboss/netty/handler/codec/http/AbstractHttpData.java
index d4358e1a28..84082e32ca 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/AbstractHttpData.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/AbstractHttpData.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.nio.charset.Charset;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/AbstractMemoryHttpData.java b/src/main/java/org/jboss/netty/handler/codec/http/AbstractMemoryHttpData.java
index d5cdaf99bd..f7ee36ad00 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/AbstractMemoryHttpData.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/AbstractMemoryHttpData.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,8 +24,8 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.nio.charset.Charset;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * Abstract Memory HttpData implementation
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/Attribute.java b/src/main/java/org/jboss/netty/handler/codec/http/Attribute.java
index 5e3b87b223..e31bf3e61c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/Attribute.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/Attribute.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/CaseIgnoringComparator.java b/src/main/java/org/jboss/netty/handler/codec/http/CaseIgnoringComparator.java
index ae0ab368b7..a4f5767a3d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/CaseIgnoringComparator.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/CaseIgnoringComparator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/Cookie.java b/src/main/java/org/jboss/netty/handler/codec/http/Cookie.java
index 34e0f54b3b..64635ec8ef 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/Cookie.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/Cookie.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.Set;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
index 9db44ff538..61766b3d1a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/CookieDecoder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -40,7 +40,7 @@ import java.util.regex.Pattern;
  * @see CookieEncoder
  *
  * @apiviz.stereotype utility
- * @apiviz.has        org.jboss.netty.handler.codec.http.Cookie oneway - - decodes
+ * @apiviz.has        io.netty.handler.codec.http.Cookie oneway - - decodes
  */
 public class CookieDecoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java
index c51fdf157e..19b0a7e55b 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/CookieEncoder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.Date;
 import java.util.Set;
@@ -48,7 +48,7 @@ import java.util.TreeSet;
  * @see CookieDecoder
  *
  * @apiviz.stereotype utility
- * @apiviz.has        org.jboss.netty.handler.codec.http.Cookie oneway - - encodes
+ * @apiviz.has        io.netty.handler.codec.http.Cookie oneway - - encodes
  */
 public class CookieEncoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/CookieHeaderNames.java b/src/main/java/org/jboss/netty/handler/codec/http/CookieHeaderNames.java
index 9eb07d0d10..c900a7fdfe 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/CookieHeaderNames.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/CookieHeaderNames.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java
index 52d0f31bc2..0d5b7aed43 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.Collections;
 import java.util.Set;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpChunk.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpChunk.java
index a678a45eb2..f4a804d648 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpChunk.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpChunk.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * The default {@link HttpChunk} implementation.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpChunkTrailer.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpChunkTrailer.java
index d9394f19d8..3d957caec9 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpChunkTrailer.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpChunkTrailer.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * The default {@link HttpChunkTrailer} implementation.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpDataFactory.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpDataFactory.java
index b98e235cd3..3431c9ec81 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpDataFactory.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpDataFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -114,7 +114,7 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
     }
 
     /* (non-Javadoc)
-     * @see org.jboss.netty.handler.codec.http2.HttpDataFactory#createAttribute(java.lang.String, java.lang.String)
+     * @see io.netty.handler.codec.http2.HttpDataFactory#createAttribute(java.lang.String, java.lang.String)
      */
     @Override
     public Attribute createAttribute(HttpRequest request, String name, String value)
@@ -144,7 +144,7 @@ public class DefaultHttpDataFactory implements HttpDataFactory {
     }
 
     /* (non-Javadoc)
-     * @see org.jboss.netty.handler.codec.http2.HttpDataFactory#createFileUpload(java.lang.String, java.lang.String, java.lang.String)
+     * @see io.netty.handler.codec.http2.HttpDataFactory#createFileUpload(java.lang.String, java.lang.String, java.lang.String)
      */
     @Override
     public FileUpload createFileUpload(HttpRequest request, String name, String filename,
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java
index 77e5930736..42b9c21863 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpMessage.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.util.internal.StringUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.util.internal.StringUtil;
 
 /**
  * The default {@link HttpMessage} implementation.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpRequest.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpRequest.java
index 597d2d4681..acdc488aa0 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpRequest.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpRequest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.util.internal.StringUtil;
+import io.netty.util.internal.StringUtil;
 
 /**
  * The default {@link HttpRequest} implementation.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpResponse.java b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpResponse.java
index 0f2a37b0b7..3e3a900f2e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpResponse.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DefaultHttpResponse.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.util.internal.StringUtil;
+import io.netty.util.internal.StringUtil;
 
 /**
  * The default {@link HttpResponse} implementation.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DiskAttribute.java b/src/main/java/org/jboss/netty/handler/codec/http/DiskAttribute.java
index ff7b7ffdb1..0f6a43565f 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DiskAttribute.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DiskAttribute.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.IOException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * Disk implementation of Attributes
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/DiskFileUpload.java b/src/main/java/org/jboss/netty/handler/codec/http/DiskFileUpload.java
index f19336d267..a2aaf1c2b2 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/DiskFileUpload.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/DiskFileUpload.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -57,7 +57,7 @@ public class DiskFileUpload extends AbstractDiskHttpData implements FileUpload {
     }
 
     /* (non-Javadoc)
-     * @see org.jboss.netty.handler.codec.http2.FileUpload#getFilename()
+     * @see io.netty.handler.codec.http2.FileUpload#getFilename()
      */
     @Override
     public String getFilename() {
@@ -65,7 +65,7 @@ public class DiskFileUpload extends AbstractDiskHttpData implements FileUpload {
     }
 
     /* (non-Javadoc)
-     * @see org.jboss.netty.handler.codec.http2.FileUpload#setFilename(java.lang.String)
+     * @see io.netty.handler.codec.http2.FileUpload#setFilename(java.lang.String)
      */
     @Override
     public void setFilename(String filename) {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/FileUpload.java b/src/main/java/org/jboss/netty/handler/codec/http/FileUpload.java
index 1a32ba433d..e7af85af8b 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/FileUpload.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/FileUpload.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 /**
  * FileUpload interface that could be in memory, on temporary file or any other implementations.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunk.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunk.java
index 2219725579..f064eb5bfc 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunk.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunk.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelPipeline;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelPipeline;
 
 /**
  * An HTTP chunk which is used for HTTP chunked transfer-encoding.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
index af5a518e8f..7617a07ba7 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkAggregator.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import static org.jboss.netty.channel.Channels.*;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.*;
+import static io.netty.channel.Channels.*;
+import static io.netty.handler.codec.http.HttpHeaders.*;
 
 import java.util.List;
 import java.util.Map.Entry;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.util.CharsetUtil;
 
 /**
  * A {@link ChannelHandler} that aggregates an {@link HttpMessage}
@@ -52,7 +52,7 @@ import org.jboss.netty.util.CharsetUtil;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.handler.codec.http.HttpChunk oneway - - filters out
+ * @apiviz.has io.netty.handler.codec.http.HttpChunk oneway - - filters out
  */
 public class HttpChunkAggregator extends SimpleChannelUpstreamHandler {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkTrailer.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkTrailer.java
index 5d4cfa66d7..3242840dcb 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkTrailer.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpChunkTrailer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpClientCodec.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpClientCodec.java
index 6a4f8056a6..630309ffe4 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpClientCodec.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpClientCodec.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.Queue;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.util.internal.QueueFactory;
 
 /**
  * A combination of {@link HttpRequestEncoder} and {@link HttpResponseDecoder}
@@ -39,8 +39,8 @@ import org.jboss.netty.util.internal.QueueFactory;
  *
  * @see HttpServerCodec
  *
- * @apiviz.has org.jboss.netty.handler.codec.http.HttpResponseDecoder
- * @apiviz.has org.jboss.netty.handler.codec.http.HttpRequestEncoder
+ * @apiviz.has io.netty.handler.codec.http.HttpResponseDecoder
+ * @apiviz.has io.netty.handler.codec.http.HttpRequestEncoder
  */
 public class HttpClientCodec implements ChannelUpstreamHandler,
         ChannelDownstreamHandler {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java
index 9b881aa618..eac009f3a4 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpCodecUtil.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.nio.charset.Charset;
 import java.util.List;
 
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.util.CharsetUtil;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
index 4050d3f21b..703a64946a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentCompressor.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.compression.ZlibEncoder;
-import org.jboss.netty.handler.codec.compression.ZlibWrapper;
-import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.codec.compression.ZlibEncoder;
+import io.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.handler.codec.embedder.EncoderEmbedder;
 
 /**
  * Compresses an {@link HttpMessage} and an {@link HttpChunk} in {@code gzip} or
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
index 15e8dec26b..14495fe1d9 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecoder.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.embedder.DecoderEmbedder;
 
 /**
  * Decodes the content of the received {@link HttpRequest} and {@link HttpChunk}.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
index 372f57bfec..e27156e359 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentDecompressor.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.compression.ZlibDecoder;
-import org.jboss.netty.handler.codec.compression.ZlibWrapper;
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.codec.compression.ZlibDecoder;
+import io.netty.handler.codec.compression.ZlibWrapper;
+import io.netty.handler.codec.embedder.DecoderEmbedder;
 
 /**
  * Decompresses an {@link HttpMessage} and an {@link HttpChunk} compressed in
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
index 6cac360ce5..d6dcc5b87c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpContentEncoder.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.Queue;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelHandler;
+import io.netty.handler.codec.embedder.EncoderEmbedder;
+import io.netty.util.internal.QueueFactory;
 
 /**
  * Encodes the content of the outbound {@link HttpResponse} and {@link HttpChunk}.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpData.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpData.java
index c0abd165f5..507bf0cc01 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpData.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpData.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * Extended interface for InterfaceHttpData
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpDataFactory.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpDataFactory.java
index 019171fa0b..d4cddda2ff 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpDataFactory.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpDataFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.nio.charset.Charset;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormat.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormat.java
index d22a086277..7e6a983812 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormat.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormat.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java
index 8d6f8082b6..a00c755959 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpHeaders.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.text.ParseException;
 import java.util.Calendar;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java
index 653c4160e4..748224ad05 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessage.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -21,8 +21,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * An HTTP message which provides common properties for {@link HttpRequest} and
@@ -35,7 +35,7 @@ import org.jboss.netty.buffer.ChannelBuffers;
  * @see HttpHeaders
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.handler.codec.http.HttpChunk oneway - - is followed by
+ * @apiviz.has io.netty.handler.codec.http.HttpChunk oneway - - is followed by
  */
 public interface HttpMessage {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
index dc49176f65..cf0e4a298f 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageDecoder.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.List;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.replay.ReplayingDecoder;
 
 /**
  * Decodes {@link ChannelBuffer}s into {@link HttpMessage}s and
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java
index 494530e54f..221f4ae95f 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMessageEncoder.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
-import static org.jboss.netty.handler.codec.http.HttpCodecUtil.*;
+import static io.netty.buffer.ChannelBuffers.*;
+import static io.netty.handler.codec.http.HttpCodecUtil.*;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Map;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.util.CharsetUtil;
 
 /**
  * Encodes an {@link HttpMessage} or an {@link HttpChunk} into
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpMethod.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpMethod.java
index 0f9e70c389..f9b9bd18e7 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpMethod.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpMethod.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostBodyUtil.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostBodyUtil.java
index f7390795d6..70470097c9 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostBodyUtil.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostBodyUtil.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.nio.charset.Charset;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.util.CharsetUtil;
 
 /**
  * Shared Static object between HttpMessageDecoder, HttpPostRequestDecoder and HttpPostRequestEncoder
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java
index bc411e87ed..b08b0e73ac 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestDecoder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -24,9 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.codec.http.HttpPostBodyUtil.TransferEncodingMechanism;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.handler.codec.http.HttpPostBodyUtil.TransferEncodingMechanism;
 
 /**
  * This decoder will decode Body and can handle POST BODY.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestEncoder.java
index 68890d59eb..48d46164ab 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpPostRequestEncoder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.File;
 import java.io.IOException;
@@ -25,9 +25,9 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Random;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.stream.ChunkedInput;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.handler.stream.ChunkedInput;
 
 /**
  * This encoder will help to encode Request for a FORM as POST.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequest.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequest.java
index 212622ff7e..1a0b7c8af8 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequest.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java
index ce7a68f157..217dde15eb 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestDecoder.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.frame.TooLongFrameException;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestEncoder.java
index 4e9001bfcc..e926812817 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpRequestEncoder.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import static org.jboss.netty.handler.codec.http.HttpCodecUtil.*;
+import static io.netty.handler.codec.http.HttpCodecUtil.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * Encodes an {@link HttpRequest} or an {@link HttpChunk} into
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponse.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponse.java
index 7d8e7b39d0..a924c775bb 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponse.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponse.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java
index 1870124c1a..6fe666618c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseDecoder.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.frame.TooLongFrameException;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseEncoder.java
index 0caeea2968..9b965df430 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseEncoder.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import static org.jboss.netty.handler.codec.http.HttpCodecUtil.*;
+import static io.netty.handler.codec.http.HttpCodecUtil.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * Encodes an {@link HttpResponse} or an {@link HttpChunk} into
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseStatus.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseStatus.java
index 480f1eaa25..809d0fa170 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseStatus.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpResponseStatus.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 /**
  * The response code and its description of HTTP or its derived protocols, such as
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpServerCodec.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpServerCodec.java
index d2696bf051..d9a0cc73ff 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpServerCodec.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpServerCodec.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelUpstreamHandler;
 
 /**
  * A combination of {@link HttpRequestDecoder} and {@link HttpResponseEncoder}
@@ -29,8 +29,8 @@ import org.jboss.netty.channel.ChannelUpstreamHandler;
  *
  * @see HttpClientCodec
  *
- * @apiviz.has org.jboss.netty.handler.codec.http.HttpRequestDecoder
- * @apiviz.has org.jboss.netty.handler.codec.http.HttpResponseEncoder
+ * @apiviz.has io.netty.handler.codec.http.HttpRequestDecoder
+ * @apiviz.has io.netty.handler.codec.http.HttpResponseEncoder
  */
 public class HttpServerCodec implements ChannelUpstreamHandler,
         ChannelDownstreamHandler {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java b/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java
index 70c73f8c93..604368d847 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/HttpVersion.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/InterfaceHttpData.java b/src/main/java/org/jboss/netty/handler/codec/http/InterfaceHttpData.java
index 238d42b22a..ca612a8e45 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/InterfaceHttpData.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/InterfaceHttpData.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 /**
  * Interface for all Objects that could be encoded/decoded using HttpPostRequestEncoder/Decoder
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/InternalAttribute.java b/src/main/java/org/jboss/netty/handler/codec/http/InternalAttribute.java
index e58a7a74dc..86308b5ca5 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/InternalAttribute.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/InternalAttribute.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/MemoryAttribute.java b/src/main/java/org/jboss/netty/handler/codec/http/MemoryAttribute.java
index 040fcf7da2..6a5f2c14f7 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/MemoryAttribute.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/MemoryAttribute.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.IOException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * Memory implementation of Attributes
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/MemoryFileUpload.java b/src/main/java/org/jboss/netty/handler/codec/http/MemoryFileUpload.java
index b6ed05d9df..4bce6639ec 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/MemoryFileUpload.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/MemoryFileUpload.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.nio.charset.Charset;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/MixedAttribute.java b/src/main/java/org/jboss/netty/handler/codec/http/MixedAttribute.java
index 8a70125c68..b646ef6cf0 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/MixedAttribute.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/MixedAttribute.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * Mixed implementation using both in Memory and in File with a limit of size
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/MixedFileUpload.java b/src/main/java/org/jboss/netty/handler/codec/http/MixedFileUpload.java
index 8c7df5e4ed..863ea2a50d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/MixedFileUpload.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/MixedFileUpload.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * Mixed implementation using both in Memory and in File with a limit of size
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java
index bc99e4ff15..a11942ce7c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringDecoder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.net.URI;
 import java.net.URLDecoder;
@@ -24,7 +24,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.util.CharsetUtil;
 
 /**
  * Splits an HTTP query string into a path string and key-value parameter pairs.
@@ -45,7 +45,7 @@ import org.jboss.netty.util.CharsetUtil;
  * @see QueryStringEncoder
  *
  * @apiviz.stereotype utility
- * @apiviz.has        org.jboss.netty.handler.codec.http.HttpRequest oneway - - decodes
+ * @apiviz.has        io.netty.handler.codec.http.HttpRequest oneway - - decodes
  */
 public class QueryStringDecoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java
index 8f465abbc2..f1ea12733c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/QueryStringEncoder.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URI;
@@ -41,7 +41,7 @@ import java.util.List;
  * @see QueryStringDecoder
  *
  * @apiviz.stereotype utility
- * @apiviz.has        org.jboss.netty.handler.codec.http.HttpRequest oneway - - encodes
+ * @apiviz.has        io.netty.handler.codec.http.HttpRequest oneway - - encodes
  */
 public class QueryStringEncoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/package-info.java b/src/main/java/org/jboss/netty/handler/codec/http/package-info.java
index 487d7c48cd..9c245a3d02 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/package-info.java
@@ -26,4 +26,4 @@
  * @apiviz.exclude \.Default
  * @apiviz.exclude \.Http(Client|Server)Codec$
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocket/DefaultWebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocket/DefaultWebSocketFrame.java
index ccfb3a1e02..33bef4cdc9 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocket/DefaultWebSocketFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocket/DefaultWebSocketFrame.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocket;
+package io.netty.handler.codec.http.websocket;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.util.CharsetUtil;
 
 /**
  * The default {@link WebSocketFrame} implementation.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrame.java
index 227f5ff253..cf1d57c85e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrame.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocket;
+package io.netty.handler.codec.http.websocket;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * A Web Socket frame that represents either text or binary data.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrameDecoder.java
index e4cb535100..87afd12e48 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrameDecoder.java
@@ -13,28 +13,28 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocket;
+package io.netty.handler.codec.http.websocket;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
-import org.jboss.netty.handler.codec.replay.VoidEnum;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.replay.ReplayingDecoder;
+import io.netty.handler.codec.replay.VoidEnum;
 
 /**
  * Decodes {@link ChannelBuffer}s into {@link WebSocketFrame}s.
  * 

  * For the detailed instruction on adding add Web Socket support to your HTTP
  * server, take a look into the WebSocketServer example located in the
- * {@code org.jboss.netty.example.http.websocket} package.
+ * {@code io.netty.example.http.websocket} package.
  *
  * @author The Netty Project
  * @author Mike Heath (mheath@apache.org)
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.handler.codec.http.websocket.WebSocketFrame
+ * @apiviz.uses io.netty.handler.codec.http.websocket.WebSocketFrame
  */
 public class WebSocketFrameDecoder extends ReplayingDecoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrameEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrameEncoder.java
index ace12939da..914c080292 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrameEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocket/WebSocketFrameEncoder.java
@@ -13,27 +13,27 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocket;
+package io.netty.handler.codec.http.websocket;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 /**
  * Encodes a {@link WebSocketFrame} into a {@link ChannelBuffer}.
  * 

  * For the detailed instruction on adding add Web Socket support to your HTTP
  * server, take a look into the WebSocketServer example located in the
- * {@code org.jboss.netty.example.http.websocket} package.
+ * {@code io.netty.example.http.websocket} package.
  *
  * @author The Netty Project
  * @author Mike Heath (mheath@apache.org)
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.handler.codec.http.websocket.WebSocketFrame
+ * @apiviz.uses io.netty.handler.codec.http.websocket.WebSocketFrame
  */
 @Sharable
 public class WebSocketFrameEncoder extends OneToOneEncoder {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocket/package-info.java b/src/main/java/org/jboss/netty/handler/codec/http/websocket/package-info.java
index caebf4ee0b..a680614e72 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocket/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocket/package-info.java
@@ -20,10 +20,10 @@
  * 

  * For the detailed instruction on adding add Web Socket support to your HTTP
  * server, take a look into the WebSocketServer example located in the
- * {@code org.jboss.netty.example.http.websocket} package.
+ * {@code io.netty.example.http.websocket} package.
  * *
  * @apiviz.exclude OneToOne(Encoder|Decoder)$
  * @apiviz.exclude \.codec\.replay\.
  * @apiviz.exclude \.Default
  */
-package org.jboss.netty.handler.codec.http.websocket;
+package io.netty.handler.codec.http.websocket;
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java
index fd52192ba5..b261f7907d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * Web Socket frame containing binary data
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java
index 732893c715..b3c882c16b 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * Web Socket Frame for closing the connection
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
index fd613fb97c..a78d959eef 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.util.CharsetUtil;
 
 /**
  * Web Socket continuation frame containing continuation text or binary data.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/PingWebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
index 48c9ea4f9c..37c1094343 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * Web Socket frame containing binary data
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/PongWebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
index 123000964f..893e51726c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * Web Socket frame containing binary data
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/TextWebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
index 97e0d45ebc..b58c84bfca 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.util.CharsetUtil;
 
 /**
  * Web Socket text frame with assumed UTF-8 encoding
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/UTF8Exception.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/UTF8Exception.java
index fbffd9c7eb..5bf802f0cc 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/UTF8Exception.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/UTF8Exception.java
@@ -17,7 +17,7 @@
  *     CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
  *     IN THE SOFTWARE.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 /**
  * Invalid UTF8 bytes encountered
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/UTF8Output.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/UTF8Output.java
index 70e2bec308..f2e6ddff78 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/UTF8Output.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/UTF8Output.java
@@ -17,7 +17,7 @@
  *     CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS 
  *     IN THE SOFTWARE.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 /**
  * Checks UTF8 bytes for validity before converting it into a string
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java
index 8e3e215486..db74f7f95e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java
@@ -13,28 +13,28 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
-import org.jboss.netty.handler.codec.replay.VoidEnum;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.replay.ReplayingDecoder;
+import io.netty.handler.codec.replay.VoidEnum;
 
 /**
  * Decodes {@link ChannelBuffer}s into {@link WebSocketFrame}s.
  * 

  * For the detailed instruction on adding add Web Socket support to your HTTP
  * server, take a look into the WebSocketServer example located in the
- * {@code org.jboss.netty.example.http.websocket} package.
+ * {@code io.netty.example.http.websocket} package.
  * 
  * @author The Netty Project
  * @author Mike Heath (mheath@apache.org)
  * @author Trustin Lee
  * 
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.handler.codec.http.websocket.WebSocketFrame
+ * @apiviz.uses io.netty.handler.codec.http.websocket.WebSocketFrame
  */
 public class WebSocket00FrameDecoder extends ReplayingDecoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java
index 8735911d48..0bf7355964 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java
@@ -13,27 +13,27 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 /**
  * Encodes a {@link WebSocketFrame} into a {@link ChannelBuffer}.
  * 

  * For the detailed instruction on adding add Web Socket support to your HTTP
  * server, take a look into the WebSocketServer example located in the
- * {@code org.jboss.netty.example.http.websocket} package.
+ * {@code io.netty.example.http.websocket} package.
  * 
  * @author The Netty Project
  * @author Mike Heath (mheath@apache.org)
  * @author Trustin Lee
  * 
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.handler.codec.http.websocket.WebSocketFrame
+ * @apiviz.uses io.netty.handler.codec.http.websocket.WebSocketFrame
  */
 @Sharable
 public class WebSocket00FrameEncoder extends OneToOneEncoder {
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
index 76d0988b8d..aab3c9cb0b 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
@@ -36,18 +36,18 @@
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.CorruptedFrameException;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.frame.CorruptedFrameException;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.replay.ReplayingDecoder;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * Decodes a web socket frame from wire protocol version 8 format. This code was
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java
index 9270a2f7c7..5677ac4b07 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java
@@ -36,18 +36,18 @@
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 import java.nio.ByteBuffer;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * 

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java
index 5cf746952a..55f14b0eb0 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java
@@ -36,7 +36,7 @@
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 /**
  * Decodes a web socket frame from wire protocol version 13 format.
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java
index fb63448a77..34c6cc8cc5 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java
@@ -36,7 +36,7 @@
 // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
index c362dba8d5..7458758ef4 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 import java.net.URI;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.base64.Base64;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.util.CharsetUtil;
 
 /**
  * Base class for web socket client handshake implementations
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
index 51f27c4978..00cd1a2111 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
-import org.jboss.netty.handler.codec.http.HttpMethod;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpVersion;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaders.Values;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
 
 /**
  * 

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker10.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker10.java
index b68c97fc7f..2d196e7a77 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker10.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker10.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 import java.net.URI;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
-import org.jboss.netty.handler.codec.http.HttpMethod;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpVersion;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaders.Values;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.CharsetUtil;
 
 /**
  * 

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker17.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker17.java
index 8d7b2caf37..cd3026d229 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker17.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshaker17.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 import java.net.URI;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
-import org.jboss.netty.handler.codec.http.HttpMethod;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpVersion;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaders.Values;
+import io.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.CharsetUtil;
 
 /**
  * 

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java
index c908b13f6e..411a9446c2 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 import java.net.URI;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketFrame.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketFrame.java
index c9245fa68b..0cdfe126f0 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketFrame.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketFrame.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * Base class for web socket frames
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketFrameType.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketFrameType.java
index 385a2fd5cb..88fa69119d 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketFrameType.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketFrameType.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 /**
  * Type of web socket frames
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java
index 13b3f5b56e..895a4be4df 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 /**
  * Exception during handshaking process
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
index 9d8c7a7a5f..f297af39b4 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.base64.Base64;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.base64.Base64;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.util.CharsetUtil;
 
 /**
  * Base class for server side web socket opening and closing handshakes
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
index ea63380d04..01f6c5214f 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
@@ -13,35 +13,35 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY1;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY2;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_LOCATION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_LOCATION;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_ORIGIN;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_PROTOCOL;
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
-import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static io.netty.handler.codec.http.HttpHeaders.Names.CONNECTION;
+import static io.netty.handler.codec.http.HttpHeaders.Names.ORIGIN;
+import static io.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY1;
+import static io.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_KEY2;
+import static io.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_LOCATION;
+import static io.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_ORIGIN;
+import static io.netty.handler.codec.http.HttpHeaders.Names.SEC_WEBSOCKET_PROTOCOL;
+import static io.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_LOCATION;
+import static io.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_ORIGIN;
+import static io.netty.handler.codec.http.HttpHeaders.Names.WEBSOCKET_PROTOCOL;
+import static io.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
 import java.security.NoSuchAlgorithmException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Values;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpHeaders.Values;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * 

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker10.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker10.java
index 40d5dfa032..af00e86d62 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker10.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker10.java
@@ -13,25 +13,25 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
-import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static io.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
 import java.security.NoSuchAlgorithmException;
 
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.CharsetUtil;
 
 /**
  * 

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker17.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker17.java
index 8a9ac4aeb5..79c46e45b9 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker17.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshaker17.java
@@ -13,25 +13,25 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import static org.jboss.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
-import static org.jboss.netty.handler.codec.http.HttpVersion.HTTP_1_1;
+import static io.netty.handler.codec.http.HttpHeaders.Values.WEBSOCKET;
+import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
 
 import java.security.NoSuchAlgorithmException;
 
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.CharsetUtil;
 
 /**
  * 

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java
index f1306b572e..ee21f052b1 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
-import org.jboss.netty.handler.codec.http.HttpVersion;
-import org.jboss.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 
 /**
  * Instances the appropriate handshake class to use for clients
diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketSpecificationVersion.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketSpecificationVersion.java
index 58a160a998..65d2631632 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketSpecificationVersion.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/WebSocketSpecificationVersion.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
 /**
  * 

diff --git a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/package-info.java b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/package-info.java
index 8f642dcff2..d566afa2fd 100644
--- a/src/main/java/org/jboss/netty/handler/codec/http/websocketx/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/http/websocketx/package-info.java
@@ -27,18 +27,18 @@
  * 

  * 

  * In the future, as the specification develops, more versions will be supported.
- * This contrasts the org.jboss.netty.handler.codec.http.websocket package which only
+ * This contrasts the io.netty.handler.codec.http.websocket package which only
  * supports draft-ietf-hybi-thewebsocketprotocol-00.  
  * 

  * 

  * For the detailed instruction on adding add Web Socket support to your HTTP
  * server, take a look into the WebSocketServerX example located in the
- * {@code org.jboss.netty.example.http.websocket} package.
+ * {@code io.netty.example.http.websocket} package.
  * 
 
  * 
  * @apiviz.exclude OneToOne(Encoder|Decoder)$
  * @apiviz.exclude \.codec\.replay\.
  * @apiviz.exclude \.Default
  */
-package org.jboss.netty.handler.codec.http.websocketx;
+package io.netty.handler.codec.http.websocketx;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneDecoder.java b/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneDecoder.java
index 2c464b239e..f2fc5dd929 100644
--- a/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneDecoder.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.oneone;
+package io.netty.handler.codec.oneone;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.MessageEvent;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.frame.FrameDecoder;
 
 /**
  * Transforms a received message into another message.  Please note that this
diff --git a/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneEncoder.java b/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneEncoder.java
index 8651094ac5..59281b59de 100644
--- a/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/oneone/OneToOneEncoder.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.oneone;
+package io.netty.handler.codec.oneone;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.MessageEvent;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
 
 /**
  * Transforms a write request into another write request.  A typical setup for
diff --git a/src/main/java/org/jboss/netty/handler/codec/oneone/package-info.java b/src/main/java/org/jboss/netty/handler/codec/oneone/package-info.java
index d19179bf8a..af0b8184f3 100644
--- a/src/main/java/org/jboss/netty/handler/codec/oneone/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/oneone/package-info.java
@@ -20,4 +20,4 @@
  *
  * @apiviz.exclude \.codec\.(?!oneone)[a-z0-9]+\.
  */
-package org.jboss.netty.handler.codec.oneone;
+package io.netty.handler.codec.oneone;
diff --git a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufDecoder.java b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufDecoder.java
index 900918882c..3bfd21b533 100644
--- a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufDecoder.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.protobuf;
+package io.netty.handler.codec.protobuf;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferInputStream;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
-import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.LengthFieldPrepender;
-import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferInputStream;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.MessageEvent;
+import io.netty.handler.codec.frame.FrameDecoder;
+import io.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.frame.LengthFieldPrepender;
+import io.netty.handler.codec.oneone.OneToOneDecoder;
 
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.Message;
diff --git a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufEncoder.java b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufEncoder.java
index 8568ca5261..ebe43f337f 100644
--- a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufEncoder.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.protobuf;
+package io.netty.handler.codec.protobuf;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.LengthFieldPrepender;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
+import io.netty.handler.codec.frame.LengthFieldPrepender;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 import com.google.protobuf.Message;
 import com.google.protobuf.MessageLite;
diff --git a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
index ff531137f3..0304695ecc 100644
--- a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.protobuf;
+package io.netty.handler.codec.protobuf;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.CorruptedFrameException;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.frame.CorruptedFrameException;
+import io.netty.handler.codec.frame.FrameDecoder;
 
 import com.google.protobuf.CodedInputStream;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
index dfcdbb1bcf..a63aff78a7 100644
--- a/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
+++ b/src/main/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.protobuf;
+package io.netty.handler.codec.protobuf;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferOutputStream;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferOutputStream;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 import com.google.protobuf.CodedOutputStream;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/protobuf/package-info.java b/src/main/java/org/jboss/netty/handler/codec/protobuf/package-info.java
index 82b5c798a3..41658e8119 100644
--- a/src/main/java/org/jboss/netty/handler/codec/protobuf/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/protobuf/package-info.java
@@ -17,10 +17,10 @@
 /**
  * Encoder and decoder which transform a
  * Google Protocol Buffers
- * {@link com.google.protobuf.Message} into a {@link org.jboss.netty.buffer.ChannelBuffer}
+ * {@link com.google.protobuf.Message} into a {@link io.netty.buffer.ChannelBuffer}
  * and vice versa.
  *
  * @apiviz.exclude \.oneone\.
  * @apiviz.exclude \.frame\.
  */
-package org.jboss.netty.handler.codec.protobuf;
+package io.netty.handler.codec.protobuf;
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java
index 80b7d69a2b..367317dc5a 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.replay;
+package io.netty.handler.codec.replay;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
index b92594411e..2614438e68 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.replay;
+package io.netty.handler.codec.replay;
 
 import java.net.SocketAddress;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.frame.FrameDecoder;
 
 /**
  * A specialized variation of {@link FrameDecoder} which enables implementation
@@ -286,7 +286,7 @@ import org.jboss.netty.handler.codec.frame.FrameDecoder;
  *        the state type; use {@link VoidEnum} if state management is unused
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.handler.codec.replay.UnreplayableOperationException oneway - - throws
+ * @apiviz.has io.netty.handler.codec.replay.UnreplayableOperationException oneway - - throws
  */
 public abstract class ReplayingDecoder>
         extends SimpleChannelUpstreamHandler {
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java
index 79e5b090c9..8758600450 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.replay;
+package io.netty.handler.codec.replay;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -24,10 +24,10 @@ import java.nio.channels.GatheringByteChannel;
 import java.nio.channels.ScatteringByteChannel;
 import java.nio.charset.Charset;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.ChannelBufferIndexFinder;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.ChannelBufferIndexFinder;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/UnreplayableOperationException.java b/src/main/java/org/jboss/netty/handler/codec/replay/UnreplayableOperationException.java
index 832d439a68..5ec8b25003 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/UnreplayableOperationException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/UnreplayableOperationException.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.replay;
+package io.netty.handler.codec.replay;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * An {@link Exception} which is thrown when a user calls an unsupported
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java b/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
index b0ad1bba11..2b89288e22 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.replay;
+package io.netty.handler.codec.replay;
 
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.DynamicChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.DynamicChannelBuffer;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/VoidEnum.java b/src/main/java/org/jboss/netty/handler/codec/replay/VoidEnum.java
index 3f6a388a66..00a7efa7eb 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/VoidEnum.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/VoidEnum.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.replay;
+package io.netty.handler.codec.replay;
 
 /**
  * A placeholder {@link Enum} which could be specified as a type parameter of
diff --git a/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java b/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java
index c01df4be0f..b053927a32 100644
--- a/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * Specialized variation of {@link org.jboss.netty.handler.codec.frame.FrameDecoder}
+ * Specialized variation of {@link io.netty.handler.codec.frame.FrameDecoder}
  * which enables implementation of a non-blocking decoder in the blocking I/O
  * paradigm.
  *
@@ -24,5 +24,5 @@
  * @apiviz.exclude \.VoidEnum$
  * @apiviz.exclude \.codec\.(?!replay)[a-z0-9]+\.
  */
-package org.jboss.netty.handler.codec.replay;
+package io.netty.handler.codec.replay;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java
index 26b9b9a7c9..94268af160 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspHeaders.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
-import org.jboss.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpHeaders;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageDecoder.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageDecoder.java
index 1a67ebe9b7..43fb4d79ce 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageDecoder.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.http.HttpChunkAggregator;
-import org.jboss.netty.handler.codec.http.HttpMessage;
-import org.jboss.netty.handler.codec.http.HttpMessageDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.embedder.DecoderEmbedder;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.http.HttpChunkAggregator;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpMessageDecoder;
 
 /**
  * Decodes {@link ChannelBuffer}s into RTSP messages represented in
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageEncoder.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageEncoder.java
index 72a657360a..5c99929382 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMessageEncoder.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.http.HttpMessage;
-import org.jboss.netty.handler.codec.http.HttpMessageEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpMessageEncoder;
 
 /**
  * Encodes an RTSP message represented in {@link HttpMessage} into
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMethods.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMethods.java
index ded116b930..df43038e71 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMethods.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspMethods.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jboss.netty.handler.codec.http.HttpMethod;
+import io.netty.handler.codec.http.HttpMethod;
 
 /**
  * The request method of RTSP.
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestDecoder.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestDecoder.java
index 08b10f0d96..a0bef3c941 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestDecoder.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.http.DefaultHttpRequest;
-import org.jboss.netty.handler.codec.http.HttpMessage;
-import org.jboss.netty.handler.codec.http.HttpRequest;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.http.DefaultHttpRequest;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpRequest;
 
 /**
  * Decodes {@link ChannelBuffer}s into RTSP requests represented in
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestEncoder.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestEncoder.java
index 86f7db810f..e9099e4ff6 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspRequestEncoder.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.http.HttpMessage;
-import org.jboss.netty.handler.codec.http.HttpRequest;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpRequest;
 
 /**
  * Encodes an RTSP request represented in {@link HttpRequest} into
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseDecoder.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseDecoder.java
index 02b2e39943..2be659c747 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseDecoder.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.frame.TooLongFrameException;
-import org.jboss.netty.handler.codec.http.DefaultHttpResponse;
-import org.jboss.netty.handler.codec.http.HttpMessage;
-import org.jboss.netty.handler.codec.http.HttpResponse;
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.codec.frame.TooLongFrameException;
+import io.netty.handler.codec.http.DefaultHttpResponse;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
 
 /**
  * Decodes {@link ChannelBuffer}s into RTSP responses represented in
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseEncoder.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseEncoder.java
index 5f0751428e..dd2668cf79 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseEncoder.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.http.HttpMessage;
-import org.jboss.netty.handler.codec.http.HttpResponse;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.codec.http.HttpMessage;
+import io.netty.handler.codec.http.HttpResponse;
 
 /**
  * Encodes an RTSP response represented in {@link HttpResponse} into
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseStatuses.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseStatuses.java
index 6c4e364d30..f779a56e34 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseStatuses.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspResponseStatuses.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
-import org.jboss.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpResponseStatus;
 
 /**
  * The status code and its description of a RTSP response.
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java
index 5af416f64e..e6bda35a36 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/RtspVersions.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
 
-import org.jboss.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.HttpVersion;
 
 /**
  * The version of RTSP.
diff --git a/src/main/java/org/jboss/netty/handler/codec/rtsp/package-info.java b/src/main/java/org/jboss/netty/handler/codec/rtsp/package-info.java
index 1483a6a4c7..372c49c55c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/rtsp/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/rtsp/package-info.java
@@ -20,4 +20,4 @@
  *
  * @apiviz.exclude \.RtspHeaders\.
  */
-package org.jboss.netty.handler.codec.rtsp;
+package io.netty.handler.codec.rtsp;
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CachingClassResolver.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CachingClassResolver.java
index aad29776de..f48ad0181b 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/CachingClassResolver.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CachingClassResolver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.util.Map;
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ClassLoaderClassResolver.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ClassLoaderClassResolver.java
index 9e1d0781aa..bdac2618ad 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ClassLoaderClassResolver.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ClassLoaderClassResolver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 class ClassLoaderClassResolver implements ClassResolver {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ClassResolver.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ClassResolver.java
index 4340a746a2..33d18d7d8c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ClassResolver.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ClassResolver.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 /**
  * please use {@link ClassResolvers} as instance factory
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ClassResolvers.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ClassResolvers.java
index 4bb22794e8..9ae0c6ddd5 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ClassResolvers.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ClassResolvers.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.lang.ref.Reference;
 import java.util.HashMap;
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java
index f48f25f764..9f40af3123 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java
index c808717abe..80f5629caf 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java
index d124fdfb1f..fb08696815 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamConstants;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferInputStream;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferInputStream;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.replay.ReplayingDecoder;
 
 /**
  * A decoder which deserializes the received {@link ChannelBuffer}s into Java
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
index e45fa9f409..02069a0f03 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectEncoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectEncoder.java
index 54915bca01..b39266d8b7 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectEncoder.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.ChannelBufferOutputStream;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.ChannelBufferOutputStream;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 /**
  * An encoder which serializes a Java object into a {@link ChannelBuffer}
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java
index 663624cf21..a7bdaf2599 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.io.ObjectOutputStream;
 import java.io.StreamCorruptedException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferInputStream;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferInputStream;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
 
 /**
  * A decoder which deserializes the received {@link ChannelBuffer}s into Java
@@ -37,7 +37,7 @@ import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.handler.codec.serialization.ObjectDecoderInputStream - - - compatible with
+ * @apiviz.has io.netty.handler.codec.serialization.ObjectDecoderInputStream - - - compatible with
  */
 public class ObjectDecoder extends LengthFieldBasedFrameDecoder {
 
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoderInputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoderInputStream.java
index dfd210dbee..05fc29bdb0 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoderInputStream.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoderInputStream.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java
index c490fbcc5a..acbf64829b 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferOutputStream;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferOutputStream;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 /**
  * An encoder which serializes a Java object into a {@link ChannelBuffer}.
@@ -39,7 +39,7 @@ import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.handler.codec.serialization.ObjectEncoderOutputStream - - - compatible with
+ * @apiviz.has io.netty.handler.codec.serialization.ObjectEncoderOutputStream - - - compatible with
  */
 @Sharable
 public class ObjectEncoder extends OneToOneEncoder {
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoderOutputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
index b4d896ecdb..8e872d261e 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -21,9 +21,9 @@ import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferOutputStream;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferOutputStream;
+import io.netty.buffer.ChannelBuffers;
 
 /**
  * An {@link ObjectOutput} which is interoperable with {@link ObjectDecoder}
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/ReferenceMap.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ReferenceMap.java
index ade1e98934..2270612256 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/ReferenceMap.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ReferenceMap.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.lang.ref.Reference;
 import java.util.Collection;
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/SoftReferenceMap.java b/src/main/java/org/jboss/netty/handler/codec/serialization/SoftReferenceMap.java
index b8c53a0808..69b726bace 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/SoftReferenceMap.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/SoftReferenceMap.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStream.java
index 3a795f95dd..a0ad7a8c3c 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStream.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStream.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.io.FilterInputStream;
 import java.io.InputStream;
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/WeakReferenceMap.java b/src/main/java/org/jboss/netty/handler/codec/serialization/WeakReferenceMap.java
index 7f404a2a1b..d6f60c5941 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/WeakReferenceMap.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/WeakReferenceMap.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
diff --git a/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java b/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java
index bb5cdcadd3..6471c12340 100644
--- a/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java
@@ -22,4 +22,4 @@
  * @apiviz.exclude ^java\.io\.
  * @apiviz.exclude \.codec\.(?!serialization)[a-z0-9]+\.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
diff --git a/src/main/java/org/jboss/netty/handler/codec/string/StringDecoder.java b/src/main/java/org/jboss/netty/handler/codec/string/StringDecoder.java
index db5e4f80e3..a84d25f515 100644
--- a/src/main/java/org/jboss/netty/handler/codec/string/StringDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/string/StringDecoder.java
@@ -13,20 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.string;
+package io.netty.handler.codec.string;
 
 import java.nio.charset.Charset;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
-import org.jboss.netty.handler.codec.oneone.OneToOneDecoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.frame.FrameDecoder;
+import io.netty.handler.codec.oneone.OneToOneDecoder;
 
 /**
  * Decodes a received {@link ChannelBuffer} into a {@link String}.  Please
diff --git a/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java b/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java
index f9c7f05767..aa5e948912 100644
--- a/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java
@@ -13,21 +13,21 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.string;
+package io.netty.handler.codec.string;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
 import java.nio.charset.Charset;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.handler.codec.oneone.OneToOneEncoder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.handler.codec.oneone.OneToOneEncoder;
 
 /**
  * Encodes the requested {@link String} into a {@link ChannelBuffer}.
diff --git a/src/main/java/org/jboss/netty/handler/codec/string/package-info.java b/src/main/java/org/jboss/netty/handler/codec/string/package-info.java
index 393bbc15e5..64772a13b6 100644
--- a/src/main/java/org/jboss/netty/handler/codec/string/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/string/package-info.java
@@ -16,8 +16,8 @@
 
 /**
  * Encoder and decoder which transform a {@link java.lang.String} into a
- * {@link org.jboss.netty.buffer.ChannelBuffer} and vice versa.
+ * {@link io.netty.buffer.ChannelBuffer} and vice versa.
  *
  * @apiviz.exclude \.oneone\.
  */
-package org.jboss.netty.handler.codec.string;
+package io.netty.handler.codec.string;
diff --git a/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java b/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java
index 7de45508d1..4b1ee7e42c 100644
--- a/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java
+++ b/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.execution;
+package io.netty.handler.execution;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.util.EstimatableObjectWrapper;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.EstimatableObjectWrapper;
 
 /**
  * a {@link Runnable} which sends the specified {@link ChannelEvent} upstream.
diff --git a/src/main/java/org/jboss/netty/handler/execution/ExecutionHandler.java b/src/main/java/org/jboss/netty/handler/execution/ExecutionHandler.java
index 7af50ecfd6..be79450cf8 100644
--- a/src/main/java/org/jboss/netty/handler/execution/ExecutionHandler.java
+++ b/src/main/java/org/jboss/netty/handler/execution/ExecutionHandler.java
@@ -13,25 +13,25 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.execution;
+package io.netty.handler.execution;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.util.ExternalResourceReleasable;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.Channels;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.util.ExternalResourceReleasable;
+import io.netty.util.internal.ExecutorUtil;
 
 /**
  * Forwards an upstream {@link ChannelEvent} to an {@link Executor}.
diff --git a/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
index 2335241a5e..db6cb0aae8 100644
--- a/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
+++ b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.execution;
+package io.netty.handler.execution;
 
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.Executor;
@@ -25,19 +25,19 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.WriteCompletionEvent;
-import org.jboss.netty.util.DefaultObjectSizeEstimator;
-import org.jboss.netty.util.ObjectSizeEstimator;
-import org.jboss.netty.util.internal.ConcurrentIdentityHashMap;
-import org.jboss.netty.util.internal.QueueFactory;
-import org.jboss.netty.util.internal.SharedResourceMisuseDetector;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.WriteCompletionEvent;
+import io.netty.util.DefaultObjectSizeEstimator;
+import io.netty.util.ObjectSizeEstimator;
+import io.netty.util.internal.ConcurrentIdentityHashMap;
+import io.netty.util.internal.QueueFactory;
+import io.netty.util.internal.SharedResourceMisuseDetector;
 
 /**
  * A {@link ThreadPoolExecutor} which blocks the task submission when there's
@@ -127,8 +127,8 @@ import org.jboss.netty.util.internal.SharedResourceMisuseDetector;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.has org.jboss.netty.util.ObjectSizeEstimator oneway - -
- * @apiviz.has org.jboss.netty.handler.execution.ChannelEventRunnable oneway - - executes
+ * @apiviz.has io.netty.util.ObjectSizeEstimator oneway - -
+ * @apiviz.has io.netty.handler.execution.ChannelEventRunnable oneway - - executes
  */
 public class MemoryAwareThreadPoolExecutor extends ThreadPoolExecutor {
 
diff --git a/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
index f69a5cda25..6e76223610 100644
--- a/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
+++ b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.execution;
+package io.netty.handler.execution;
 
 import java.util.IdentityHashMap;
 import java.util.Queue;
@@ -25,13 +25,13 @@ import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.util.ObjectSizeEstimator;
-import org.jboss.netty.util.internal.ConcurrentIdentityWeakKeyHashMap;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.util.ObjectSizeEstimator;
+import io.netty.util.internal.ConcurrentIdentityWeakKeyHashMap;
+import io.netty.util.internal.QueueFactory;
 
 /**
  * A {@link MemoryAwareThreadPoolExecutor} which makes sure the events from the
diff --git a/src/main/java/org/jboss/netty/handler/execution/package-info.java b/src/main/java/org/jboss/netty/handler/execution/package-info.java
index b81ceb25b0..37c234cd93 100644
--- a/src/main/java/org/jboss/netty/handler/execution/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/execution/package-info.java
@@ -24,4 +24,4 @@
  * @apiviz.exclude \.ChannelEventRunnable$
  *
  */
-package org.jboss.netty.handler.execution;
+package io.netty.handler.execution;
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR.java b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR.java
index 8816d1e9b1..3ab55e35fc 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR4.java b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR4.java
index ffebaeae34..7515434b34 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR4.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR4.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;
@@ -117,7 +117,7 @@ public class CIDR4 extends CIDR
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.CIDR#contains(java.net.InetAddress)
+    * @see io.netty.handler.ipfilter.CIDR#contains(java.net.InetAddress)
     */
    @Override
    public boolean contains(InetAddress inetAddress)
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java
index 93c2c64a90..8ef6532846 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/CIDR6.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.math.BigInteger;
 import java.net.Inet4Address;
@@ -21,8 +21,8 @@ import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * @author frederic bregier
@@ -117,7 +117,7 @@ public class CIDR6 extends CIDR
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.CIDR#contains(java.net.InetAddress)
+    * @see io.netty.handler.ipfilter.CIDR#contains(java.net.InetAddress)
     */
    @Override
    public boolean contains(InetAddress inetAddress)
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterListener.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterListener.java
index 2bf2a79628..19702ee630 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterListener.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterListener.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
 
 /**
  * The listener interface for receiving ipFilter events.
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRule.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRule.java
index cf7328801c..1863dc34df 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRule.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRule.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 /**
  * This Interface defines an Ip Filter Rule.
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleHandler.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleHandler.java
index 094af3d256..22601da42e 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleHandler.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -22,9 +22,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
 
 /**
  * Implementation of Filter of IP based on ALLOW and DENY rules.

@@ -297,7 +297,7 @@ public class IpFilterRuleHandler extends IpFilteringHandlerImpl
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.IpFilteringHandler#accept(org.jboss.netty.channel.ChannelHandlerContext, org.jboss.netty.channel.ChannelEvent, java.net.InetSocketAddress)
+    * @see io.netty.handler.ipfilter.IpFilteringHandler#accept(io.netty.channel.ChannelHandlerContext, io.netty.channel.ChannelEvent, java.net.InetSocketAddress)
     */
    @Override
    protected boolean accept(ChannelHandlerContext ctx, ChannelEvent e, InetSocketAddress inetSocketAddress)
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java
index a75cf92db0..42783e7d57 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * The Class IpFilterRuleList is a helper class to generate a List of Rules from a string.
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandler.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandler.java
index befa2816fe..4d3a957b8d 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandler.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandler.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 /**
  * The Interface IpFilteringHandler.
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java
index b2c8d12fe1..cd8245cf86 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.channel.Channels;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.Channels;
 
 // TODO: Auto-generated Javadoc
 /**
@@ -108,7 +108,7 @@ public abstract class IpFilteringHandlerImpl implements ChannelUpstreamHandler,
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.channel.ChannelUpstreamHandler#handleUpstream(org.jboss.netty.channel.ChannelHandlerContext, org.jboss.netty.channel.ChannelEvent)
+    * @see io.netty.channel.ChannelUpstreamHandler#handleUpstream(io.netty.channel.ChannelHandlerContext, io.netty.channel.ChannelEvent)
     */
    @Override
    public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent e) throws Exception
@@ -184,7 +184,7 @@ public abstract class IpFilteringHandlerImpl implements ChannelUpstreamHandler,
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.IpFilteringHandler#setIpFilterListener(org.jboss.netty.handler.ipfilter.IpFilterListener)
+    * @see io.netty.handler.ipfilter.IpFilteringHandler#setIpFilterListener(io.netty.handler.ipfilter.IpFilterListener)
     */
    @Override
    public void setIpFilterListener(IpFilterListener listener)
@@ -193,7 +193,7 @@ public abstract class IpFilteringHandlerImpl implements ChannelUpstreamHandler,
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.IpFilteringHandler#removeIpFilterListener()
+    * @see io.netty.handler.ipfilter.IpFilteringHandler#removeIpFilterListener()
     */
    @Override
    public void removeIpFilterListener()
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpSet.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpSet.java
index 3e4898b62d..4ff4904149 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpSet.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpSet.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetAddress;
 
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java
index 4f15c1fbb5..f12bbc5cbe 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnet.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java
index 70a82edcdb..397afa19c3 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java
index 18ae5bda36..1f6fa1befd 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4Subnet.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java
index 7d6f1c3aa6..0518242541 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/OneIpFilterHandler.java b/src/main/java/org/jboss/netty/handler/ipfilter/OneIpFilterHandler.java
index b901f2a7a0..edf57f20d0 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/OneIpFilterHandler.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/OneIpFilterHandler.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
 
 /**
  * Handler that block any new connection if there are already a currently active
@@ -47,7 +47,7 @@ public class OneIpFilterHandler extends IpFilteringHandlerImpl
    private final ConcurrentMap connectedSet = new ConcurrentHashMap();
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.IpFilteringHandler#accept(org.jboss.netty.channel.ChannelHandlerContext, org.jboss.netty.channel.ChannelEvent, java.net.InetSocketAddress)
+    * @see io.netty.handler.ipfilter.IpFilteringHandler#accept(io.netty.channel.ChannelHandlerContext, io.netty.channel.ChannelEvent, java.net.InetSocketAddress)
     */
    @Override
    protected boolean accept(ChannelHandlerContext ctx, ChannelEvent e, InetSocketAddress inetSocketAddress)
@@ -63,7 +63,7 @@ public class OneIpFilterHandler extends IpFilteringHandlerImpl
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.IpFilteringHandler#handleUpstream(org.jboss.netty.channel.ChannelHandlerContext, org.jboss.netty.channel.ChannelEvent)
+    * @see io.netty.handler.ipfilter.IpFilteringHandler#handleUpstream(io.netty.channel.ChannelHandlerContext, io.netty.channel.ChannelEvent)
     */
    @Override
    public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent e) throws Exception
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java b/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java
index 421f54b057..76f0960522 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/PatternRule.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.regex.Pattern;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * The Class PatternRule represents an IP filter rule using string patterns.
@@ -88,7 +88,7 @@ public class PatternRule implements IpFilterRule, Comparable
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.IpFilterRule#isAllowRule()
+    * @see io.netty.handler.ipfilter.IpFilterRule#isAllowRule()
     */
    @Override
    public boolean isAllowRule()
@@ -97,7 +97,7 @@ public class PatternRule implements IpFilterRule, Comparable
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.IpFilterRule#isDenyRule()
+    * @see io.netty.handler.ipfilter.IpFilterRule#isDenyRule()
     */
    @Override
    public boolean isDenyRule()
@@ -106,7 +106,7 @@ public class PatternRule implements IpFilterRule, Comparable
    }
 
    /* (non-Javadoc)
-    * @see org.jboss.netty.handler.ipfilter.IpSet#contains(java.net.InetAddress)
+    * @see io.netty.handler.ipfilter.IpSet#contains(java.net.InetAddress)
     */
    @Override
    public boolean contains(InetAddress inetAddress)
diff --git a/src/main/java/org/jboss/netty/handler/ipfilter/package-info.java b/src/main/java/org/jboss/netty/handler/ipfilter/package-info.java
index 7d11e64140..68ccc7c478 100644
--- a/src/main/java/org/jboss/netty/handler/ipfilter/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/ipfilter/package-info.java
@@ -20,14 +20,14 @@
  *
  *
  * 
The main goal of this package is to allow to filter connections based on IP rules.
- * The main interface is {@link org.jboss.netty.handler.ipfilter.IpFilteringHandler} which all filters will extend.

+ * The main interface is {@link io.netty.handler.ipfilter.IpFilteringHandler} which all filters will extend.

  *
  * 
Two IP filtering are proposed:

  * 
    
- * 
  •  {@link org.jboss.netty.handler.ipfilter.OneIpFilterHandler}: This filter proposes to allow only one connection by client's IP Address.
+ * 
  •  {@link io.netty.handler.ipfilter.OneIpFilterHandler}: This filter proposes to allow only one connection by client's IP Address.
  * I.E. this filter will prevent two connections from the same client based on its IP address.


    • 
  *
- * 
  •  {@link org.jboss.netty.handler.ipfilter.IpFilterRuleHandler}: This filter proposes to allow or block IP range (based on standard notation
+ * 
  •  {@link io.netty.handler.ipfilter.IpFilterRuleHandler}: This filter proposes to allow or block IP range (based on standard notation
  * or on CIDR notation) when the connection is running. It relies on another class like
  * IpV4SubnetFilterRule (IPV4 support only), IpSubnetFilterRule (IPV4 and IPV6 support) or PatternRule (string pattern support)
  * which implements those Ip ranges.


    • 
@@ -50,7 +50,7 @@
  * So if you want to send back a message to the client, don't forget to return a respectful ChannelFuture,
  * otherwise the message could be missed since the channel will be closed immediately after this
  * call and the waiting on this channelFuture (at least with respect of asynchronous operations).

    
- * Per default implementation this method invokes an {@link org.jboss.netty.handler.ipfilter.IpFilterListener} or returns null if no listener has been set.
+ * Per default implementation this method invokes an {@link io.netty.handler.ipfilter.IpFilterListener} or returns null if no listener has been set.
  * 

    
  *
  * 
  • continues is called when any event appears after CONNECTED event and only for
@@ -64,7 +64,7 @@
  * those events come out before the CONNECTED event, so there is no possibility to filter those two events
  * before the CONNECTED event shows up. Therefore, you might want to let CLOSED and UNBOUND be passed
  * to the next entry in the pipeline.

    
- * Per default implementation this method invokes an {@link org.jboss.netty.handler.ipfilter.IpFilterListener} or returns false if no listener has been set.
+ * Per default implementation this method invokes an {@link io.netty.handler.ipfilter.IpFilterListener} or returns false if no listener has been set.
  * 

    
  *
  * 
  • Finally handleUpstream traps the CONNECTED and DISCONNECTED events.

    • 
@@ -79,7 +79,7 @@
  * A typical setup for ip filter for TCP/IP socket would be:
  *
  * 
    - * {@link org.jboss.netty.channel.ChannelPipeline} pipeline = ...;
+ * {@link io.netty.channel.ChannelPipeline} pipeline = ...;
  *
  * IpFilterRuleHandler firewall = new IpFilterRuleHandler();
  * firewall.addAll(new IpFilterRuleList("+n:localhost, +c:192.168.0.0/27, -n:*"));
@@ -88,6 +88,6 @@
  *
  * @apiviz.exclude ^java\.lang\.
  */
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 
diff --git a/src/main/java/org/jboss/netty/handler/logging/LoggingHandler.java b/src/main/java/org/jboss/netty/handler/logging/LoggingHandler.java
index de42e9cadf..3cb3443c83 100644
--- a/src/main/java/org/jboss/netty/handler/logging/LoggingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/logging/LoggingHandler.java
@@ -13,22 +13,22 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.logging;
+package io.netty.handler.logging;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.logging.InternalLogLevel;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.logging.InternalLogLevel;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * A {@link ChannelHandler} that logs all events via {@link InternalLogger}.
diff --git a/src/main/java/org/jboss/netty/handler/logging/package-info.java b/src/main/java/org/jboss/netty/handler/logging/package-info.java
index 90de123111..0f03636dd4 100644
--- a/src/main/java/org/jboss/netty/handler/logging/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/logging/package-info.java
@@ -15,10 +15,10 @@
  */
 
 /**
- * Logs a {@link org.jboss.netty.channel.ChannelEvent} for debugging purpose
- * using an {@link org.jboss.netty.logging.InternalLogger}.
+ * Logs a {@link io.netty.channel.ChannelEvent} for debugging purpose
+ * using an {@link io.netty.logging.InternalLogger}.
  *
  * @apiviz.hidden
  * @apiviz.exclude \.channel\.
  */
-package org.jboss.netty.handler.logging;
+package io.netty.handler.logging;
diff --git a/src/main/java/org/jboss/netty/handler/queue/BlockingReadHandler.java b/src/main/java/org/jboss/netty/handler/queue/BlockingReadHandler.java
index 509dd44724..4c8d672a57 100644
--- a/src/main/java/org/jboss/netty/handler/queue/BlockingReadHandler.java
+++ b/src/main/java/org/jboss/netty/handler/queue/BlockingReadHandler.java
@@ -13,23 +13,23 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.queue;
+package io.netty.handler.queue;
 
 import java.io.IOException;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.util.internal.DeadLockProofWorker;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.util.internal.DeadLockProofWorker;
+import io.netty.util.internal.QueueFactory;
 
 /**
  * Emulates blocking read operation.  This handler stores all received messages
diff --git a/src/main/java/org/jboss/netty/handler/queue/BlockingReadTimeoutException.java b/src/main/java/org/jboss/netty/handler/queue/BlockingReadTimeoutException.java
index 96a92c6f69..fd0a50941e 100644
--- a/src/main/java/org/jboss/netty/handler/queue/BlockingReadTimeoutException.java
+++ b/src/main/java/org/jboss/netty/handler/queue/BlockingReadTimeoutException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.queue;
+package io.netty.handler.queue;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
diff --git a/src/main/java/org/jboss/netty/handler/queue/BufferedWriteHandler.java b/src/main/java/org/jboss/netty/handler/queue/BufferedWriteHandler.java
index 4c43f01562..df5533a82c 100644
--- a/src/main/java/org/jboss/netty/handler/queue/BufferedWriteHandler.java
+++ b/src/main/java/org/jboss/netty/handler/queue/BufferedWriteHandler.java
@@ -13,27 +13,27 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.queue;
+package io.netty.handler.queue;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.BlockingQueue;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.channel.socket.nio.NioSocketChannelConfig;
-import org.jboss.netty.util.HashedWheelTimer;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelHandler;
+import io.netty.channel.socket.nio.NioSocketChannelConfig;
+import io.netty.util.HashedWheelTimer;
+import io.netty.util.internal.QueueFactory;
 
 /**
  * Emulates buffered write operation.  This handler stores all write requests
diff --git a/src/main/java/org/jboss/netty/handler/queue/package-info.java b/src/main/java/org/jboss/netty/handler/queue/package-info.java
index 8c72869a88..eaee3602f8 100644
--- a/src/main/java/org/jboss/netty/handler/queue/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/queue/package-info.java
@@ -21,4 +21,4 @@
  * @apiviz.exclude \.channel\.
  * @apiviz.exclude Exception$
  */
-package org.jboss.netty.handler.queue;
+package io.netty.handler.queue;
diff --git a/src/main/java/org/jboss/netty/handler/region/ChannelWritableByteChannel.java b/src/main/java/org/jboss/netty/handler/region/ChannelWritableByteChannel.java
index 8614c45922..c32e5bfe6c 100644
--- a/src/main/java/org/jboss/netty/handler/region/ChannelWritableByteChannel.java
+++ b/src/main/java/org/jboss/netty/handler/region/ChannelWritableByteChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.region;
+package io.netty.handler.region;
 
 
 import java.io.IOException;
@@ -21,15 +21,15 @@ import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureAggregator;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureAggregator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
 
 /**
  * {@link WritableByteChannel} implementation which will take care to wrap the {@link ByteBuffer} to a {@link ChannelBuffer} and forward it to the next {@link ChannelDownstreamHandler} in the {@link ChannelPipeline} on every {@link #write(ByteBuffer)}
diff --git a/src/main/java/org/jboss/netty/handler/region/FileRegionEncoder.java b/src/main/java/org/jboss/netty/handler/region/FileRegionEncoder.java
index 547b88dd6d..c1e483871f 100644
--- a/src/main/java/org/jboss/netty/handler/region/FileRegionEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/region/FileRegionEncoder.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.region;
+package io.netty.handler.region;
 
 
 import java.nio.channels.WritableByteChannel;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.FileRegion;
-import org.jboss.netty.channel.MessageEvent;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.FileRegion;
+import io.netty.channel.MessageEvent;
 
 /**
  * {@link ChannelDownstreamHandler} implementation which encodes a {@link FileRegion} to {@link ChannelBuffer}'s if one of the given {@link ChannelHandler} was found in the {@link ChannelPipeline}.
diff --git a/src/main/java/org/jboss/netty/handler/ssl/ImmediateExecutor.java b/src/main/java/org/jboss/netty/handler/ssl/ImmediateExecutor.java
index d92ad7db70..65180ed325 100644
--- a/src/main/java/org/jboss/netty/handler/ssl/ImmediateExecutor.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/ImmediateExecutor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/main/java/org/jboss/netty/handler/ssl/SslBufferPool.java b/src/main/java/org/jboss/netty/handler/ssl/SslBufferPool.java
index bdbd411eb2..92714a3a32 100644
--- a/src/main/java/org/jboss/netty/handler/ssl/SslBufferPool.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/SslBufferPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
index 972e6707e4..d86f965265 100644
--- a/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -32,26 +32,26 @@ import javax.net.ssl.SSLEngineResult.HandshakeStatus;
 import javax.net.ssl.SSLEngineResult.Status;
 import javax.net.ssl.SSLException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.DownstreamMessageEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.LifeCycleAwareChannelHandler;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.handler.codec.frame.FrameDecoder;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.NonReentrantLock;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.DownstreamMessageEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.LifeCycleAwareChannelHandler;
+import io.netty.channel.MessageEvent;
+import io.netty.handler.codec.frame.FrameDecoder;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.NonReentrantLock;
+import io.netty.util.internal.QueueFactory;
 
 /**
  * Adds SSL
@@ -150,7 +150,7 @@ import org.jboss.netty.util.internal.QueueFactory;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.handler.ssl.SslBufferPool
+ * @apiviz.uses io.netty.handler.ssl.SslBufferPool
  */
 public class SslHandler extends FrameDecoder
                         implements ChannelDownstreamHandler,
diff --git a/src/main/java/org/jboss/netty/handler/ssl/package-info.java b/src/main/java/org/jboss/netty/handler/ssl/package-info.java
index 57b5d18aef..84d6cd1ccf 100644
--- a/src/main/java/org/jboss/netty/handler/ssl/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/package-info.java
@@ -20,4 +20,4 @@
  *
  * @apiviz.exclude \.(channel|codec)\.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedFile.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedFile.java
index 6bdcff563d..e2ca1dd0fe 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedFile.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedFile.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.stream;
+package io.netty.handler.stream;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
-import org.jboss.netty.channel.FileRegion;
+import io.netty.channel.FileRegion;
 
 /**
  * A {@link ChunkedInput} that fetches data from a file chunk by chunk.
diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedInput.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedInput.java
index 830d5b1189..9a0afc8a0e 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedInput.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedInput.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.stream;
+package io.netty.handler.stream;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * A data stream of indefinite length which is consumed by {@link ChunkedWriteHandler}.
diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java
index 0f60620c00..c71762c01c 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedNioFile.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.stream;
+package io.netty.handler.stream;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -23,7 +23,7 @@ import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 
-import org.jboss.netty.channel.FileRegion;
+import io.netty.channel.FileRegion;
 
 /**
  * A {@link ChunkedInput} that fetches data from a file chunk by chunk using
diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedNioStream.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedNioStream.java
index 0b7a78bada..8b27378092 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedNioStream.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedNioStream.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.stream;
+package io.netty.handler.stream;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
 
-import org.jboss.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffer;
 
 /**
  * A {@link ChunkedInput} that fetches data from a {@link ReadableByteChannel}
diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedStream.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedStream.java
index 7b25f058b8..55ffc8e341 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedStream.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedStream.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.stream;
+package io.netty.handler.stream;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 
 import java.io.InputStream;
 import java.io.PushbackInputStream;
diff --git a/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java b/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
index d3bbe7aec0..15cc4e7b2d 100644
--- a/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
+++ b/src/main/java/org/jboss/netty/handler/stream/ChunkedWriteHandler.java
@@ -13,29 +13,29 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.stream;
+package io.netty.handler.stream;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.nio.channels.ClosedChannelException;
 import java.util.Queue;
 
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.QueueFactory;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.QueueFactory;
 
 /**
  * A {@link ChannelHandler} that adds support for writing a large data stream
@@ -72,7 +72,7 @@ import org.jboss.netty.util.internal.QueueFactory;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.handler.stream.ChunkedInput oneway - - reads from
+ * @apiviz.has io.netty.handler.stream.ChunkedInput oneway - - reads from
  */
 public class ChunkedWriteHandler implements ChannelUpstreamHandler, ChannelDownstreamHandler {
 
diff --git a/src/main/java/org/jboss/netty/handler/stream/package-info.java b/src/main/java/org/jboss/netty/handler/stream/package-info.java
index 80c7f38bfe..e915a03729 100644
--- a/src/main/java/org/jboss/netty/handler/stream/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/stream/package-info.java
@@ -17,8 +17,8 @@
 /**
  * Writes very large data stream asynchronously neither spending a lot of
  * memory nor getting {@link java.lang.OutOfMemoryError}.  For a detailed
- * example, please refer to {@code org.jboss.netty.example.http.file}.
+ * example, please refer to {@code io.netty.example.http.file}.
  *
  * @apiviz.exclude \.channel\.
  */
-package org.jboss.netty.handler.stream;
+package io.netty.handler.stream;
diff --git a/src/main/java/org/jboss/netty/handler/timeout/DefaultIdleStateEvent.java b/src/main/java/org/jboss/netty/handler/timeout/DefaultIdleStateEvent.java
index c45537b2ce..c5343df24a 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/DefaultIdleStateEvent.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/DefaultIdleStateEvent.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Locale;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
 
 /**
  * The default {@link IdleStateEvent} implementation.
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleState.java b/src/main/java/org/jboss/netty/handler/timeout/IdleState.java
index c875ccf78e..d0a9495d53 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleState.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleState.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
-import org.jboss.netty.channel.Channel;
+import io.netty.channel.Channel;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelHandler.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelHandler.java
index fe85620994..18c80028b6 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelHandler.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.SimpleChannelHandler;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelHandler;
 
 /**
  * An extended {@link SimpleChannelHandler} that adds the handler method for
@@ -27,7 +27,7 @@ import org.jboss.netty.channel.SimpleChannelHandler;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.uses org.jboss.netty.handler.timeout.IdleStateEvent
+ * @apiviz.uses io.netty.handler.timeout.IdleStateEvent
  */
 public class IdleStateAwareChannelHandler extends SimpleChannelHandler {
 
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java
index 23694ae03f..d5758c8102 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.SimpleChannelUpstreamHandler;
 
 /**
  * An extended {@link SimpleChannelUpstreamHandler} that adds the handler method
@@ -27,7 +27,7 @@ import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
  * @author The Netty Project
  * @author Trustin Lee
  *
- * @apiviz.uses org.jboss.netty.handler.timeout.IdleStateEvent
+ * @apiviz.uses io.netty.handler.timeout.IdleStateEvent
  */
 public class IdleStateAwareChannelUpstreamHandler extends SimpleChannelUpstreamHandler {
 
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateEvent.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateEvent.java
index 195d1d4c74..ce62779d2b 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateEvent.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateEvent.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
 
 /**
  * A {@link ChannelEvent} that is triggered when a {@link Channel} has been idle
@@ -26,7 +26,7 @@ import org.jboss.netty.channel.ChannelEvent;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.handler.timeout.IdleState oneway - -
+ * @apiviz.has io.netty.handler.timeout.IdleState oneway - -
  */
 public interface IdleStateEvent extends ChannelEvent {
     /**
diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
index 2c7aa4ad4a..559e21f376 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
@@ -13,30 +13,30 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.LifeCycleAwareChannelHandler;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.WriteCompletionEvent;
-import org.jboss.netty.util.ExternalResourceReleasable;
-import org.jboss.netty.util.HashedWheelTimer;
-import org.jboss.netty.util.Timeout;
-import org.jboss.netty.util.Timer;
-import org.jboss.netty.util.TimerTask;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.LifeCycleAwareChannelHandler;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.WriteCompletionEvent;
+import io.netty.util.ExternalResourceReleasable;
+import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timeout;
+import io.netty.util.Timer;
+import io.netty.util.TimerTask;
 
 /**
  * Triggers an {@link IdleStateEvent} when a {@link Channel} has not performed
@@ -120,8 +120,8 @@ import org.jboss.netty.util.TimerTask;
  * @see WriteTimeoutHandler
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.util.HashedWheelTimer
- * @apiviz.has org.jboss.netty.handler.timeout.IdleStateEvent oneway - - triggers
+ * @apiviz.uses io.netty.util.HashedWheelTimer
+ * @apiviz.has io.netty.handler.timeout.IdleStateEvent oneway - - triggers
  */
 @Sharable
 public class IdleStateHandler extends SimpleChannelUpstreamHandler
diff --git a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutException.java b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutException.java
index e2e5644707..b45c34a584 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutException.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
 /**
  * A {@link TimeoutException} raised by {@link ReadTimeoutHandler} when no data
diff --git a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
index fbb28a388c..712bcb21ed 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
@@ -13,28 +13,28 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.LifeCycleAwareChannelHandler;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.util.ExternalResourceReleasable;
-import org.jboss.netty.util.HashedWheelTimer;
-import org.jboss.netty.util.Timeout;
-import org.jboss.netty.util.Timer;
-import org.jboss.netty.util.TimerTask;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.LifeCycleAwareChannelHandler;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.util.ExternalResourceReleasable;
+import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timeout;
+import io.netty.util.Timer;
+import io.netty.util.TimerTask;
 
 /**
  * Raises a {@link ReadTimeoutException} when no data was read within a certain
@@ -77,8 +77,8 @@ import org.jboss.netty.util.TimerTask;
  * @see IdleStateHandler
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.util.HashedWheelTimer
- * @apiviz.has org.jboss.netty.handler.timeout.TimeoutException oneway - - raises
+ * @apiviz.uses io.netty.util.HashedWheelTimer
+ * @apiviz.has io.netty.handler.timeout.TimeoutException oneway - - raises
  */
 @Sharable
 public class ReadTimeoutHandler extends SimpleChannelUpstreamHandler
diff --git a/src/main/java/org/jboss/netty/handler/timeout/TimeoutException.java b/src/main/java/org/jboss/netty/handler/timeout/TimeoutException.java
index 3fce063ae9..1f06a59132 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/TimeoutException.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/TimeoutException.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
-import org.jboss.netty.channel.ChannelException;
+import io.netty.channel.ChannelException;
 
 /**
  * A {@link TimeoutException} when no data was either read or written within a
diff --git a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutException.java b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutException.java
index faff7f0408..cb983fcf61 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutException.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutException.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
index aa318bd236..37b06a22ab 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
@@ -13,27 +13,27 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
 
-import static org.jboss.netty.channel.Channels.*;
+import static io.netty.channel.Channels.*;
 
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.util.ExternalResourceReleasable;
-import org.jboss.netty.util.HashedWheelTimer;
-import org.jboss.netty.util.Timeout;
-import org.jboss.netty.util.Timer;
-import org.jboss.netty.util.TimerTask;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelDownstreamHandler;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.util.ExternalResourceReleasable;
+import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timeout;
+import io.netty.util.Timer;
+import io.netty.util.TimerTask;
 
 /**
  * Raises a {@link WriteTimeoutException} when no data was written within a
@@ -73,8 +73,8 @@ import org.jboss.netty.util.TimerTask;
  * @see IdleStateHandler
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.util.HashedWheelTimer
- * @apiviz.has org.jboss.netty.handler.timeout.TimeoutException oneway - - raises
+ * @apiviz.uses io.netty.util.HashedWheelTimer
+ * @apiviz.has io.netty.handler.timeout.TimeoutException oneway - - raises
  */
 @Sharable
 public class WriteTimeoutHandler extends SimpleChannelDownstreamHandler
diff --git a/src/main/java/org/jboss/netty/handler/timeout/package-info.java b/src/main/java/org/jboss/netty/handler/timeout/package-info.java
index bbf85fece4..07eb570fba 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/package-info.java
@@ -16,10 +16,10 @@
 
 /**
  * Adds support for read and write timeout and idle connection notification
- * using a {@link org.jboss.netty.util.Timer}.
+ * using a {@link io.netty.util.Timer}.
  *
  * @apiviz.exclude \.channel\.
  * @apiviz.exclude \.DefaultIdleStateEvent$
  * @apiviz.exclude \.ExternalResourceReleasable$
  */
-package org.jboss.netty.handler.timeout;
+package io.netty.handler.timeout;
diff --git a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
index 3268fcce62..cd4b381de7 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/AbstractTrafficShapingHandler.java
@@ -13,24 +13,24 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.traffic;
+package io.netty.handler.traffic;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.DefaultObjectSizeEstimator;
-import org.jboss.netty.util.ExternalResourceReleasable;
-import org.jboss.netty.util.ObjectSizeEstimator;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelHandler;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.DefaultObjectSizeEstimator;
+import io.netty.util.ExternalResourceReleasable;
+import io.netty.util.ObjectSizeEstimator;
+import io.netty.util.internal.ExecutorUtil;
 
 /**
  * AbstractTrafficShapingHandler allows to limit the global bandwidth
@@ -507,7 +507,7 @@ public abstract class AbstractTrafficShapingHandler extends
     }
 
     /* (non-Javadoc)
-     * @see org.jboss.netty.util.ExternalResourceReleasable#releaseExternalResources()
+     * @see io.netty.util.ExternalResourceReleasable#releaseExternalResources()
      */
     @Override
     public void releaseExternalResources() {
diff --git a/src/main/java/org/jboss/netty/handler/traffic/ChannelTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/ChannelTrafficShapingHandler.java
index 26e4063846..b4e0a15812 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/ChannelTrafficShapingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/ChannelTrafficShapingHandler.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.traffic;
+package io.netty.handler.traffic;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.handler.execution.ExecutionHandler;
-import org.jboss.netty.handler.execution.MemoryAwareThreadPoolExecutor;
-import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
-import org.jboss.netty.util.ObjectSizeEstimator;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.handler.execution.ExecutionHandler;
+import io.netty.handler.execution.MemoryAwareThreadPoolExecutor;
+import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+import io.netty.util.ObjectSizeEstimator;
 
 /**
  * This implementation of the {@link AbstractTrafficShapingHandler} is for channel
diff --git a/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java b/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java
index 8676a788c8..543c7804ff 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/GlobalTrafficShapingHandler.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.traffic;
+package io.netty.handler.traffic;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelHandler.Sharable;
-import org.jboss.netty.handler.execution.ExecutionHandler;
-import org.jboss.netty.handler.execution.MemoryAwareThreadPoolExecutor;
-import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
-import org.jboss.netty.util.ObjectSizeEstimator;
+import io.netty.channel.ChannelHandler.Sharable;
+import io.netty.handler.execution.ExecutionHandler;
+import io.netty.handler.execution.MemoryAwareThreadPoolExecutor;
+import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+import io.netty.util.ObjectSizeEstimator;
 
 /**
  * This implementation of the {@link AbstractTrafficShapingHandler} is for global
diff --git a/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java b/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java
index 235bba38a3..a9f503ce1d 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/TrafficCounter.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.traffic;
+package io.netty.handler.traffic;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.jboss.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelHandlerContext;
 
 /**
  * TrafficCounter is associated with {@link AbstractTrafficShapingHandler}.
    
diff --git a/src/main/java/org/jboss/netty/handler/traffic/package-info.java b/src/main/java/org/jboss/netty/handler/traffic/package-info.java
index 6e83f6d073..f9b25e70ee 100644
--- a/src/main/java/org/jboss/netty/handler/traffic/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/traffic/package-info.java
@@ -25,20 +25,20 @@
  *
  * 
    Two classes implement this behavior:
    
  * 
      
- * 
    •  {@link org.jboss.netty.handler.traffic.TrafficCounter}: this class implements the counters needed by the handlers.
+ * 
    •  {@link io.netty.handler.traffic.TrafficCounter}: this class implements the counters needed by the handlers.
  * It can be accessed to get some extra information like the read or write bytes since last check, the read and write
  * bandwidth from last check...


      • 
  *
- * 
    •  {@link org.jboss.netty.handler.traffic.AbstractTrafficShapingHandler}: this abstract class implements the kernel
+ * 
    •  {@link io.netty.handler.traffic.AbstractTrafficShapingHandler}: this abstract class implements the kernel
  * of the traffic shaping. It could be extended to fit your needs. Two classes are proposed as default
- * implementations: see {@link org.jboss.netty.handler.traffic.ChannelTrafficShapingHandler} and see {@link org.jboss.netty.handler.traffic.GlobalTrafficShapingHandler}
+ * implementations: see {@link io.netty.handler.traffic.ChannelTrafficShapingHandler} and see {@link io.netty.handler.traffic.GlobalTrafficShapingHandler}
  * respectively for Channel traffic shaping and Global traffic shaping.


      • 
  *
  * The insertion in the pipeline of one of those handlers can be wherever you want, but
- * it must be placed before any {@link org.jboss.netty.handler.execution.MemoryAwareThreadPoolExecutor}
+ * it must be placed before any {@link io.netty.handler.execution.MemoryAwareThreadPoolExecutor}
  * in your pipeline.
      
- * It is really recommended to have such a {@link org.jboss.netty.handler.execution.MemoryAwareThreadPoolExecutor}
- * (either non ordered or  {@link org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor}
+ * It is really recommended to have such a {@link io.netty.handler.execution.MemoryAwareThreadPoolExecutor}
+ * (either non ordered or  {@link io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor}
  * ) in your pipeline
  * when you want to use this feature with some real traffic shaping, since it will allow to relax the constraint on
  * NioWorker to do other jobs if necessary.
      
@@ -50,9 +50,9 @@
  * 60KB/s for each channel since NioWorkers are stopping by this handler.
      
  * When it is used as a read traffic shaper, the handler will set the channel as not readable, so as to relax the
  * NioWorkers.

      
- * An {@link org.jboss.netty.util.ObjectSizeEstimator} can be passed at construction to specify what
+ * An {@link io.netty.util.ObjectSizeEstimator} can be passed at construction to specify what
  * is the size of the object to be read or write accordingly to the type of
- * object. If not specified, it will used the {@link org.jboss.netty.util.DefaultObjectSizeEstimator} implementation.

      
+ * object. If not specified, it will used the {@link io.netty.util.DefaultObjectSizeEstimator} implementation.

      
  * 
    
  *
  * 
    Standard use could be as follow:
    
@@ -62,15 +62,15 @@
  * [Global or per Channel] [Write or Read] Limitation in byte/s.
    
  * A value of 0
  * stands for no limitation, so the traffic shaping is deactivate (on what you specified).
    
- * You can either change those values with the method configure in {@link org.jboss.netty.handler.traffic.AbstractTrafficShapingHandler}.
    
+ * You can either change those values with the method configure in {@link io.netty.handler.traffic.AbstractTrafficShapingHandler}.
    
  * 
    
  *
  * 
  • To activate or deactivate the statistics, you can adjust the delay to a low (suggested not less than 200ms
  * for efficiency reasons) or a high value (let say 24H in millisecond is huge enough to not get the problem)
  * or even using 0 which means no computation will be done.

    • 
  * If you want to do anything with this statistics, just override the doAccounting method.
    
- * This interval can be changed either from the method configure in {@link org.jboss.netty.handler.traffic.AbstractTrafficShapingHandler}
- * or directly using the method configure of {@link org.jboss.netty.handler.traffic.TrafficCounter}.

    
+ * This interval can be changed either from the method configure in {@link io.netty.handler.traffic.AbstractTrafficShapingHandler}
+ * or directly using the method configure of {@link io.netty.handler.traffic.TrafficCounter}.

    
  *
  * 



  *
@@ -81,8 +81,8 @@
  * pipeline.addLast("XXXXX_TRAFFIC_SHAPING", myHandler);

  * ...

  * pipeline.addLast("MemoryExecutor",new ExecutionHandler(memoryAwareThreadPoolExecutor));


- * 
Note that a new {@link org.jboss.netty.handler.traffic.ChannelTrafficShapingHandler} must be created for each new channel,
- * but only one {@link org.jboss.netty.handler.traffic.GlobalTrafficShapingHandler} must be created for all channels.

+ * 
Note that a new {@link io.netty.handler.traffic.ChannelTrafficShapingHandler} must be created for each new channel,
+ * but only one {@link io.netty.handler.traffic.GlobalTrafficShapingHandler} must be created for all channels.

  *
  * 
Note also that you can create different GlobalTrafficShapingHandler if you want to separate classes of
  * channels (for instance either from business point of view or from bind address point of view).

@@ -93,5 +93,5 @@
  *
  * @apiviz.exclude ^java\.lang\.
  */
-package org.jboss.netty.handler.traffic;
+package io.netty.handler.traffic;
 
diff --git a/src/main/java/org/jboss/netty/logging/AbstractInternalLogger.java b/src/main/java/org/jboss/netty/logging/AbstractInternalLogger.java
index 45bc9e0a67..65f7c0bb78 100644
--- a/src/main/java/org/jboss/netty/logging/AbstractInternalLogger.java
+++ b/src/main/java/org/jboss/netty/logging/AbstractInternalLogger.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 /**
  * A skeletal implementation of {@link InternalLogger}.  This class implements
diff --git a/src/main/java/org/jboss/netty/logging/CommonsLogger.java b/src/main/java/org/jboss/netty/logging/CommonsLogger.java
index 3e08195101..b81eca44b2 100644
--- a/src/main/java/org/jboss/netty/logging/CommonsLogger.java
+++ b/src/main/java/org/jboss/netty/logging/CommonsLogger.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import org.apache.commons.logging.Log;
 
diff --git a/src/main/java/org/jboss/netty/logging/CommonsLoggerFactory.java b/src/main/java/org/jboss/netty/logging/CommonsLoggerFactory.java
index f6603f9df0..3bfae75546 100644
--- a/src/main/java/org/jboss/netty/logging/CommonsLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/CommonsLoggerFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 
 
diff --git a/src/main/java/org/jboss/netty/logging/InternalLogLevel.java b/src/main/java/org/jboss/netty/logging/InternalLogLevel.java
index ec2cebf15f..0d987c32b2 100644
--- a/src/main/java/org/jboss/netty/logging/InternalLogLevel.java
+++ b/src/main/java/org/jboss/netty/logging/InternalLogLevel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 /**
  * The log level that {@link InternalLogger} can log at.
diff --git a/src/main/java/org/jboss/netty/logging/InternalLogger.java b/src/main/java/org/jboss/netty/logging/InternalLogger.java
index 0ccedd6d46..ebc8657f28 100644
--- a/src/main/java/org/jboss/netty/logging/InternalLogger.java
+++ b/src/main/java/org/jboss/netty/logging/InternalLogger.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 /**
  * Internal-use-only logger used by Netty.  DO NOT
diff --git a/src/main/java/org/jboss/netty/logging/InternalLoggerFactory.java b/src/main/java/org/jboss/netty/logging/InternalLoggerFactory.java
index 9e1fe8bed8..6dd301e36d 100644
--- a/src/main/java/org/jboss/netty/logging/InternalLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/InternalLoggerFactory.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
-import org.jboss.netty.util.internal.StackTraceSimplifier;
+import io.netty.util.internal.StackTraceSimplifier;
 
 /**
  * Creates an {@link InternalLogger} or changes the default factory
@@ -35,7 +35,7 @@ import org.jboss.netty.util.internal.StackTraceSimplifier;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.logging.InternalLogger oneway - - creates
+ * @apiviz.has io.netty.logging.InternalLogger oneway - - creates
  */
 public abstract class InternalLoggerFactory {
     private static volatile InternalLoggerFactory defaultFactory = new JdkLoggerFactory();
diff --git a/src/main/java/org/jboss/netty/logging/JBossLogger.java b/src/main/java/org/jboss/netty/logging/JBossLogger.java
index 9c8f4382c3..e3a37ef071 100644
--- a/src/main/java/org/jboss/netty/logging/JBossLogger.java
+++ b/src/main/java/org/jboss/netty/logging/JBossLogger.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import org.jboss.logging.Logger;
 
diff --git a/src/main/java/org/jboss/netty/logging/JBossLoggerFactory.java b/src/main/java/org/jboss/netty/logging/JBossLoggerFactory.java
index d017ba63b7..a5514e7362 100644
--- a/src/main/java/org/jboss/netty/logging/JBossLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/JBossLoggerFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 
 
diff --git a/src/main/java/org/jboss/netty/logging/JdkLogger.java b/src/main/java/org/jboss/netty/logging/JdkLogger.java
index 63103600c8..e8ad32053e 100644
--- a/src/main/java/org/jboss/netty/logging/JdkLogger.java
+++ b/src/main/java/org/jboss/netty/logging/JdkLogger.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/src/main/java/org/jboss/netty/logging/JdkLoggerFactory.java b/src/main/java/org/jboss/netty/logging/JdkLoggerFactory.java
index d801d0492f..72fd139165 100644
--- a/src/main/java/org/jboss/netty/logging/JdkLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/JdkLoggerFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/logging/Log4JLogger.java b/src/main/java/org/jboss/netty/logging/Log4JLogger.java
index d7e0ef6235..dd8f435576 100644
--- a/src/main/java/org/jboss/netty/logging/Log4JLogger.java
+++ b/src/main/java/org/jboss/netty/logging/Log4JLogger.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import org.apache.log4j.Logger;
 
diff --git a/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java b/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java
index 5d33d3afcd..82ffa5747d 100644
--- a/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 
 
diff --git a/src/main/java/org/jboss/netty/logging/OsgiLogger.java b/src/main/java/org/jboss/netty/logging/OsgiLogger.java
index e4f3650fe3..bb28810db9 100644
--- a/src/main/java/org/jboss/netty/logging/OsgiLogger.java
+++ b/src/main/java/org/jboss/netty/logging/OsgiLogger.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import org.osgi.service.log.LogService;
 
diff --git a/src/main/java/org/jboss/netty/logging/OsgiLoggerFactory.java b/src/main/java/org/jboss/netty/logging/OsgiLoggerFactory.java
index 29979c05cd..8ae6e74655 100644
--- a/src/main/java/org/jboss/netty/logging/OsgiLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/OsgiLoggerFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
diff --git a/src/main/java/org/jboss/netty/logging/Slf4JLogger.java b/src/main/java/org/jboss/netty/logging/Slf4JLogger.java
index 4ed1107d12..98e39aafc5 100644
--- a/src/main/java/org/jboss/netty/logging/Slf4JLogger.java
+++ b/src/main/java/org/jboss/netty/logging/Slf4JLogger.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import org.slf4j.Logger;
 
diff --git a/src/main/java/org/jboss/netty/logging/Slf4JLoggerFactory.java b/src/main/java/org/jboss/netty/logging/Slf4JLoggerFactory.java
index b98b9fbaca..79f15e0b07 100644
--- a/src/main/java/org/jboss/netty/logging/Slf4JLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/Slf4JLoggerFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 
 
diff --git a/src/main/java/org/jboss/netty/logging/package-info.java b/src/main/java/org/jboss/netty/logging/package-info.java
index 3c1335d96c..dd1a79e37e 100644
--- a/src/main/java/org/jboss/netty/logging/package-info.java
+++ b/src/main/java/org/jboss/netty/logging/package-info.java
@@ -20,4 +20,4 @@
  *
  * @apiviz.hidden
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
diff --git a/src/main/java/org/jboss/netty/util/CharsetUtil.java b/src/main/java/org/jboss/netty/util/CharsetUtil.java
index 628ede83c4..295bd6bd46 100644
--- a/src/main/java/org/jboss/netty/util/CharsetUtil.java
+++ b/src/main/java/org/jboss/netty/util/CharsetUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
diff --git a/src/main/java/org/jboss/netty/util/DebugUtil.java b/src/main/java/org/jboss/netty/util/DebugUtil.java
index e1c98c48b2..23bb644126 100644
--- a/src/main/java/org/jboss/netty/util/DebugUtil.java
+++ b/src/main/java/org/jboss/netty/util/DebugUtil.java
@@ -13,17 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.util.internal.SystemPropertyUtil;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.util.internal.SystemPropertyUtil;
 
 /**
  * Determines if Netty is running in a debug mode or not.  Please note that
  * this is not a Java debug mode.  You can enable Netty debug mode by
- * specifying the {@code "org.jboss.netty.debug"} system property (e.g.
- * {@code java -Dorg.jboss.netty.debug ...})
+ * specifying the {@code "io.netty.debug"} system property (e.g.
+ * {@code java -Dio.netty.debug ...})
  * 

  * If debug mode is disabled (default), the stack trace of the exceptions are
  * compressed to help debugging a user application.
@@ -43,7 +43,7 @@ public class DebugUtil {
     public static boolean isDebugEnabled() {
         String value;
         try {
-            value = SystemPropertyUtil.get("org.jboss.netty.debug");
+            value = SystemPropertyUtil.get("io.netty.debug");
         } catch (Exception e) {
             value = null;
         }
diff --git a/src/main/java/org/jboss/netty/util/DefaultObjectSizeEstimator.java b/src/main/java/org/jboss/netty/util/DefaultObjectSizeEstimator.java
index 03372dd0b5..901eed6fbf 100644
--- a/src/main/java/org/jboss/netty/util/DefaultObjectSizeEstimator.java
+++ b/src/main/java/org/jboss/netty/util/DefaultObjectSizeEstimator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -22,9 +22,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.util.internal.ConcurrentIdentityWeakKeyHashMap;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.MessageEvent;
+import io.netty.util.internal.ConcurrentIdentityWeakKeyHashMap;
 
 /**
  * The default {@link ObjectSizeEstimator} implementation for general purpose.
diff --git a/src/main/java/org/jboss/netty/util/EstimatableObjectWrapper.java b/src/main/java/org/jboss/netty/util/EstimatableObjectWrapper.java
index 993ed8bb76..fdace1ddd9 100644
--- a/src/main/java/org/jboss/netty/util/EstimatableObjectWrapper.java
+++ b/src/main/java/org/jboss/netty/util/EstimatableObjectWrapper.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 /**
  * Represents an object which contains another object that needs to be taken
diff --git a/src/main/java/org/jboss/netty/util/ExternalResourceReleasable.java b/src/main/java/org/jboss/netty/util/ExternalResourceReleasable.java
index fcfb108813..79c8d13be5 100644
--- a/src/main/java/org/jboss/netty/util/ExternalResourceReleasable.java
+++ b/src/main/java/org/jboss/netty/util/ExternalResourceReleasable.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 /**
  * A common interface for a class which depends on external resources that
diff --git a/src/main/java/org/jboss/netty/util/ExternalResourceUtil.java b/src/main/java/org/jboss/netty/util/ExternalResourceUtil.java
index 827be182d5..fe7b4cc0d0 100644
--- a/src/main/java/org/jboss/netty/util/ExternalResourceUtil.java
+++ b/src/main/java/org/jboss/netty/util/ExternalResourceUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 /**
  * A utility class that provides the convenient shutdown of
diff --git a/src/main/java/org/jboss/netty/util/HashedWheelTimer.java b/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
index d92680c629..5419a7a9b6 100644
--- a/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
+++ b/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -28,12 +28,12 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.internal.ConcurrentIdentityHashMap;
-import org.jboss.netty.util.internal.ReusableIterator;
-import org.jboss.netty.util.internal.SharedResourceMisuseDetector;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.internal.ConcurrentIdentityHashMap;
+import io.netty.util.internal.ReusableIterator;
+import io.netty.util.internal.SharedResourceMisuseDetector;
 
 /**
  * A {@link Timer} optimized for approximated I/O timeout scheduling.
diff --git a/src/main/java/org/jboss/netty/util/MapBackedSet.java b/src/main/java/org/jboss/netty/util/MapBackedSet.java
index db889ee0b7..16c5d95a96 100644
--- a/src/main/java/org/jboss/netty/util/MapBackedSet.java
+++ b/src/main/java/org/jboss/netty/util/MapBackedSet.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.io.Serializable;
 import java.util.AbstractSet;
diff --git a/src/main/java/org/jboss/netty/util/NamedThreadFactory.java b/src/main/java/org/jboss/netty/util/NamedThreadFactory.java
index 134a93c8f0..ba884beb39 100644
--- a/src/main/java/org/jboss/netty/util/NamedThreadFactory.java
+++ b/src/main/java/org/jboss/netty/util/NamedThreadFactory.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * A {@link ThreadFactory} that creates a new {@link Thread} with the specified name and thread ID.
diff --git a/src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java b/src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java
index 11b2df1d45..c7dcbd8394 100644
--- a/src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java
+++ b/src/main/java/org/jboss/netty/util/ObjectSizeEstimator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 
 /**
@@ -23,7 +23,7 @@ package org.jboss.netty.util;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.uses org.jboss.netty.util.EstimatableObjectWrapper
+ * @apiviz.uses io.netty.util.EstimatableObjectWrapper
  */
 public interface ObjectSizeEstimator {
 
diff --git a/src/main/java/org/jboss/netty/util/Timeout.java b/src/main/java/org/jboss/netty/util/Timeout.java
index 56459b76d6..d08c60e98d 100644
--- a/src/main/java/org/jboss/netty/util/Timeout.java
+++ b/src/main/java/org/jboss/netty/util/Timeout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 /**
  * A handle associated with a {@link TimerTask} that is returned by a
diff --git a/src/main/java/org/jboss/netty/util/Timer.java b/src/main/java/org/jboss/netty/util/Timer.java
index ce11f44733..73007fce1d 100644
--- a/src/main/java/org/jboss/netty/util/Timer.java
+++ b/src/main/java/org/jboss/netty/util/Timer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit;
  * @author Trustin Lee
  *
  * @apiviz.landmark
- * @apiviz.has org.jboss.netty.util.TimerTask oneway - - executes
- * @apiviz.has org.jboss.netty.util.Timeout oneway - - creates
+ * @apiviz.has io.netty.util.TimerTask oneway - - executes
+ * @apiviz.has io.netty.util.Timeout oneway - - creates
  */
 public interface Timer {
 
diff --git a/src/main/java/org/jboss/netty/util/TimerTask.java b/src/main/java/org/jboss/netty/util/TimerTask.java
index ce5453972b..60cb810f6f 100644
--- a/src/main/java/org/jboss/netty/util/TimerTask.java
+++ b/src/main/java/org/jboss/netty/util/TimerTask.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/org/jboss/netty/util/UnsafeDetectUtil.java b/src/main/java/org/jboss/netty/util/UnsafeDetectUtil.java
index caf4da2233..3f5a723f92 100644
--- a/src/main/java/org/jboss/netty/util/UnsafeDetectUtil.java
+++ b/src/main/java/org/jboss/netty/util/UnsafeDetectUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/src/main/java/org/jboss/netty/util/VirtualExecutorService.java b/src/main/java/org/jboss/netty/util/VirtualExecutorService.java
index f25966080e..46c800c18d 100644
--- a/src/main/java/org/jboss/netty/util/VirtualExecutorService.java
+++ b/src/main/java/org/jboss/netty/util/VirtualExecutorService.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.util.Collections;
 import java.util.IdentityHashMap;
@@ -25,8 +25,8 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 
 /**
diff --git a/src/main/java/org/jboss/netty/util/internal/AtomicFieldUpdaterUtil.java b/src/main/java/org/jboss/netty/util/internal/AtomicFieldUpdaterUtil.java
index d0f9f8f72a..c540380775 100644
--- a/src/main/java/org/jboss/netty/util/internal/AtomicFieldUpdaterUtil.java
+++ b/src/main/java/org/jboss/netty/util/internal/AtomicFieldUpdaterUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java
index 006894c1cb..566b6b53a3 100644
--- a/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java
+++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentHashMap.java
@@ -18,7 +18,7 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java
index a6a653453d..6c3e58ead0 100644
--- a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java
+++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityHashMap.java
@@ -18,7 +18,7 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
index 11f88cd2fe..a8476d221e 100644
--- a/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
+++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
@@ -18,7 +18,7 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
diff --git a/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java b/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java
index 88f18cdf08..8031805e14 100644
--- a/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java
+++ b/src/main/java/org/jboss/netty/util/internal/ConcurrentWeakKeyHashMap.java
@@ -18,7 +18,7 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
diff --git a/src/main/java/org/jboss/netty/util/internal/ConversionUtil.java b/src/main/java/org/jboss/netty/util/internal/ConversionUtil.java
index 6402de0882..ed0948d642 100644
--- a/src/main/java/org/jboss/netty/util/internal/ConversionUtil.java
+++ b/src/main/java/org/jboss/netty/util/internal/ConversionUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/jboss/netty/util/internal/DeadLockProofWorker.java b/src/main/java/org/jboss/netty/util/internal/DeadLockProofWorker.java
index 82a0b27f07..2a22af67e5 100644
--- a/src/main/java/org/jboss/netty/util/internal/DeadLockProofWorker.java
+++ b/src/main/java/org/jboss/netty/util/internal/DeadLockProofWorker.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java b/src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java
index 71e59c59d9..fd531c6f12 100644
--- a/src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java
+++ b/src/main/java/org/jboss/netty/util/internal/ExecutorUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
diff --git a/src/main/java/org/jboss/netty/util/internal/LegacyLinkedTransferQueue.java b/src/main/java/org/jboss/netty/util/internal/LegacyLinkedTransferQueue.java
index 5146c2b632..11d9a2ad7d 100644
--- a/src/main/java/org/jboss/netty/util/internal/LegacyLinkedTransferQueue.java
+++ b/src/main/java/org/jboss/netty/util/internal/LegacyLinkedTransferQueue.java
@@ -20,7 +20,7 @@
  * http://creativecommons.org/licenses/publicdomain
  */
 
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.AbstractQueue;
 import java.util.Collection;
diff --git a/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java b/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java
index 9612592377..b505abe6f0 100644
--- a/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java
+++ b/src/main/java/org/jboss/netty/util/internal/LinkedTransferQueue.java
@@ -4,7 +4,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.AbstractQueue;
 import java.util.Collection;
diff --git a/src/main/java/org/jboss/netty/util/internal/NonReentrantLock.java b/src/main/java/org/jboss/netty/util/internal/NonReentrantLock.java
index 61b6e8add8..ff367f1cf5 100644
--- a/src/main/java/org/jboss/netty/util/internal/NonReentrantLock.java
+++ b/src/main/java/org/jboss/netty/util/internal/NonReentrantLock.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.AbstractQueuedSynchronizer;
diff --git a/src/main/java/org/jboss/netty/util/internal/QueueFactory.java b/src/main/java/org/jboss/netty/util/internal/QueueFactory.java
index c506ca4943..eb4b03152a 100644
--- a/src/main/java/org/jboss/netty/util/internal/QueueFactory.java
+++ b/src/main/java/org/jboss/netty/util/internal/QueueFactory.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.Collection;
 import java.util.concurrent.BlockingQueue;
 
-import org.jboss.netty.util.UnsafeDetectUtil;
+import io.netty.util.UnsafeDetectUtil;
 
 /**
  * This factory should be used to create the "optimal" {@link BlockingQueue} instance for the running JVM. 
diff --git a/src/main/java/org/jboss/netty/util/internal/ReusableIterator.java b/src/main/java/org/jboss/netty/util/internal/ReusableIterator.java
index 98468ca923..83dc529474 100644
--- a/src/main/java/org/jboss/netty/util/internal/ReusableIterator.java
+++ b/src/main/java/org/jboss/netty/util/internal/ReusableIterator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.Iterator;
 
diff --git a/src/main/java/org/jboss/netty/util/internal/SharedResourceMisuseDetector.java b/src/main/java/org/jboss/netty/util/internal/SharedResourceMisuseDetector.java
index 4f9c9458ac..08c992a22a 100644
--- a/src/main/java/org/jboss/netty/util/internal/SharedResourceMisuseDetector.java
+++ b/src/main/java/org/jboss/netty/util/internal/SharedResourceMisuseDetector.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
 
 /**
  * Warn when user creates too many instances to avoid {@link OutOfMemoryError}.
diff --git a/src/main/java/org/jboss/netty/util/internal/StackTraceSimplifier.java b/src/main/java/org/jboss/netty/util/internal/StackTraceSimplifier.java
index ff7ba2c512..e376ae4bd9 100644
--- a/src/main/java/org/jboss/netty/util/internal/StackTraceSimplifier.java
+++ b/src/main/java/org/jboss/netty/util/internal/StackTraceSimplifier.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import org.jboss.netty.channel.DefaultChannelPipeline;
-import org.jboss.netty.channel.SimpleChannelHandler;
-import org.jboss.netty.channel.StaticChannelPipeline;
-import org.jboss.netty.util.DebugUtil;
+import io.netty.channel.DefaultChannelPipeline;
+import io.netty.channel.SimpleChannelHandler;
+import io.netty.channel.StaticChannelPipeline;
+import io.netty.util.DebugUtil;
 
 /**
  * Simplifies an exception stack trace by removing unnecessary
diff --git a/src/main/java/org/jboss/netty/util/internal/StringUtil.java b/src/main/java/org/jboss/netty/util/internal/StringUtil.java
index d544055e20..e82ef48f10 100644
--- a/src/main/java/org/jboss/netty/util/internal/StringUtil.java
+++ b/src/main/java/org/jboss/netty/util/internal/StringUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.Formatter;
 
diff --git a/src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java b/src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java
index 01518ae060..0e5e87410b 100644
--- a/src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java
+++ b/src/main/java/org/jboss/netty/util/internal/SystemPropertyUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.regex.Pattern;
 
diff --git a/src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java b/src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java
index fb98feb752..f46f140200 100644
--- a/src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java
+++ b/src/main/java/org/jboss/netty/util/internal/ThreadLocalBoolean.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 /**
  * @author The Netty Project
diff --git a/src/main/java/org/jboss/netty/util/internal/ThreadLocalRandom.java b/src/main/java/org/jboss/netty/util/internal/ThreadLocalRandom.java
index 67529f3d20..b085925d29 100644
--- a/src/main/java/org/jboss/netty/util/internal/ThreadLocalRandom.java
+++ b/src/main/java/org/jboss/netty/util/internal/ThreadLocalRandom.java
@@ -20,7 +20,7 @@
  * http://creativecommons.org/licenses/publicdomain
  */
 
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.Random;
 
diff --git a/src/main/java/org/jboss/netty/util/internal/UnterminatableExecutor.java b/src/main/java/org/jboss/netty/util/internal/UnterminatableExecutor.java
index 7cb6bb4464..63ed5d1e14 100644
--- a/src/main/java/org/jboss/netty/util/internal/UnterminatableExecutor.java
+++ b/src/main/java/org/jboss/netty/util/internal/UnterminatableExecutor.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Adler32.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Adler32.java
index cd4db2f387..1e417997f1 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/Adler32.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/Adler32.java
@@ -46,7 +46,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
 final class Adler32 {
 
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/CRC32.java b/src/main/java/org/jboss/netty/util/internal/jzlib/CRC32.java
index 82d0a3f2c7..61f093144d 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/CRC32.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/CRC32.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
 final class CRC32 {
     private static final int[] TABLE = {
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
index d463eb54e8..102447ae2e 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/Deflate.java
@@ -46,9 +46,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
-import org.jboss.netty.util.internal.jzlib.JZlib.WrapperType;
+import io.netty.util.internal.jzlib.JZlib.WrapperType;
 
 final class Deflate {
 
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java b/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java
index f3082d2fdf..5a4adb0317 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/InfBlocks.java
@@ -46,7 +46,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
 final class InfBlocks {
 
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java b/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java
index ef19c5c166..f6ee9ca55c 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/InfCodes.java
@@ -46,7 +46,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
 final class InfCodes {
 
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/InfTree.java b/src/main/java/org/jboss/netty/util/internal/jzlib/InfTree.java
index 74caae46a5..e0b0d15c8b 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/InfTree.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/InfTree.java
@@ -46,7 +46,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
 final class InfTree {
 
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java
index 42c399c4ff..618b80df3b 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/Inflate.java
@@ -46,9 +46,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
-import org.jboss.netty.util.internal.jzlib.JZlib.WrapperType;
+import io.netty.util.internal.jzlib.JZlib.WrapperType;
 
 final class Inflate {
 
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java b/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java
index 228b9ff425..0a4b2ebeba 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/JZlib.java
@@ -46,7 +46,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
 public final class JZlib {
 
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/StaticTree.java b/src/main/java/org/jboss/netty/util/internal/jzlib/StaticTree.java
index e22f7e3069..6d82e22677 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/StaticTree.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/StaticTree.java
@@ -46,7 +46,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
 final class StaticTree {
     static final short[] static_ltree = { 12, 8, 140, 8, 76, 8, 204, 8, 44, 8,
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/Tree.java b/src/main/java/org/jboss/netty/util/internal/jzlib/Tree.java
index ce1088cdbd..deec53832f 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/Tree.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/Tree.java
@@ -46,7 +46,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
 final class Tree {
     // extra bits for each length code
diff --git a/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java b/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java
index 52d4e5d9ad..a4e171d4f7 100644
--- a/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java
+++ b/src/main/java/org/jboss/netty/util/internal/jzlib/ZStream.java
@@ -46,9 +46,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * and contributors of zlib.
  */
 
-package org.jboss.netty.util.internal.jzlib;
+package io.netty.util.internal.jzlib;
 
-import org.jboss.netty.util.internal.jzlib.JZlib.WrapperType;
+import io.netty.util.internal.jzlib.JZlib.WrapperType;
 
 public final class ZStream {
 
diff --git a/src/main/java/org/jboss/netty/util/internal/package-info.java b/src/main/java/org/jboss/netty/util/internal/package-info.java
index 452a37c795..c7421eba3b 100644
--- a/src/main/java/org/jboss/netty/util/internal/package-info.java
+++ b/src/main/java/org/jboss/netty/util/internal/package-info.java
@@ -18,4 +18,4 @@
  * Internal-use-only utilities which is not allowed to be used
  * outside Netty.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
diff --git a/src/main/java/org/jboss/netty/util/package-info.java b/src/main/java/org/jboss/netty/util/package-info.java
index d7b450ff6d..0e08802faf 100644
--- a/src/main/java/org/jboss/netty/util/package-info.java
+++ b/src/main/java/org/jboss/netty/util/package-info.java
@@ -23,4 +23,4 @@
  * @apiviz.exclude Util$
  * @apiviz.exclude \.EstimatableObjectWrapper$
  */
-package org.jboss.netty.util;
+package io.netty.util;
diff --git a/src/main/resources/META-INF/jboss-beans.xml b/src/main/resources/META-INF/jboss-beans.xml
index 00a106e1ae..d1e60af935 100644
--- a/src/main/resources/META-INF/jboss-beans.xml
+++ b/src/main/resources/META-INF/jboss-beans.xml
@@ -18,7 +18,7 @@
             xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd"
             xmlns="urn:jboss:bean-deployer:2.0">
 
-  
+  
 
 
\ No newline at end of file
diff --git a/src/main/resources/org/jboss/netty/container/spring/beans.xml b/src/main/resources/org/jboss/netty/container/spring/beans.xml
index 2fec0fc4d8..452e3fd448 100644
--- a/src/main/resources/org/jboss/netty/container/spring/beans.xml
+++ b/src/main/resources/org/jboss/netty/container/spring/beans.xml
@@ -18,8 +18,8 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
-  
 
 
diff --git a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java
index e6fc5711c0..3b52c1e134 100644
--- a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java
+++ b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketClientBootstrapTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.bootstrap;
+package io.netty.bootstrap;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
@@ -25,13 +25,13 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipelineException;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.util.DummyHandler;
-import org.jboss.netty.util.TestUtil;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipelineException;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.util.DummyHandler;
+import io.netty.util.TestUtil;
+import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java
index 92dd22bad5..58c88f4d12 100644
--- a/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java
+++ b/src/test/java/org/jboss/netty/bootstrap/AbstractSocketServerBootstrapTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.bootstrap;
+package io.netty.bootstrap;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
@@ -26,19 +26,19 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipelineException;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.ChildChannelStateEvent;
-import org.jboss.netty.channel.ServerChannelFactory;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
-import org.jboss.netty.util.DummyHandler;
-import org.jboss.netty.util.TestUtil;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipelineException;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.ChildChannelStateEvent;
+import io.netty.channel.ServerChannelFactory;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.socket.SocketChannelConfig;
+import io.netty.util.DummyHandler;
+import io.netty.util.TestUtil;
+import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/bootstrap/BootstrapOrderedMapTest.java b/src/test/java/org/jboss/netty/bootstrap/BootstrapOrderedMapTest.java
index a55cff404e..f773824b5c 100644
--- a/src/test/java/org/jboss/netty/bootstrap/BootstrapOrderedMapTest.java
+++ b/src/test/java/org/jboss/netty/bootstrap/BootstrapOrderedMapTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.bootstrap;
+package io.netty.bootstrap;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java
index 0280363f72..3bcb589de3 100644
--- a/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java
+++ b/src/test/java/org/jboss/netty/bootstrap/BootstrapTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.bootstrap;
+package io.netty.bootstrap;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
@@ -25,11 +25,11 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Map.Entry;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.util.DummyHandler;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.util.DummyHandler;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/jboss/netty/bootstrap/NioSocketClientBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/NioSocketClientBootstrapTest.java
index e3bd749c25..b00fd3e84b 100644
--- a/src/test/java/org/jboss/netty/bootstrap/NioSocketClientBootstrapTest.java
+++ b/src/test/java/org/jboss/netty/bootstrap/NioSocketClientBootstrapTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.bootstrap;
+package io.netty.bootstrap;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 /**
  * A test for New I/O socket client bootstraps
diff --git a/src/test/java/org/jboss/netty/bootstrap/NioSocketServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/NioSocketServerBootstrapTest.java
index 53998f7927..37a74fa515 100644
--- a/src/test/java/org/jboss/netty/bootstrap/NioSocketServerBootstrapTest.java
+++ b/src/test/java/org/jboss/netty/bootstrap/NioSocketServerBootstrapTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.bootstrap;
+package io.netty.bootstrap;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * A test for New I/O socket server bootstraps
diff --git a/src/test/java/org/jboss/netty/bootstrap/OioSocketClientBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/OioSocketClientBootstrapTest.java
index c6438e6ef1..b408ae41e1 100644
--- a/src/test/java/org/jboss/netty/bootstrap/OioSocketClientBootstrapTest.java
+++ b/src/test/java/org/jboss/netty/bootstrap/OioSocketClientBootstrapTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.bootstrap;
+package io.netty.bootstrap;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
 
 /**
  * A test for "Old" I/O socket client bootstraps
diff --git a/src/test/java/org/jboss/netty/bootstrap/OioSocketServerBootstrapTest.java b/src/test/java/org/jboss/netty/bootstrap/OioSocketServerBootstrapTest.java
index 059a3418ea..42efecf8f0 100644
--- a/src/test/java/org/jboss/netty/bootstrap/OioSocketServerBootstrapTest.java
+++ b/src/test/java/org/jboss/netty/bootstrap/OioSocketServerBootstrapTest.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.bootstrap;
+package io.netty.bootstrap;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * A socket server bootstrap test for "Old" I/O
diff --git a/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java
index aaa14b00b3..7858cb8c11 100644
--- a/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayInputStream;
@@ -26,7 +26,7 @@ import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.util.CharsetUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java
index 964722b066..5a19719abc 100644
--- a/src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/AbstractCompositeChannelBufferTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 import static org.junit.Assert.*;
 
 import java.nio.ByteBuffer;
diff --git a/src/test/java/org/jboss/netty/buffer/BigEndianCompositeChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/BigEndianCompositeChannelBufferTest.java
index 766f03e7d0..9c9edb1e06 100644
--- a/src/test/java/org/jboss/netty/buffer/BigEndianCompositeChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/BigEndianCompositeChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 
 /**
diff --git a/src/test/java/org/jboss/netty/buffer/BigEndianDirectChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/BigEndianDirectChannelBufferTest.java
index ac7d94401c..cd3583178b 100644
--- a/src/test/java/org/jboss/netty/buffer/BigEndianDirectChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/BigEndianDirectChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java
index 1b58176057..2c77496a7e 100644
--- a/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java
index 561138bfe3..3a40779575 100644
--- a/src/test/java/org/jboss/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/test/java/org/jboss/netty/buffer/ChannelBufferIndexFinderTest.java b/src/test/java/org/jboss/netty/buffer/ChannelBufferIndexFinderTest.java
index 9fbd1b9487..b3e33af319 100644
--- a/src/test/java/org/jboss/netty/buffer/ChannelBufferIndexFinderTest.java
+++ b/src/test/java/org/jboss/netty/buffer/ChannelBufferIndexFinderTest.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.util.CharsetUtil;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/jboss/netty/buffer/ChannelBufferStreamTest.java b/src/test/java/org/jboss/netty/buffer/ChannelBufferStreamTest.java
index 39fef6552f..d087dba23d 100644
--- a/src/test/java/org/jboss/netty/buffer/ChannelBufferStreamTest.java
+++ b/src/test/java/org/jboss/netty/buffer/ChannelBufferStreamTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java b/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java
index 9a51f7c324..6947eef900 100644
--- a/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java
+++ b/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 import static org.junit.Assert.*;
 
 import java.io.InputStream;
diff --git a/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java
index 164f5d95e8..205090093b 100644
--- a/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/buffer/DynamicChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/DynamicChannelBufferTest.java
index 06d3c7cd39..fa3bb336bf 100644
--- a/src/test/java/org/jboss/netty/buffer/DynamicChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/DynamicChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/buffer/LittleEndianCompositeChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/LittleEndianCompositeChannelBufferTest.java
index 78bfeb2f55..ad03f23cff 100644
--- a/src/test/java/org/jboss/netty/buffer/LittleEndianCompositeChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/LittleEndianCompositeChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 
 /**
diff --git a/src/test/java/org/jboss/netty/buffer/LittleEndianDirectChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/LittleEndianDirectChannelBufferTest.java
index cad1ed2ceb..965c7c4ab9 100644
--- a/src/test/java/org/jboss/netty/buffer/LittleEndianDirectChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/LittleEndianDirectChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java
index 7c73cae31e..4817c64e13 100644
--- a/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/buffer/ReadOnlyChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/ReadOnlyChannelBufferTest.java
index c1eba85974..bc7299ccb3 100644
--- a/src/test/java/org/jboss/netty/buffer/ReadOnlyChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/ReadOnlyChannelBufferTest.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.easymock.EasyMock.*;
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
diff --git a/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java
index 54e1d507e8..e802681ed9 100644
--- a/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java
index 2ccd6e3e5a..7fe3035ed5 100644
--- a/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.buffer;
+package io.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java b/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java
index f9f4294b57..47ee16d589 100644
--- a/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java
+++ b/src/test/java/org/jboss/netty/channel/CompleteChannelFutureTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/jboss/netty/channel/FailedChannelFutureTest.java b/src/test/java/org/jboss/netty/channel/FailedChannelFutureTest.java
index a1ed18ab24..d606057eb5 100644
--- a/src/test/java/org/jboss/netty/channel/FailedChannelFutureTest.java
+++ b/src/test/java/org/jboss/netty/channel/FailedChannelFutureTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/jboss/netty/channel/StaticChannelPipelineTest.java b/src/test/java/org/jboss/netty/channel/StaticChannelPipelineTest.java
index 5e5e72aa12..637fa518d3 100644
--- a/src/test/java/org/jboss/netty/channel/StaticChannelPipelineTest.java
+++ b/src/test/java/org/jboss/netty/channel/StaticChannelPipelineTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import java.util.Map;
 
diff --git a/src/test/java/org/jboss/netty/channel/SucceededChannelFutureTest.java b/src/test/java/org/jboss/netty/channel/SucceededChannelFutureTest.java
index 44eba4b796..b8656cd9f8 100644
--- a/src/test/java/org/jboss/netty/channel/SucceededChannelFutureTest.java
+++ b/src/test/java/org/jboss/netty/channel/SucceededChannelFutureTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel;
+package io.netty.channel;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
index f9e5ccb50b..ef0249a635 100644
--- a/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/AbstractSocketEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import static org.junit.Assert.*;
 
@@ -25,20 +25,20 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.util.TestUtil;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.util.TestUtil;
+import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java b/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java
index 33820e8e73..f9177a1ef2 100644
--- a/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import static org.junit.Assert.*;
 
@@ -22,11 +22,11 @@ import java.net.InetSocketAddress;
 import java.nio.channels.ServerSocketChannel;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.util.DummyHandler;
-import org.jboss.netty.util.TestUtil;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.util.DummyHandler;
+import io.netty.util.TestUtil;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/jboss/netty/channel/socket/NioNioSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/NioNioSocketEchoTest.java
index 7dd41bd3a4..0ec4563a53 100644
--- a/src/test/java/org/jboss/netty/channel/socket/NioNioSocketEchoTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/NioNioSocketEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/channel/socket/NioOioSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/NioOioSocketEchoTest.java
index 5cfc7b6d77..9536bc35ea 100644
--- a/src/test/java/org/jboss/netty/channel/socket/NioOioSocketEchoTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/NioOioSocketEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java
index 3912bbff36..518b3279da 100644
--- a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import static org.junit.Assert.*;
 
@@ -22,13 +22,13 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.util.TestUtil;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.util.TestUtil;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/jboss/netty/channel/socket/OioNioSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/OioNioSocketEchoTest.java
index 404f2d6f84..904ef35300 100644
--- a/src/test/java/org/jboss/netty/channel/socket/OioNioSocketEchoTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/OioNioSocketEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/channel/socket/OioOioSocketEchoTest.java b/src/test/java/org/jboss/netty/channel/socket/OioOioSocketEchoTest.java
index f9f88ad3f9..8b9c98254b 100644
--- a/src/test/java/org/jboss/netty/channel/socket/OioOioSocketEchoTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/OioOioSocketEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket;
+package io.netty.channel.socket;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelRequestDispatchTest.java b/src/test/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelRequestDispatchTest.java
index 4d50dc8621..db7c1c100b 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelRequestDispatchTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/AcceptedServerChannelRequestDispatchTest.java
@@ -14,21 +14,21 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.Channels;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/FakeChannelConfig.java b/src/test/java/org/jboss/netty/channel/socket/http/FakeChannelConfig.java
index 591d752b8f..cfc8cc4ef0 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/FakeChannelConfig.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/FakeChannelConfig.java
@@ -14,18 +14,18 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
-import org.jboss.netty.util.internal.ConversionUtil;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.HeapChannelBufferFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.SocketChannelConfig;
+import io.netty.util.internal.ConversionUtil;
 
 /**
  * A face channel config class for use in testing
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/FakeChannelSink.java b/src/test/java/org/jboss/netty/channel/socket/http/FakeChannelSink.java
index ea014a8e13..95aced4c85 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/FakeChannelSink.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/FakeChannelSink.java
@@ -14,14 +14,14 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.jboss.netty.channel.AbstractChannelSink;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelPipeline;
+import io.netty.channel.AbstractChannelSink;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelPipeline;
 
 /**
  * A fake channel sink for use in testing
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/FakeClientSocketChannelFactory.java b/src/test/java/org/jboss/netty/channel/socket/http/FakeClientSocketChannelFactory.java
index 770843b685..d7bd833f82 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/FakeClientSocketChannelFactory.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/FakeClientSocketChannelFactory.java
@@ -14,14 +14,14 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.SocketChannel;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.ClientSocketChannelFactory;
+import io.netty.channel.socket.SocketChannel;
 
 /**
  * A fake client socket channel factory for use in testing
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannel.java b/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannel.java
index 1028a8f806..c5b9f603f3 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannel.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannel.java
@@ -14,20 +14,20 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import static org.jboss.netty.channel.Channels.fireChannelBound;
-import static org.jboss.netty.channel.Channels.fireChannelConnected;
-import static org.jboss.netty.channel.Channels.fireChannelOpen;
+import static io.netty.channel.Channels.fireChannelBound;
+import static io.netty.channel.Channels.fireChannelConnected;
+import static io.netty.channel.Channels.fireChannelOpen;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannelConfig;
 
 /**
  * A fake server socket channel for use in testing
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannelConfig.java b/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannelConfig.java
index 62212f79ce..e28c34bbe7 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannelConfig.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannelConfig.java
@@ -14,13 +14,13 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.buffer.ChannelBufferFactory;
-import org.jboss.netty.buffer.HeapChannelBufferFactory;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.DefaultChannelConfig;
-import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.buffer.ChannelBufferFactory;
+import io.netty.buffer.HeapChannelBufferFactory;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.DefaultChannelConfig;
+import io.netty.channel.socket.ServerSocketChannelConfig;
 
 /**
  * A fake server socket channel config class for use in testing
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannelFactory.java b/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannelFactory.java
index 11273c3d15..75595d654d 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannelFactory.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/FakeServerSocketChannelFactory.java
@@ -14,12 +14,12 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannelFactory;
 
 /**
  * A fake server socket channel factory for use in testing
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/FakeSocketChannel.java b/src/test/java/org/jboss/netty/channel/socket/http/FakeSocketChannel.java
index 631d43a098..b9c2917a4f 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/FakeSocketChannel.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/FakeSocketChannel.java
@@ -14,19 +14,19 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.channel.AbstractChannel;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelSink;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.channel.socket.SocketChannelConfig;
+import io.netty.channel.AbstractChannel;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelSink;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.SocketChannelConfig;
 
 /**
  * A fake socket channel for use in testing
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelSinkTest.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelSinkTest.java
index 57371990d8..63bf5abb88 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelSinkTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelAcceptedChannelSinkTest.java
@@ -14,12 +14,12 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelConfigTest.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelConfigTest.java
index ebf61944ea..01cba73e12 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelConfigTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelConfigTest.java
@@ -14,13 +14,13 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.jboss.netty.channel.socket.SocketChannelConfig;
+import io.netty.channel.socket.SocketChannelConfig;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelTest.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelTest.java
index 6c47d0ecb9..b2beec3ad3 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientChannelTest.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -25,13 +25,13 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientPollHandlerTest.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientPollHandlerTest.java
index 95b55f5e65..c98ce503f8 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientPollHandlerTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientPollHandlerTest.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -23,12 +23,12 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.DownstreamMessageEvent;
-import org.jboss.netty.handler.codec.http.HttpRequest;
-import org.jboss.netty.handler.codec.http.HttpResponse;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.DownstreamMessageEvent;
+import io.netty.handler.codec.http.HttpRequest;
+import io.netty.handler.codec.http.HttpResponse;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientSendHandlerTest.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientSendHandlerTest.java
index 1ac222fc27..656132a1a4 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientSendHandlerTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelClientSendHandlerTest.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,14 +24,14 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.DownstreamMessageEvent;
-import org.jboss.netty.handler.codec.http.HttpHeaders;
-import org.jboss.netty.handler.codec.http.HttpRequest;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelState;
+import io.netty.channel.Channels;
+import io.netty.channel.DownstreamMessageEvent;
+import io.netty.handler.codec.http.HttpHeaders;
+import io.netty.handler.codec.http.HttpRequest;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelFactoryTest.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelFactoryTest.java
index 976ff1010d..68926e882f 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelFactoryTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelFactoryTest.java
@@ -14,17 +14,17 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.fail;
 
-import org.jboss.netty.channel.ChannelException;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
-import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
+import io.netty.channel.ChannelException;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.socket.ServerSocketChannelFactory;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSinkTest.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSinkTest.java
index 068ac55b45..2d5e1f2c71 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSinkTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelSinkTest.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -22,13 +22,13 @@ import static org.junit.Assert.assertTrue;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.socket.ServerSocketChannel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.socket.ServerSocketChannel;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelTest.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelTest.java
index 3bd750dfa8..8a31eaf737 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelServerChannelTest.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -26,14 +26,14 @@ import static org.junit.Assert.assertTrue;
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.UpstreamChannelStateEvent;
-import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.ChannelState;
+import io.netty.channel.Channels;
+import io.netty.channel.UpstreamChannelStateEvent;
+import io.netty.channel.socket.ServerSocketChannelConfig;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelSoakTester.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelSoakTester.java
index bc362b2988..7255acf868 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelSoakTester.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelSoakTester.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -31,26 +31,26 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
-import org.jboss.netty.channel.socket.SocketChannel;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.channel.socket.ClientSocketChannelFactory;
+import io.netty.channel.socket.ServerSocketChannelFactory;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * Tests HTTP tunnel soaking
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelTest.java b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelTest.java
index 586daa2b87..8113fb0339 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/HttpTunnelTest.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -27,24 +27,24 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.ChannelPipelineFactory;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.ChannelPipelineFactory;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/MockChannelStateListener.java b/src/test/java/org/jboss/netty/channel/socket/http/MockChannelStateListener.java
index e30277416a..69993032e6 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/MockChannelStateListener.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/MockChannelStateListener.java
@@ -14,14 +14,14 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelFuture;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelFuture;
 
 /**
  * A mock channel state listener
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/NettyTestUtils.java b/src/test/java/org/jboss/netty/channel/socket/http/NettyTestUtils.java
index 98bd7aa1aa..76efe17aba 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/NettyTestUtils.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/NettyTestUtils.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertTrue;
 
@@ -30,14 +30,14 @@ import java.util.List;
 
 import junit.framework.Assert;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelState;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.DownstreamMessageEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.UpstreamMessageEvent;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelState;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.DownstreamMessageEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.UpstreamMessageEvent;
 
 /**
  * Test utilities for Netty
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/NettyTestUtilsTest.java b/src/test/java/org/jboss/netty/channel/socket/http/NettyTestUtilsTest.java
index 6f3de78e77..979e4b70d5 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/NettyTestUtilsTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/NettyTestUtilsTest.java
@@ -14,15 +14,15 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import java.util.List;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/NullChannelHandler.java b/src/test/java/org/jboss/netty/channel/socket/http/NullChannelHandler.java
index 356ab356c9..30a3d34d5b 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/NullChannelHandler.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/NullChannelHandler.java
@@ -14,12 +14,12 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelUpstreamHandler;
 
 /**
  * A channel handler that simply sends events upstream or downstream
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/SaturationManagerTest.java b/src/test/java/org/jboss/netty/channel/socket/http/SaturationManagerTest.java
index 8916cd1892..71a9b4cc50 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/SaturationManagerTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/SaturationManagerTest.java
@@ -1,7 +1,7 @@
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.*;
-import static org.jboss.netty.channel.socket.http.SaturationStateChange.*;
+import static io.netty.channel.socket.http.SaturationStateChange.*;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchTest.java b/src/test/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchTest.java
index d7eb76daf0..ef5e7498d0 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/ServerMessageSwitchTest.java
@@ -14,18 +14,18 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.*;
 
 import java.net.InetSocketAddress;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.socket.http.ServerMessageSwitchUpstreamInterface.TunnelStatus;
-import org.jboss.netty.handler.codec.http.HttpResponse;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.socket.http.ServerMessageSwitchUpstreamInterface.TunnelStatus;
+import io.netty.handler.codec.http.HttpResponse;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/UpstreamEventCatcher.java b/src/test/java/org/jboss/netty/channel/socket/http/UpstreamEventCatcher.java
index 4c7918dd6c..7e35a6d8d1 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/UpstreamEventCatcher.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/UpstreamEventCatcher.java
@@ -14,14 +14,14 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import java.util.LinkedList;
 import java.util.Queue;
 
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelUpstreamHandler;
 
 /**
  * Tests the upstream event catcher
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/WriteFragmenterTest.java b/src/test/java/org/jboss/netty/channel/socket/http/WriteFragmenterTest.java
index a4aa7e8aba..9fa63f9a2e 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/WriteFragmenterTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/WriteFragmenterTest.java
@@ -14,19 +14,19 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.Channels;
-import org.jboss.netty.channel.MessageEvent;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.Channels;
+import io.netty.channel.MessageEvent;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/channel/socket/http/WriteSplitterTest.java b/src/test/java/org/jboss/netty/channel/socket/http/WriteSplitterTest.java
index ac40d2265e..c7dcdc978c 100644
--- a/src/test/java/org/jboss/netty/channel/socket/http/WriteSplitterTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/http/WriteSplitterTest.java
@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package org.jboss.netty.channel.socket.http;
+package io.netty.channel.socket.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -22,8 +22,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelTest.java b/src/test/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelTest.java
index 2ca91a0a37..03c2c1c688 100644
--- a/src/test/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelTest.java
+++ b/src/test/java/org/jboss/netty/channel/socket/nio/NioDatagramChannelTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import static org.junit.Assert.*;
 
@@ -22,10 +22,10 @@ import java.net.DatagramPacket;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import org.jboss.netty.bootstrap.ConnectionlessBootstrap;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFuture;
+import io.netty.bootstrap.ConnectionlessBootstrap;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/channel/socket/nio/SimpleHandler.java b/src/test/java/org/jboss/netty/channel/socket/nio/SimpleHandler.java
index 442273a480..d1de25d12a 100644
--- a/src/test/java/org/jboss/netty/channel/socket/nio/SimpleHandler.java
+++ b/src/test/java/org/jboss/netty/channel/socket/nio/SimpleHandler.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelHandler;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelHandler;
 
 /**
  * A very simple channel handler
diff --git a/src/test/java/org/jboss/netty/channel/socket/nio/UdpClient.java b/src/test/java/org/jboss/netty/channel/socket/nio/UdpClient.java
index 4a41038a63..3bb6f1250f 100644
--- a/src/test/java/org/jboss/netty/channel/socket/nio/UdpClient.java
+++ b/src/test/java/org/jboss/netty/channel/socket/nio/UdpClient.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.channel.socket.nio;
+package io.netty.channel.socket.nio;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/src/test/java/org/jboss/netty/handler/codec/bytes/ByteArrayDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/bytes/ByteArrayDecoderTest.java
index 90b086b093..a48b73974c 100644
--- a/src/test/java/org/jboss/netty/handler/codec/bytes/ByteArrayDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/bytes/ByteArrayDecoderTest.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.bytes;
+package io.netty.handler.codec.bytes;
 
 import static org.hamcrest.core.Is.is;
-import static org.jboss.netty.buffer.ChannelBuffers.wrappedBuffer;
+import static io.netty.buffer.ChannelBuffers.wrappedBuffer;
 import static org.junit.Assert.assertThat;
 
 import java.util.Random;
 
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+import io.netty.handler.codec.embedder.DecoderEmbedder;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/handler/codec/bytes/ByteArrayEncoderTest.java b/src/test/java/org/jboss/netty/handler/codec/bytes/ByteArrayEncoderTest.java
index 6705f970bb..44b7862741 100644
--- a/src/test/java/org/jboss/netty/handler/codec/bytes/ByteArrayEncoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/bytes/ByteArrayEncoderTest.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.bytes;
+package io.netty.handler.codec.bytes;
 
 import static org.hamcrest.core.Is.is;
-import static org.jboss.netty.buffer.ChannelBuffers.wrappedBuffer;
+import static io.netty.buffer.ChannelBuffers.wrappedBuffer;
 import static org.junit.Assert.assertThat;
 
 import java.util.Random;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.codec.embedder.EncoderEmbedder;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
index a83503a886..a2de361672 100644
--- a/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
 import static org.junit.Assert.*;
 
@@ -25,20 +25,20 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.util.TestUtil;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.util.TestUtil;
+import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java
index 0d03407b61..a9259bb994 100644
--- a/src/test/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.codec.embedder.CodecEmbedderException;
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.handler.codec.embedder.CodecEmbedderException;
+import io.netty.handler.codec.embedder.DecoderEmbedder;
+import io.netty.util.CharsetUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java
index 54236f5424..aa19047bc3 100644
--- a/src/test/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.handler.codec.embedder.CodecEmbedderException;
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.handler.codec.embedder.CodecEmbedderException;
+import io.netty.handler.codec.embedder.DecoderEmbedder;
+import io.netty.util.CharsetUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java
index 0e6582bbaf..5c8ce95d79 100644
--- a/src/test/java/org/jboss/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java
index ff494248aa..2f45c4d6bf 100644
--- a/src/test/java/org/jboss/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java
index 628b61346c..3887a05f94 100644
--- a/src/test/java/org/jboss/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java
index 0dad1e93ad..62614e092b 100644
--- a/src/test/java/org/jboss/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.frame;
+package io.netty.handler.codec.frame;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java
index ca19340f3e..c50f25fd23 100644
--- a/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/http/CookieDecoderTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java
index 1a903d2ee1..c89e9af8a3 100644
--- a/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/http/CookieEncoderTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/src/test/java/org/jboss/netty/handler/codec/http/DefaultHttpMessageTest.java b/src/test/java/org/jboss/netty/handler/codec/http/DefaultHttpMessageTest.java
index f542bd6e28..61791312d7 100644
--- a/src/test/java/org/jboss/netty/handler/codec/http/DefaultHttpMessageTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/http/DefaultHttpMessageTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormatTest.java b/src/test/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormatTest.java
index 8f418aa5be..96abdad9eb 100644
--- a/src/test/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormatTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/http/HttpHeaderDateFormatTest.java
@@ -1,4 +1,4 @@
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
 import java.text.ParseException;
 import java.util.Date;
diff --git a/src/test/java/org/jboss/netty/handler/codec/http/QueryStringDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/http/QueryStringDecoderTest.java
index 5317f1d631..ba92c2f794 100644
--- a/src/test/java/org/jboss/netty/handler/codec/http/QueryStringDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/http/QueryStringDecoderTest.java
@@ -13,9 +13,9 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.http;
+package io.netty.handler.codec.http;
 
-import org.jboss.netty.util.CharsetUtil;
+import io.netty.util.CharsetUtil;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java
index 2bc2bd23df..2119994762 100644
--- a/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java
@@ -13,15 +13,15 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.protobuf;
+package io.netty.handler.codec.protobuf;
 
 import static org.hamcrest.core.Is.*;
 import static org.hamcrest.core.IsNull.*;
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 import static org.junit.Assert.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.codec.embedder.DecoderEmbedder;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java b/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java
index 20315b103a..9b5e9431e4 100644
--- a/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java
@@ -13,14 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.protobuf;
+package io.netty.handler.codec.protobuf;
 
 import static org.hamcrest.core.Is.*;
-import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static io.netty.buffer.ChannelBuffers.*;
 import static org.junit.Assert.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.handler.codec.embedder.EncoderEmbedder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.handler.codec.embedder.EncoderEmbedder;
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java
index 9a263a4065..92a3deed6f 100644
--- a/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderTest.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.replay;
+package io.netty.handler.codec.replay;
 
 import static org.junit.Assert.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBufferIndexFinder;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.handler.codec.embedder.DecoderEmbedder;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBufferIndexFinder;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.handler.codec.embedder.DecoderEmbedder;
 import org.junit.Test;
 
 /**
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
index 33bff60960..a9e565fd4e 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import static org.junit.Assert.*;
 
@@ -25,18 +25,18 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.util.TestUtil;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.util.TestUtil;
+import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
index 9a4a19e98b..7da5f0f7bd 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import static org.junit.Assert.*;
 
@@ -25,18 +25,18 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.util.TestUtil;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.util.TestUtil;
+import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/CompactObjectSerializationTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/CompactObjectSerializationTest.java
index b233981ddb..274fc88315 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/CompactObjectSerializationTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/CompactObjectSerializationTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java
index 491719e3a7..f7ced2a059 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java
index eb571824d4..2cee3d37ec 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java
index a3a8db1f9d..cbe65a2c94 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java
index d40866e445..24dd324ed5 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java
index 8b31e5e06f..00a5ab12e3 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketObjectStreamEchoTest.java
index 7521925672..7787940065 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/OioNioSocketObjectStreamEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java
index 36a310a923..70ac618c17 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java
index 7fb03c415f..cf3a3a6227 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStreamTest.java b/src/test/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStreamTest.java
index 9209233bbd..c80e5d451d 100644
--- a/src/test/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStreamTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/serialization/SwitchableInputStreamTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.serialization;
+package io.netty.handler.codec.serialization;
 
 import static org.easymock.EasyMock.*;
 import static org.easymock.classextension.EasyMock.*;
diff --git a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
index 2cc11d31f3..23849d0193 100644
--- a/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/string/AbstractSocketStringEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.string;
+package io.netty.handler.codec.string;
 
 import static org.junit.Assert.*;
 
@@ -25,21 +25,21 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.Delimiters;
-import org.jboss.netty.util.CharsetUtil;
-import org.jboss.netty.util.TestUtil;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import io.netty.handler.codec.frame.Delimiters;
+import io.netty.util.CharsetUtil;
+import io.netty.util.TestUtil;
+import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/handler/codec/string/NioNioSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/NioNioSocketStringEchoTest.java
index 4214b5e01b..709e0abba5 100644
--- a/src/test/java/org/jboss/netty/handler/codec/string/NioNioSocketStringEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/string/NioNioSocketStringEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.string;
+package io.netty.handler.codec.string;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/string/NioOioSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/NioOioSocketStringEchoTest.java
index aaf40c8f47..77213c2031 100644
--- a/src/test/java/org/jboss/netty/handler/codec/string/NioOioSocketStringEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/string/NioOioSocketStringEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.string;
+package io.netty.handler.codec.string;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/string/OioNioSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/OioNioSocketStringEchoTest.java
index 5eec850e26..2f374f63d7 100644
--- a/src/test/java/org/jboss/netty/handler/codec/string/OioNioSocketStringEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/string/OioNioSocketStringEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.string;
+package io.netty.handler.codec.string;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/codec/string/OioOioSocketStringEchoTest.java b/src/test/java/org/jboss/netty/handler/codec/string/OioOioSocketStringEchoTest.java
index 52029e13a9..a0b03ae4fb 100644
--- a/src/test/java/org/jboss/netty/handler/codec/string/OioOioSocketStringEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/codec/string/OioOioSocketStringEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.codec.string;
+package io.netty.handler.codec.string;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/ipfilter/IpFilterRuleTest.java b/src/test/java/org/jboss/netty/handler/ipfilter/IpFilterRuleTest.java
index 4f6bc64305..f90df2f260 100644
--- a/src/test/java/org/jboss/netty/handler/ipfilter/IpFilterRuleTest.java
+++ b/src/test/java/org/jboss/netty/handler/ipfilter/IpFilterRuleTest.java
@@ -1,4 +1,4 @@
-package org.jboss.netty.handler.ipfilter;
+package io.netty.handler.ipfilter;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -6,15 +6,15 @@ import java.net.SocketAddress;
 
 import junit.framework.TestCase;
 
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelConfig;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandler;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelPipeline;
-import org.jboss.netty.channel.UpstreamMessageEvent;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelConfig;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.UpstreamMessageEvent;
 import org.junit.Test;
 
 public class IpFilterRuleTest extends TestCase
diff --git a/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java
index 812b901b17..e05498c039 100644
--- a/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/ssl/AbstractSocketSslEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
 
 import static org.junit.Assert.*;
 
@@ -27,25 +27,25 @@ import java.util.concurrent.atomic.AtomicReference;
 
 import javax.net.ssl.SSLEngine;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelStateEvent;
-import org.jboss.netty.channel.ExceptionEvent;
-import org.jboss.netty.channel.MessageEvent;
-import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
-import org.jboss.netty.example.securechat.SecureChatSslContextFactory;
-import org.jboss.netty.handler.execution.ExecutionHandler;
-import org.jboss.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
-import org.jboss.netty.util.TestUtil;
-import org.jboss.netty.util.internal.ExecutorUtil;
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.buffer.ChannelBuffers;
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelStateEvent;
+import io.netty.channel.ExceptionEvent;
+import io.netty.channel.MessageEvent;
+import io.netty.channel.SimpleChannelUpstreamHandler;
+import io.netty.example.securechat.SecureChatSslContextFactory;
+import io.netty.handler.execution.ExecutionHandler;
+import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.TestUtil;
+import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/jboss/netty/handler/ssl/ImmediateExecutorTest.java b/src/test/java/org/jboss/netty/handler/ssl/ImmediateExecutorTest.java
index 1f22b32c65..b933ff5a9f 100644
--- a/src/test/java/org/jboss/netty/handler/ssl/ImmediateExecutorTest.java
+++ b/src/test/java/org/jboss/netty/handler/ssl/ImmediateExecutorTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/handler/ssl/NioNioSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/NioNioSocketSslEchoTest.java
index 495a631a24..7885fe5008 100644
--- a/src/test/java/org/jboss/netty/handler/ssl/NioNioSocketSslEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/ssl/NioNioSocketSslEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/ssl/NioOioSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/NioOioSocketSslEchoTest.java
index 348d6890ae..e573978c15 100644
--- a/src/test/java/org/jboss/netty/handler/ssl/NioOioSocketSslEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/ssl/NioOioSocketSslEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/ssl/OioNioSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/OioNioSocketSslEchoTest.java
index 479dd07698..51b8af30d2 100644
--- a/src/test/java/org/jboss/netty/handler/ssl/OioNioSocketSslEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/ssl/OioNioSocketSslEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/handler/ssl/OioOioSocketSslEchoTest.java b/src/test/java/org/jboss/netty/handler/ssl/OioOioSocketSslEchoTest.java
index 2359bde5af..f95bdf744e 100644
--- a/src/test/java/org/jboss/netty/handler/ssl/OioOioSocketSslEchoTest.java
+++ b/src/test/java/org/jboss/netty/handler/ssl/OioOioSocketSslEchoTest.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.handler.ssl;
+package io.netty.handler.ssl;
 
 import java.util.concurrent.Executor;
 
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioClientSocketChannelFactory;
-import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.channel.ChannelFactory;
+import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
 
 /**
  * @author The Netty Project
diff --git a/src/test/java/org/jboss/netty/logging/CommonsLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/CommonsLoggerFactoryTest.java
index f71f35247e..a785b22929 100644
--- a/src/test/java/org/jboss/netty/logging/CommonsLoggerFactoryTest.java
+++ b/src/test/java/org/jboss/netty/logging/CommonsLoggerFactoryTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/logging/CommonsLoggerTest.java b/src/test/java/org/jboss/netty/logging/CommonsLoggerTest.java
index d6c7f63f5d..a5ee5c9513 100644
--- a/src/test/java/org/jboss/netty/logging/CommonsLoggerTest.java
+++ b/src/test/java/org/jboss/netty/logging/CommonsLoggerTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/jboss/netty/logging/InternalLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/InternalLoggerFactoryTest.java
index 1b27399a17..addb4b222b 100644
--- a/src/test/java/org/jboss/netty/logging/InternalLoggerFactoryTest.java
+++ b/src/test/java/org/jboss/netty/logging/InternalLoggerFactoryTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.easymock.EasyMock.*;
 import static org.easymock.classextension.EasyMock.*;
diff --git a/src/test/java/org/jboss/netty/logging/JBossLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/JBossLoggerFactoryTest.java
index 3c4b108477..4fbdb3543d 100644
--- a/src/test/java/org/jboss/netty/logging/JBossLoggerFactoryTest.java
+++ b/src/test/java/org/jboss/netty/logging/JBossLoggerFactoryTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/logging/JBossLoggerTest.java b/src/test/java/org/jboss/netty/logging/JBossLoggerTest.java
index 329f3a5b66..eca6e846f2 100644
--- a/src/test/java/org/jboss/netty/logging/JBossLoggerTest.java
+++ b/src/test/java/org/jboss/netty/logging/JBossLoggerTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.easymock.EasyMock.*;
 import static org.easymock.classextension.EasyMock.*;
diff --git a/src/test/java/org/jboss/netty/logging/JdkLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/JdkLoggerFactoryTest.java
index e4d6f15500..67faa899d5 100644
--- a/src/test/java/org/jboss/netty/logging/JdkLoggerFactoryTest.java
+++ b/src/test/java/org/jboss/netty/logging/JdkLoggerFactoryTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java b/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java
index 1818f5c586..b74453063a 100644
--- a/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java
+++ b/src/test/java/org/jboss/netty/logging/JdkLoggerTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.easymock.EasyMock.*;
 import static org.easymock.classextension.EasyMock.*;
diff --git a/src/test/java/org/jboss/netty/logging/Log4JLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/Log4JLoggerFactoryTest.java
index 767cd8e720..822264de63 100644
--- a/src/test/java/org/jboss/netty/logging/Log4JLoggerFactoryTest.java
+++ b/src/test/java/org/jboss/netty/logging/Log4JLoggerFactoryTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/logging/Log4JLoggerTest.java b/src/test/java/org/jboss/netty/logging/Log4JLoggerTest.java
index 65986fd8f4..e09df6a727 100644
--- a/src/test/java/org/jboss/netty/logging/Log4JLoggerTest.java
+++ b/src/test/java/org/jboss/netty/logging/Log4JLoggerTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.easymock.EasyMock.*;
 import static org.easymock.classextension.EasyMock.*;
diff --git a/src/test/java/org/jboss/netty/logging/Slf4JLoggerFactoryTest.java b/src/test/java/org/jboss/netty/logging/Slf4JLoggerFactoryTest.java
index bad50cefec..80b5dba242 100644
--- a/src/test/java/org/jboss/netty/logging/Slf4JLoggerFactoryTest.java
+++ b/src/test/java/org/jboss/netty/logging/Slf4JLoggerFactoryTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/logging/Slf4JLoggerTest.java b/src/test/java/org/jboss/netty/logging/Slf4JLoggerTest.java
index db0fa9fc7a..80194f59fa 100644
--- a/src/test/java/org/jboss/netty/logging/Slf4JLoggerTest.java
+++ b/src/test/java/org/jboss/netty/logging/Slf4JLoggerTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.logging;
+package io.netty.logging;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/jboss/netty/util/DebugUtilTest.java b/src/test/java/org/jboss/netty/util/DebugUtilTest.java
index 62fcfe20e2..b5ad033b8a 100644
--- a/src/test/java/org/jboss/netty/util/DebugUtilTest.java
+++ b/src/test/java/org/jboss/netty/util/DebugUtilTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import static org.junit.Assert.*;
 
@@ -36,19 +36,19 @@ public class DebugUtilTest {
 
     @Test
     public void shouldReturnTrueInDebugMode() {
-        System.setProperty("org.jboss.netty.debug", "true");
+        System.setProperty("io.netty.debug", "true");
         assertTrue(DebugUtil.isDebugEnabled());
     }
 
     @Test
     public void shouldReturnFalseInNonDebugMode() {
-        System.setProperty("org.jboss.netty.debug", "false");
+        System.setProperty("io.netty.debug", "false");
         assertFalse(DebugUtil.isDebugEnabled());
     }
 
     @Test
     public void shouldNotBombOutWhenSecurityManagerIsInAction() {
-        System.setProperty("org.jboss.netty.debug", "true");
+        System.setProperty("io.netty.debug", "true");
         System.setSecurityManager(new SecurityManager() {
             @Override
             public void checkPropertyAccess(String key) {
@@ -75,6 +75,6 @@ public class DebugUtilTest {
 
     @Before @After
     public void cleanup() {
-        System.clearProperty("org.jboss.netty.debug");
+        System.clearProperty("io.netty.debug");
     }
 }
diff --git a/src/test/java/org/jboss/netty/util/DummyHandler.java b/src/test/java/org/jboss/netty/util/DummyHandler.java
index 67e9df7450..2715d6f8a7 100644
--- a/src/test/java/org/jboss/netty/util/DummyHandler.java
+++ b/src/test/java/org/jboss/netty/util/DummyHandler.java
@@ -13,12 +13,12 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
-import org.jboss.netty.channel.ChannelDownstreamHandler;
-import org.jboss.netty.channel.ChannelEvent;
-import org.jboss.netty.channel.ChannelHandlerContext;
-import org.jboss.netty.channel.ChannelUpstreamHandler;
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelUpstreamHandler;
 
 /**
  * A dummy handler for a testing purpose.
diff --git a/src/test/java/org/jboss/netty/util/MapBackedSetTest.java b/src/test/java/org/jboss/netty/util/MapBackedSetTest.java
index 89002aa5d8..c51b95f14c 100644
--- a/src/test/java/org/jboss/netty/util/MapBackedSetTest.java
+++ b/src/test/java/org/jboss/netty/util/MapBackedSetTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
diff --git a/src/test/java/org/jboss/netty/util/TestUtil.java b/src/test/java/org/jboss/netty/util/TestUtil.java
index 000db49d79..74056745f4 100644
--- a/src/test/java/org/jboss/netty/util/TestUtil.java
+++ b/src/test/java/org/jboss/netty/util/TestUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util;
+package io.netty.util;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java b/src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java
index 01723d5325..a8ca3f5829 100644
--- a/src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java
+++ b/src/test/java/org/jboss/netty/util/internal/ConversionUtilTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java b/src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java
index 414d3df827..b409e77ec3 100644
--- a/src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java
+++ b/src/test/java/org/jboss/netty/util/internal/StackTraceSimplifierTest.java
@@ -13,16 +13,16 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import static org.easymock.EasyMock.*;
 import static org.easymock.classextension.EasyMock.*;
 import static org.junit.Assert.*;
 
-import org.jboss.netty.buffer.ChannelBuffer;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.DefaultChannelPipeline;
-import org.jboss.netty.channel.SimpleChannelHandler;
+import io.netty.buffer.ChannelBuffer;
+import io.netty.channel.Channel;
+import io.netty.channel.DefaultChannelPipeline;
+import io.netty.channel.SimpleChannelHandler;
 import org.junit.Test;
 
 
diff --git a/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java b/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java
index 0370978576..51f76184d5 100644
--- a/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java
+++ b/src/test/java/org/jboss/netty/util/internal/StringUtilTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.util.internal;
+package io.netty.util.internal;
 
 import static org.junit.Assert.*;