diff --git a/.gitignore b/.gitignore
index bec6213641..a490df6613 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,12 @@
-/.project
-/.classpath
-/.settings
-/target
+.project
+.classpath
+.settings
+*.iml
+*.ipr
+*.iws
+.geany
+*/target
+*/target
 /reports
-/src/main/java/io/netty/util/Version.java
-/*.iml
-/*.ipr
-/*.iws
-/*.geany
+*/reports
+
diff --git a/all/pom.xml b/all/pom.xml
new file mode 100644
index 0000000000..0af1390cfc
--- /dev/null
+++ b/all/pom.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/All-in-One</name>
+</project>
+
diff --git a/buffer/pom.xml b/buffer/pom.xml
new file mode 100644
index 0000000000..eb1d841c09
--- /dev/null
+++ b/buffer/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-buffer</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Buffer</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/src/main/java/io/netty/buffer/AbstractChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/AbstractChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/AbstractChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/AbstractChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/AbstractChannelBufferFactory.java b/buffer/src/main/java/io/netty/buffer/AbstractChannelBufferFactory.java
similarity index 100%
rename from src/main/java/io/netty/buffer/AbstractChannelBufferFactory.java
rename to buffer/src/main/java/io/netty/buffer/AbstractChannelBufferFactory.java
diff --git a/src/main/java/io/netty/buffer/BigEndianHeapChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/BigEndianHeapChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/BigEndianHeapChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/BigEndianHeapChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/ByteBufferBackedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/ByteBufferBackedChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/ByteBufferBackedChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/ByteBufferBackedChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/ChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/ChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/ChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/ChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/ChannelBufferFactory.java b/buffer/src/main/java/io/netty/buffer/ChannelBufferFactory.java
similarity index 100%
rename from src/main/java/io/netty/buffer/ChannelBufferFactory.java
rename to buffer/src/main/java/io/netty/buffer/ChannelBufferFactory.java
diff --git a/src/main/java/io/netty/buffer/ChannelBufferIndexFinder.java b/buffer/src/main/java/io/netty/buffer/ChannelBufferIndexFinder.java
similarity index 100%
rename from src/main/java/io/netty/buffer/ChannelBufferIndexFinder.java
rename to buffer/src/main/java/io/netty/buffer/ChannelBufferIndexFinder.java
diff --git a/src/main/java/io/netty/buffer/ChannelBufferInputStream.java b/buffer/src/main/java/io/netty/buffer/ChannelBufferInputStream.java
similarity index 100%
rename from src/main/java/io/netty/buffer/ChannelBufferInputStream.java
rename to buffer/src/main/java/io/netty/buffer/ChannelBufferInputStream.java
diff --git a/src/main/java/io/netty/buffer/ChannelBufferOutputStream.java b/buffer/src/main/java/io/netty/buffer/ChannelBufferOutputStream.java
similarity index 100%
rename from src/main/java/io/netty/buffer/ChannelBufferOutputStream.java
rename to buffer/src/main/java/io/netty/buffer/ChannelBufferOutputStream.java
diff --git a/src/main/java/io/netty/buffer/ChannelBuffers.java b/buffer/src/main/java/io/netty/buffer/ChannelBuffers.java
similarity index 100%
rename from src/main/java/io/netty/buffer/ChannelBuffers.java
rename to buffer/src/main/java/io/netty/buffer/ChannelBuffers.java
diff --git a/src/main/java/io/netty/buffer/CompositeChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/CompositeChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/CompositeChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/CompositeChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/DirectChannelBufferFactory.java b/buffer/src/main/java/io/netty/buffer/DirectChannelBufferFactory.java
similarity index 100%
rename from src/main/java/io/netty/buffer/DirectChannelBufferFactory.java
rename to buffer/src/main/java/io/netty/buffer/DirectChannelBufferFactory.java
diff --git a/src/main/java/io/netty/buffer/DuplicatedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/DuplicatedChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/DuplicatedChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/DuplicatedChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/DynamicChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/DynamicChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/DynamicChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/DynamicChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/HeapChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/HeapChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/HeapChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/HeapChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/HeapChannelBufferFactory.java b/buffer/src/main/java/io/netty/buffer/HeapChannelBufferFactory.java
similarity index 100%
rename from src/main/java/io/netty/buffer/HeapChannelBufferFactory.java
rename to buffer/src/main/java/io/netty/buffer/HeapChannelBufferFactory.java
diff --git a/src/main/java/io/netty/buffer/LittleEndianHeapChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/LittleEndianHeapChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/LittleEndianHeapChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/LittleEndianHeapChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/ReadOnlyChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/ReadOnlyChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/ReadOnlyChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/ReadOnlyChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/SlicedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/SlicedChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/SlicedChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/SlicedChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/TruncatedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/TruncatedChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/TruncatedChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/TruncatedChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/WrappedChannelBuffer.java b/buffer/src/main/java/io/netty/buffer/WrappedChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/buffer/WrappedChannelBuffer.java
rename to buffer/src/main/java/io/netty/buffer/WrappedChannelBuffer.java
diff --git a/src/main/java/io/netty/buffer/package-info.java b/buffer/src/main/java/io/netty/buffer/package-info.java
similarity index 100%
rename from src/main/java/io/netty/buffer/package-info.java
rename to buffer/src/main/java/io/netty/buffer/package-info.java
diff --git a/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/AbstractChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/AbstractChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/AbstractCompositeChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/BigEndianCompositeChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/BigEndianDirectChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/BigEndianHeapChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/ByteBufferBackedHeapChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java b/buffer/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java
rename to buffer/src/test/java/io/netty/buffer/ChannelBufferIndexFinderTest.java
diff --git a/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java b/buffer/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/ChannelBufferStreamTest.java
rename to buffer/src/test/java/io/netty/buffer/ChannelBufferStreamTest.java
diff --git a/src/test/java/io/netty/buffer/ChannelBuffersTest.java b/buffer/src/test/java/io/netty/buffer/ChannelBuffersTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/ChannelBuffersTest.java
rename to buffer/src/test/java/io/netty/buffer/ChannelBuffersTest.java
diff --git a/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/DuplicateChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/DynamicChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/DynamicChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/LittleEndianCompositeChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/LittleEndianDirectChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/LittleEndianHeapChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/ReadOnlyChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/SlicedChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/SlicedChannelBufferTest.java
diff --git a/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java b/buffer/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java
similarity index 100%
rename from src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java
rename to buffer/src/test/java/io/netty/buffer/TruncatedChannelBufferTest.java
diff --git a/codec-http/pom.xml b/codec-http/pom.xml
new file mode 100644
index 0000000000..3227f5e442
--- /dev/null
+++ b/codec-http/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-codec-http</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Codec/HTTP</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-codec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-handler</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/src/main/java/io/netty/handler/codec/http/AbstractDiskHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/AbstractDiskHttpData.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/AbstractDiskHttpData.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/AbstractDiskHttpData.java
diff --git a/src/main/java/io/netty/handler/codec/http/AbstractHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/AbstractHttpData.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/AbstractHttpData.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/AbstractHttpData.java
diff --git a/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/AbstractMemoryHttpData.java
diff --git a/src/main/java/io/netty/handler/codec/http/Attribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/Attribute.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/Attribute.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/Attribute.java
diff --git a/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java b/codec-http/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/CaseIgnoringComparator.java
diff --git a/src/main/java/io/netty/handler/codec/http/Cookie.java b/codec-http/src/main/java/io/netty/handler/codec/http/Cookie.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/Cookie.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/Cookie.java
diff --git a/src/main/java/io/netty/handler/codec/http/CookieDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/CookieDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/CookieDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/CookieEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/CookieEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/CookieEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/CookieEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java b/codec-http/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/CookieHeaderNames.java
diff --git a/src/main/java/io/netty/handler/codec/http/DefaultCookie.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/DefaultCookie.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultCookie.java
diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpChunk.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunk.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/DefaultHttpChunk.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunk.java
diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpChunkTrailer.java
diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpDataFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpDataFactory.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/DefaultHttpDataFactory.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpDataFactory.java
diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpMessage.java
diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpRequest.java
diff --git a/src/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java b/codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/DefaultHttpResponse.java
diff --git a/src/main/java/io/netty/handler/codec/http/DiskAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/DiskAttribute.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/DiskAttribute.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/DiskAttribute.java
diff --git a/src/main/java/io/netty/handler/codec/http/DiskFileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/DiskFileUpload.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/DiskFileUpload.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/DiskFileUpload.java
diff --git a/src/main/java/io/netty/handler/codec/http/FileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/FileUpload.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/FileUpload.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/FileUpload.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpChunk.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunk.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpChunk.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpChunk.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkAggregator.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpChunkTrailer.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpClientCodec.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpClientCodec.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpCodecUtil.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpContentCompressor.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpContentDecompressor.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpContentEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpData.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpData.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpData.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpDataFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpDataFactory.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpDataFactory.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpDataFactory.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpHeaderDateFormat.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaderDateFormat.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpHeaderDateFormat.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaderDateFormat.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpHeaders.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpHeaders.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpMessage.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpMessage.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpMessage.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpMessageEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpMessageEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpMessageEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpMethod.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpMethod.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpMethod.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpPostBodyUtil.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpPostBodyUtil.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpPostBodyUtil.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpPostBodyUtil.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpPostRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpPostRequestDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpPostRequestDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpPostRequestDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpPostRequestEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpPostRequestEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpPostRequestEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpPostRequestEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpRequest.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpRequest.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpRequest.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpRequest.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpRequestDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpRequestEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpResponse.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponse.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpResponse.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpResponse.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpResponseDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpResponseDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpResponseStatus.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpServerCodec.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java
diff --git a/src/main/java/io/netty/handler/codec/http/HttpVersion.java b/codec-http/src/main/java/io/netty/handler/codec/http/HttpVersion.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/HttpVersion.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/HttpVersion.java
diff --git a/src/main/java/io/netty/handler/codec/http/InterfaceHttpData.java b/codec-http/src/main/java/io/netty/handler/codec/http/InterfaceHttpData.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/InterfaceHttpData.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/InterfaceHttpData.java
diff --git a/src/main/java/io/netty/handler/codec/http/InternalAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/InternalAttribute.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/InternalAttribute.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/InternalAttribute.java
diff --git a/src/main/java/io/netty/handler/codec/http/MemoryAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/MemoryAttribute.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/MemoryAttribute.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/MemoryAttribute.java
diff --git a/src/main/java/io/netty/handler/codec/http/MemoryFileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/MemoryFileUpload.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/MemoryFileUpload.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/MemoryFileUpload.java
diff --git a/src/main/java/io/netty/handler/codec/http/MixedAttribute.java b/codec-http/src/main/java/io/netty/handler/codec/http/MixedAttribute.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/MixedAttribute.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/MixedAttribute.java
diff --git a/src/main/java/io/netty/handler/codec/http/MixedFileUpload.java b/codec-http/src/main/java/io/netty/handler/codec/http/MixedFileUpload.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/MixedFileUpload.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/MixedFileUpload.java
diff --git a/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/QueryStringDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/QueryStringEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/http/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/package-info.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/BinaryWebSocketFrame.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/CloseWebSocketFrame.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/ContinuationWebSocketFrame.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PingWebSocketFrame.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/PongWebSocketFrame.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/TextWebSocketFrame.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Exception.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Exception.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/UTF8Exception.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Exception.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/UTF8Output.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket00FrameEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket08FrameEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocket13FrameEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker00.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker08.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshaker13.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketClientHandshakerFactory.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrame.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrame.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrame.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrame.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrameType.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrameType.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrameType.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketFrameType.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketHandshakeException.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshakerFactory.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketVersion.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketVersion.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/WebSocketVersion.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/WebSocketVersion.java
diff --git a/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/http/websocketx/package-info.java
rename to codec-http/src/main/java/io/netty/handler/codec/http/websocketx/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspHeaders.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMessageEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspMethods.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspRequestDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspRequestDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspRequestDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspRequestDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspRequestEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspResponseDecoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspResponseDecoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspResponseStatuses.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/RtspVersions.java
diff --git a/src/main/java/io/netty/handler/codec/rtsp/package-info.java b/codec-http/src/main/java/io/netty/handler/codec/rtsp/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/rtsp/package-info.java
rename to codec-http/src/main/java/io/netty/handler/codec/rtsp/package-info.java
diff --git a/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java
rename to codec-http/src/test/java/io/netty/handler/codec/http/CookieDecoderTest.java
diff --git a/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java
rename to codec-http/src/test/java/io/netty/handler/codec/http/CookieEncoderTest.java
diff --git a/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java
rename to codec-http/src/test/java/io/netty/handler/codec/http/DefaultHttpMessageTest.java
diff --git a/src/test/java/io/netty/handler/codec/http/HttpHeaderDateFormatTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/HttpHeaderDateFormatTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/http/HttpHeaderDateFormatTest.java
rename to codec-http/src/test/java/io/netty/handler/codec/http/HttpHeaderDateFormatTest.java
diff --git a/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java b/codec-http/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java
rename to codec-http/src/test/java/io/netty/handler/codec/http/QueryStringDecoderTest.java
diff --git a/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00Test.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00Test.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00Test.java
rename to codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker00Test.java
diff --git a/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08Test.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08Test.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08Test.java
rename to codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker08Test.java
diff --git a/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java b/codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java
rename to codec-http/src/test/java/io/netty/handler/codec/http/websocketx/WebSocketServerHandshaker13Test.java
diff --git a/codec/pom.xml b/codec/pom.xml
new file mode 100644
index 0000000000..a8691be22c
--- /dev/null
+++ b/codec/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-codec</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Codec</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/src/main/java/io/netty/handler/codec/base64/Base64.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/base64/Base64.java
rename to codec/src/main/java/io/netty/handler/codec/base64/Base64.java
diff --git a/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/base64/Base64Decoder.java
rename to codec/src/main/java/io/netty/handler/codec/base64/Base64Decoder.java
diff --git a/src/main/java/io/netty/handler/codec/base64/Base64Dialect.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Dialect.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/base64/Base64Dialect.java
rename to codec/src/main/java/io/netty/handler/codec/base64/Base64Dialect.java
diff --git a/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java b/codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/base64/Base64Encoder.java
rename to codec/src/main/java/io/netty/handler/codec/base64/Base64Encoder.java
diff --git a/src/main/java/io/netty/handler/codec/base64/package-info.java b/codec/src/main/java/io/netty/handler/codec/base64/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/base64/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/base64/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java b/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java b/codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java
rename to codec/src/main/java/io/netty/handler/codec/bytes/ByteArrayEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/bytes/package-info.java b/codec/src/main/java/io/netty/handler/codec/bytes/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/bytes/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/bytes/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/compression/CompressionException.java b/codec/src/main/java/io/netty/handler/codec/compression/CompressionException.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/compression/CompressionException.java
rename to codec/src/main/java/io/netty/handler/codec/compression/CompressionException.java
diff --git a/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/compression/ZlibDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java
rename to codec/src/main/java/io/netty/handler/codec/compression/ZlibEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/compression/ZlibUtil.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibUtil.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/compression/ZlibUtil.java
rename to codec/src/main/java/io/netty/handler/codec/compression/ZlibUtil.java
diff --git a/src/main/java/io/netty/handler/codec/compression/ZlibWrapper.java b/codec/src/main/java/io/netty/handler/codec/compression/ZlibWrapper.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/compression/ZlibWrapper.java
rename to codec/src/main/java/io/netty/handler/codec/compression/ZlibWrapper.java
diff --git a/src/main/java/io/netty/handler/codec/compression/package-info.java b/codec/src/main/java/io/netty/handler/codec/compression/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/compression/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/compression/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java b/codec/src/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java
rename to codec/src/main/java/io/netty/handler/codec/embedder/AbstractCodecEmbedder.java
diff --git a/src/main/java/io/netty/handler/codec/embedder/CodecEmbedder.java b/codec/src/main/java/io/netty/handler/codec/embedder/CodecEmbedder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/embedder/CodecEmbedder.java
rename to codec/src/main/java/io/netty/handler/codec/embedder/CodecEmbedder.java
diff --git a/src/main/java/io/netty/handler/codec/embedder/CodecEmbedderException.java b/codec/src/main/java/io/netty/handler/codec/embedder/CodecEmbedderException.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/embedder/CodecEmbedderException.java
rename to codec/src/main/java/io/netty/handler/codec/embedder/CodecEmbedderException.java
diff --git a/src/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java b/codec/src/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java
rename to codec/src/main/java/io/netty/handler/codec/embedder/DecoderEmbedder.java
diff --git a/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannel.java b/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannel.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/embedder/EmbeddedChannel.java
rename to codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannel.java
diff --git a/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannelFactory.java b/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/embedder/EmbeddedChannelFactory.java
rename to codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedChannelFactory.java
diff --git a/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java b/codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java
rename to codec/src/main/java/io/netty/handler/codec/embedder/EmbeddedSocketAddress.java
diff --git a/src/main/java/io/netty/handler/codec/embedder/EncoderEmbedder.java b/codec/src/main/java/io/netty/handler/codec/embedder/EncoderEmbedder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/embedder/EncoderEmbedder.java
rename to codec/src/main/java/io/netty/handler/codec/embedder/EncoderEmbedder.java
diff --git a/src/main/java/io/netty/handler/codec/embedder/package-info.java b/codec/src/main/java/io/netty/handler/codec/embedder/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/embedder/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/embedder/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/frame/CorruptedFrameException.java b/codec/src/main/java/io/netty/handler/codec/frame/CorruptedFrameException.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/frame/CorruptedFrameException.java
rename to codec/src/main/java/io/netty/handler/codec/frame/CorruptedFrameException.java
diff --git a/src/main/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/frame/Delimiters.java b/codec/src/main/java/io/netty/handler/codec/frame/Delimiters.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/frame/Delimiters.java
rename to codec/src/main/java/io/netty/handler/codec/frame/Delimiters.java
diff --git a/src/main/java/io/netty/handler/codec/frame/FixedLengthFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/frame/FixedLengthFrameDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/frame/FixedLengthFrameDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/frame/FixedLengthFrameDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/frame/FrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/frame/FrameDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/frame/FrameDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/frame/FrameDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/frame/LengthFieldPrepender.java b/codec/src/main/java/io/netty/handler/codec/frame/LengthFieldPrepender.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/frame/LengthFieldPrepender.java
rename to codec/src/main/java/io/netty/handler/codec/frame/LengthFieldPrepender.java
diff --git a/src/main/java/io/netty/handler/codec/frame/TooLongFrameException.java b/codec/src/main/java/io/netty/handler/codec/frame/TooLongFrameException.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/frame/TooLongFrameException.java
rename to codec/src/main/java/io/netty/handler/codec/frame/TooLongFrameException.java
diff --git a/src/main/java/io/netty/handler/codec/frame/package-info.java b/codec/src/main/java/io/netty/handler/codec/frame/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/frame/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/frame/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/oneone/OneToOneDecoder.java b/codec/src/main/java/io/netty/handler/codec/oneone/OneToOneDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/oneone/OneToOneDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/oneone/OneToOneDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/oneone/OneToOneEncoder.java b/codec/src/main/java/io/netty/handler/codec/oneone/OneToOneEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/oneone/OneToOneEncoder.java
rename to codec/src/main/java/io/netty/handler/codec/oneone/OneToOneEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/oneone/package-info.java b/codec/src/main/java/io/netty/handler/codec/oneone/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/oneone/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/oneone/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java
rename to codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java b/codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
rename to codec/src/main/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrepender.java
diff --git a/src/main/java/io/netty/handler/codec/protobuf/package-info.java b/codec/src/main/java/io/netty/handler/codec/protobuf/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/protobuf/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/protobuf/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/replay/ReplayError.java b/codec/src/main/java/io/netty/handler/codec/replay/ReplayError.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/replay/ReplayError.java
rename to codec/src/main/java/io/netty/handler/codec/replay/ReplayError.java
diff --git a/src/main/java/io/netty/handler/codec/replay/ReplayingDecoder.java b/codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/replay/ReplayingDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java b/codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java
rename to codec/src/main/java/io/netty/handler/codec/replay/ReplayingDecoderBuffer.java
diff --git a/src/main/java/io/netty/handler/codec/replay/UnreplayableOperationException.java b/codec/src/main/java/io/netty/handler/codec/replay/UnreplayableOperationException.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/replay/UnreplayableOperationException.java
rename to codec/src/main/java/io/netty/handler/codec/replay/UnreplayableOperationException.java
diff --git a/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java b/codec/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
rename to codec/src/main/java/io/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
diff --git a/src/main/java/io/netty/handler/codec/replay/VoidEnum.java b/codec/src/main/java/io/netty/handler/codec/replay/VoidEnum.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/replay/VoidEnum.java
rename to codec/src/main/java/io/netty/handler/codec/replay/VoidEnum.java
diff --git a/src/main/java/io/netty/handler/codec/replay/package-info.java b/codec/src/main/java/io/netty/handler/codec/replay/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/replay/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/replay/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/CachingClassResolver.java b/codec/src/main/java/io/netty/handler/codec/serialization/CachingClassResolver.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/CachingClassResolver.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/CachingClassResolver.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java b/codec/src/main/java/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/ClassLoaderClassResolver.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/ClassResolver.java b/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolver.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/ClassResolver.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/ClassResolver.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java b/codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/ClassResolvers.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectInputStream.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/CompactObjectOutputStream.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/CompatibleObjectEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/ObjectDecoderInputStream.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/ReferenceMap.java b/codec/src/main/java/io/netty/handler/codec/serialization/ReferenceMap.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/ReferenceMap.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/ReferenceMap.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java b/codec/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/SoftReferenceMap.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/SwitchableInputStream.java b/codec/src/main/java/io/netty/handler/codec/serialization/SwitchableInputStream.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/SwitchableInputStream.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/SwitchableInputStream.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java b/codec/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/WeakReferenceMap.java
diff --git a/src/main/java/io/netty/handler/codec/serialization/package-info.java b/codec/src/main/java/io/netty/handler/codec/serialization/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/serialization/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/serialization/package-info.java
diff --git a/src/main/java/io/netty/handler/codec/string/StringDecoder.java b/codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/string/StringDecoder.java
rename to codec/src/main/java/io/netty/handler/codec/string/StringDecoder.java
diff --git a/src/main/java/io/netty/handler/codec/string/StringEncoder.java b/codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/string/StringEncoder.java
rename to codec/src/main/java/io/netty/handler/codec/string/StringEncoder.java
diff --git a/src/main/java/io/netty/handler/codec/string/package-info.java b/codec/src/main/java/io/netty/handler/codec/string/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/codec/string/package-info.java
rename to codec/src/main/java/io/netty/handler/codec/string/package-info.java
diff --git a/src/test/java/io/netty/handler/codec/bytes/ByteArrayDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/bytes/ByteArrayDecoderTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/bytes/ByteArrayDecoderTest.java
rename to codec/src/test/java/io/netty/handler/codec/bytes/ByteArrayDecoderTest.java
diff --git a/src/test/java/io/netty/handler/codec/bytes/ByteArrayEncoderTest.java b/codec/src/test/java/io/netty/handler/codec/bytes/ByteArrayEncoderTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/bytes/ByteArrayEncoderTest.java
rename to codec/src/test/java/io/netty/handler/codec/bytes/ByteArrayEncoderTest.java
diff --git a/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java
rename to codec/src/test/java/io/netty/handler/codec/frame/DelimiterBasedFrameDecoderTest.java
diff --git a/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java
rename to codec/src/test/java/io/netty/handler/codec/frame/LengthFieldBasedFrameDecoderTest.java
diff --git a/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java
rename to codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32FrameDecoderTest.java
diff --git a/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java b/codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java
rename to codec/src/test/java/io/netty/handler/codec/protobuf/ProtobufVarint32LengthFieldPrependerTest.java
diff --git a/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java b/codec/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java
rename to codec/src/test/java/io/netty/handler/codec/replay/ReplayingDecoderTest.java
diff --git a/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java b/codec/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java
rename to codec/src/test/java/io/netty/handler/codec/serialization/CompactObjectSerializationTest.java
diff --git a/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java b/codec/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java
rename to codec/src/test/java/io/netty/handler/codec/serialization/SwitchableInputStreamTest.java
diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 0000000000..24edd61632
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-common</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Common</name>
+
+  <dependencies>
+    <!-- Logging frameworks - completely optional -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+    </plugins>
+  </build>
+</project>
+
diff --git a/src/main/java/io/netty/logging/AbstractInternalLogger.java b/common/src/main/java/io/netty/logging/AbstractInternalLogger.java
similarity index 100%
rename from src/main/java/io/netty/logging/AbstractInternalLogger.java
rename to common/src/main/java/io/netty/logging/AbstractInternalLogger.java
diff --git a/src/main/java/io/netty/logging/CommonsLogger.java b/common/src/main/java/io/netty/logging/CommonsLogger.java
similarity index 100%
rename from src/main/java/io/netty/logging/CommonsLogger.java
rename to common/src/main/java/io/netty/logging/CommonsLogger.java
diff --git a/src/main/java/io/netty/logging/CommonsLoggerFactory.java b/common/src/main/java/io/netty/logging/CommonsLoggerFactory.java
similarity index 100%
rename from src/main/java/io/netty/logging/CommonsLoggerFactory.java
rename to common/src/main/java/io/netty/logging/CommonsLoggerFactory.java
diff --git a/src/main/java/io/netty/logging/InternalLogLevel.java b/common/src/main/java/io/netty/logging/InternalLogLevel.java
similarity index 100%
rename from src/main/java/io/netty/logging/InternalLogLevel.java
rename to common/src/main/java/io/netty/logging/InternalLogLevel.java
diff --git a/src/main/java/io/netty/logging/InternalLogger.java b/common/src/main/java/io/netty/logging/InternalLogger.java
similarity index 100%
rename from src/main/java/io/netty/logging/InternalLogger.java
rename to common/src/main/java/io/netty/logging/InternalLogger.java
diff --git a/src/main/java/io/netty/logging/InternalLoggerFactory.java b/common/src/main/java/io/netty/logging/InternalLoggerFactory.java
similarity index 89%
rename from src/main/java/io/netty/logging/InternalLoggerFactory.java
rename to common/src/main/java/io/netty/logging/InternalLoggerFactory.java
index 54052c969c..badb9d88cf 100644
--- a/src/main/java/io/netty/logging/InternalLoggerFactory.java
+++ b/common/src/main/java/io/netty/logging/InternalLoggerFactory.java
@@ -15,8 +15,6 @@
  */
 package io.netty.logging;
 
-import io.netty.util.internal.StackTraceSimplifier;
-
 /**
  * Creates an {@link InternalLogger} or changes the default factory
  * implementation.  This factory allows you to choose what logging framework
@@ -36,13 +34,6 @@ import io.netty.util.internal.StackTraceSimplifier;
 public abstract class InternalLoggerFactory {
     private static volatile InternalLoggerFactory defaultFactory = new JdkLoggerFactory();
 
-    static {
-        // Load the dependent classes in advance to avoid the case where
-        // the VM fails to load the required classes because of too many open
-        // files.
-        StackTraceSimplifier.simplify(new Exception());
-    }
-
     /**
      * Returns the default factory.  The initial default factory is
      * {@link JdkLoggerFactory}.
@@ -82,7 +73,6 @@ public abstract class InternalLoggerFactory {
 
             @Override
             public void debug(String msg, Throwable cause) {
-                StackTraceSimplifier.simplify(cause);
                 logger.debug(msg, cause);
             }
 
@@ -93,7 +83,6 @@ public abstract class InternalLoggerFactory {
 
             @Override
             public void error(String msg, Throwable cause) {
-                StackTraceSimplifier.simplify(cause);
                 logger.error(msg, cause);
             }
 
@@ -104,7 +93,6 @@ public abstract class InternalLoggerFactory {
 
             @Override
             public void info(String msg, Throwable cause) {
-                StackTraceSimplifier.simplify(cause);
                 logger.info(msg, cause);
             }
 
@@ -135,7 +123,6 @@ public abstract class InternalLoggerFactory {
 
             @Override
             public void warn(String msg, Throwable cause) {
-                StackTraceSimplifier.simplify(cause);
                 logger.warn(msg, cause);
             }
 
@@ -151,7 +138,6 @@ public abstract class InternalLoggerFactory {
 
             @Override
             public void log(InternalLogLevel level, String msg, Throwable cause) {
-                StackTraceSimplifier.simplify(cause);
                 logger.log(level, msg, cause);
             }
         };
diff --git a/src/main/java/io/netty/logging/JBossLogger.java b/common/src/main/java/io/netty/logging/JBossLogger.java
similarity index 100%
rename from src/main/java/io/netty/logging/JBossLogger.java
rename to common/src/main/java/io/netty/logging/JBossLogger.java
diff --git a/src/main/java/io/netty/logging/JBossLoggerFactory.java b/common/src/main/java/io/netty/logging/JBossLoggerFactory.java
similarity index 100%
rename from src/main/java/io/netty/logging/JBossLoggerFactory.java
rename to common/src/main/java/io/netty/logging/JBossLoggerFactory.java
diff --git a/src/main/java/io/netty/logging/JdkLogger.java b/common/src/main/java/io/netty/logging/JdkLogger.java
similarity index 100%
rename from src/main/java/io/netty/logging/JdkLogger.java
rename to common/src/main/java/io/netty/logging/JdkLogger.java
diff --git a/src/main/java/io/netty/logging/JdkLoggerFactory.java b/common/src/main/java/io/netty/logging/JdkLoggerFactory.java
similarity index 100%
rename from src/main/java/io/netty/logging/JdkLoggerFactory.java
rename to common/src/main/java/io/netty/logging/JdkLoggerFactory.java
diff --git a/src/main/java/io/netty/logging/Log4JLogger.java b/common/src/main/java/io/netty/logging/Log4JLogger.java
similarity index 100%
rename from src/main/java/io/netty/logging/Log4JLogger.java
rename to common/src/main/java/io/netty/logging/Log4JLogger.java
diff --git a/src/main/java/io/netty/logging/Log4JLoggerFactory.java b/common/src/main/java/io/netty/logging/Log4JLoggerFactory.java
similarity index 100%
rename from src/main/java/io/netty/logging/Log4JLoggerFactory.java
rename to common/src/main/java/io/netty/logging/Log4JLoggerFactory.java
diff --git a/src/main/java/io/netty/logging/OsgiLogger.java b/common/src/main/java/io/netty/logging/OsgiLogger.java
similarity index 100%
rename from src/main/java/io/netty/logging/OsgiLogger.java
rename to common/src/main/java/io/netty/logging/OsgiLogger.java
diff --git a/src/main/java/io/netty/logging/OsgiLoggerFactory.java b/common/src/main/java/io/netty/logging/OsgiLoggerFactory.java
similarity index 100%
rename from src/main/java/io/netty/logging/OsgiLoggerFactory.java
rename to common/src/main/java/io/netty/logging/OsgiLoggerFactory.java
diff --git a/src/main/java/io/netty/logging/Slf4JLogger.java b/common/src/main/java/io/netty/logging/Slf4JLogger.java
similarity index 100%
rename from src/main/java/io/netty/logging/Slf4JLogger.java
rename to common/src/main/java/io/netty/logging/Slf4JLogger.java
diff --git a/src/main/java/io/netty/logging/Slf4JLoggerFactory.java b/common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java
similarity index 100%
rename from src/main/java/io/netty/logging/Slf4JLoggerFactory.java
rename to common/src/main/java/io/netty/logging/Slf4JLoggerFactory.java
diff --git a/src/main/java/io/netty/logging/package-info.java b/common/src/main/java/io/netty/logging/package-info.java
similarity index 100%
rename from src/main/java/io/netty/logging/package-info.java
rename to common/src/main/java/io/netty/logging/package-info.java
diff --git a/src/main/java/io/netty/util/CharsetUtil.java b/common/src/main/java/io/netty/util/CharsetUtil.java
similarity index 100%
rename from src/main/java/io/netty/util/CharsetUtil.java
rename to common/src/main/java/io/netty/util/CharsetUtil.java
diff --git a/src/main/java/io/netty/util/EstimatableObjectWrapper.java b/common/src/main/java/io/netty/util/EstimatableObjectWrapper.java
similarity index 100%
rename from src/main/java/io/netty/util/EstimatableObjectWrapper.java
rename to common/src/main/java/io/netty/util/EstimatableObjectWrapper.java
diff --git a/src/main/java/io/netty/util/ExternalResourceReleasable.java b/common/src/main/java/io/netty/util/ExternalResourceReleasable.java
similarity index 100%
rename from src/main/java/io/netty/util/ExternalResourceReleasable.java
rename to common/src/main/java/io/netty/util/ExternalResourceReleasable.java
diff --git a/src/main/java/io/netty/util/ExternalResourceUtil.java b/common/src/main/java/io/netty/util/ExternalResourceUtil.java
similarity index 100%
rename from src/main/java/io/netty/util/ExternalResourceUtil.java
rename to common/src/main/java/io/netty/util/ExternalResourceUtil.java
diff --git a/src/main/java/io/netty/util/HashedWheelTimer.java b/common/src/main/java/io/netty/util/HashedWheelTimer.java
similarity index 98%
rename from src/main/java/io/netty/util/HashedWheelTimer.java
rename to common/src/main/java/io/netty/util/HashedWheelTimer.java
index 8f0ec16847..b4bfe997b7 100644
--- a/src/main/java/io/netty/util/HashedWheelTimer.java
+++ b/common/src/main/java/io/netty/util/HashedWheelTimer.java
@@ -28,7 +28,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import io.netty.channel.ChannelPipelineFactory;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.internal.ConcurrentIdentityHashMap;
@@ -64,9 +63,7 @@ import io.netty.util.internal.SharedResourceMisuseDetector;
  * {@link HashedWheelTimer} creates a new thread whenever it is instantiated and
  * started.  Therefore, you should make sure to create only one instance and
  * share it across your application.  One of the common mistakes, that makes
- * your application unresponsive, is to create a new instance in
- * {@link ChannelPipelineFactory}, which results in the creation of a new thread
- * for every connection.
+ * your application unresponsive, is to create a new instance for every connection.
  *
  * <h3>Implementation Details</h3>
  *
diff --git a/src/main/java/io/netty/util/MapBackedSet.java b/common/src/main/java/io/netty/util/MapBackedSet.java
similarity index 100%
rename from src/main/java/io/netty/util/MapBackedSet.java
rename to common/src/main/java/io/netty/util/MapBackedSet.java
diff --git a/src/test/java/io/netty/util/TestUtil.java b/common/src/main/java/io/netty/util/SocketAddresses.java
similarity index 88%
rename from src/test/java/io/netty/util/TestUtil.java
rename to common/src/main/java/io/netty/util/SocketAddresses.java
index a57824f6c0..edc0ef6220 100644
--- a/src/test/java/io/netty/util/TestUtil.java
+++ b/common/src/main/java/io/netty/util/SocketAddresses.java
@@ -18,15 +18,14 @@ package io.netty.util;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
+public final class SocketAddresses {
 
-/**
- */
-@org.junit.Ignore
-public final class TestUtil {
-
-    private static final InetAddress LOCALHOST;
+    public static final InetAddress LOCALHOST;
 
     static {
+        // We cache this because some machine takes almost forever to return
+        // from InetAddress.getLocalHost().  I think it's due to the incorrect
+        // /etc/hosts or /etc/resolve.conf.
         InetAddress localhost = null;
         try {
             localhost = InetAddress.getLocalHost();
@@ -46,14 +45,7 @@ public final class TestUtil {
         LOCALHOST = localhost;
     }
 
-    public static InetAddress getLocalHost() {
-        // We cache this because some machine takes almost forever to return
-        // from InetAddress.getLocalHost().  I think it's due to the incorrect
-        // /etc/hosts or /etc/resolve.conf.
-        return LOCALHOST;
-    }
-
-    private TestUtil() {
+    private SocketAddresses() {
         // Unused
     }
 }
diff --git a/src/main/java/io/netty/util/Timeout.java b/common/src/main/java/io/netty/util/Timeout.java
similarity index 100%
rename from src/main/java/io/netty/util/Timeout.java
rename to common/src/main/java/io/netty/util/Timeout.java
diff --git a/src/main/java/io/netty/util/Timer.java b/common/src/main/java/io/netty/util/Timer.java
similarity index 100%
rename from src/main/java/io/netty/util/Timer.java
rename to common/src/main/java/io/netty/util/Timer.java
diff --git a/src/main/java/io/netty/util/TimerTask.java b/common/src/main/java/io/netty/util/TimerTask.java
similarity index 100%
rename from src/main/java/io/netty/util/TimerTask.java
rename to common/src/main/java/io/netty/util/TimerTask.java
diff --git a/src/main/java/io/netty/util/UnsafeDetectUtil.java b/common/src/main/java/io/netty/util/UnsafeDetectUtil.java
similarity index 100%
rename from src/main/java/io/netty/util/UnsafeDetectUtil.java
rename to common/src/main/java/io/netty/util/UnsafeDetectUtil.java
diff --git a/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java b/common/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java
rename to common/src/main/java/io/netty/util/internal/AtomicFieldUpdaterUtil.java
diff --git a/src/main/java/io/netty/util/internal/ConcurrentHashMap.java b/common/src/main/java/io/netty/util/internal/ConcurrentHashMap.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/ConcurrentHashMap.java
rename to common/src/main/java/io/netty/util/internal/ConcurrentHashMap.java
diff --git a/src/main/java/io/netty/util/internal/ConcurrentIdentityHashMap.java b/common/src/main/java/io/netty/util/internal/ConcurrentIdentityHashMap.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/ConcurrentIdentityHashMap.java
rename to common/src/main/java/io/netty/util/internal/ConcurrentIdentityHashMap.java
diff --git a/src/main/java/io/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java b/common/src/main/java/io/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
rename to common/src/main/java/io/netty/util/internal/ConcurrentIdentityWeakKeyHashMap.java
diff --git a/src/main/java/io/netty/util/internal/ConcurrentWeakKeyHashMap.java b/common/src/main/java/io/netty/util/internal/ConcurrentWeakKeyHashMap.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/ConcurrentWeakKeyHashMap.java
rename to common/src/main/java/io/netty/util/internal/ConcurrentWeakKeyHashMap.java
diff --git a/src/main/java/io/netty/util/internal/ConversionUtil.java b/common/src/main/java/io/netty/util/internal/ConversionUtil.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/ConversionUtil.java
rename to common/src/main/java/io/netty/util/internal/ConversionUtil.java
diff --git a/src/main/java/io/netty/util/internal/DeadLockProofWorker.java b/common/src/main/java/io/netty/util/internal/DeadLockProofWorker.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/DeadLockProofWorker.java
rename to common/src/main/java/io/netty/util/internal/DeadLockProofWorker.java
diff --git a/src/main/java/io/netty/util/internal/ExecutorUtil.java b/common/src/main/java/io/netty/util/internal/ExecutorUtil.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/ExecutorUtil.java
rename to common/src/main/java/io/netty/util/internal/ExecutorUtil.java
diff --git a/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java b/common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java
rename to common/src/main/java/io/netty/util/internal/LegacyLinkedTransferQueue.java
diff --git a/src/main/java/io/netty/util/internal/LinkedTransferQueue.java b/common/src/main/java/io/netty/util/internal/LinkedTransferQueue.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/LinkedTransferQueue.java
rename to common/src/main/java/io/netty/util/internal/LinkedTransferQueue.java
diff --git a/src/main/java/io/netty/util/internal/NonReentrantLock.java b/common/src/main/java/io/netty/util/internal/NonReentrantLock.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/NonReentrantLock.java
rename to common/src/main/java/io/netty/util/internal/NonReentrantLock.java
diff --git a/src/main/java/io/netty/util/internal/QueueFactory.java b/common/src/main/java/io/netty/util/internal/QueueFactory.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/QueueFactory.java
rename to common/src/main/java/io/netty/util/internal/QueueFactory.java
diff --git a/src/main/java/io/netty/util/internal/ReusableIterator.java b/common/src/main/java/io/netty/util/internal/ReusableIterator.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/ReusableIterator.java
rename to common/src/main/java/io/netty/util/internal/ReusableIterator.java
diff --git a/src/main/java/io/netty/util/internal/SharedResourceMisuseDetector.java b/common/src/main/java/io/netty/util/internal/SharedResourceMisuseDetector.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/SharedResourceMisuseDetector.java
rename to common/src/main/java/io/netty/util/internal/SharedResourceMisuseDetector.java
diff --git a/src/main/java/io/netty/util/internal/StringUtil.java b/common/src/main/java/io/netty/util/internal/StringUtil.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/StringUtil.java
rename to common/src/main/java/io/netty/util/internal/StringUtil.java
diff --git a/src/main/java/io/netty/util/internal/SystemPropertyUtil.java b/common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/SystemPropertyUtil.java
rename to common/src/main/java/io/netty/util/internal/SystemPropertyUtil.java
diff --git a/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java b/common/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/ThreadLocalBoolean.java
rename to common/src/main/java/io/netty/util/internal/ThreadLocalBoolean.java
diff --git a/src/main/java/io/netty/util/internal/ThreadLocalRandom.java b/common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/ThreadLocalRandom.java
rename to common/src/main/java/io/netty/util/internal/ThreadLocalRandom.java
diff --git a/src/main/java/io/netty/util/internal/UnterminatableExecutor.java b/common/src/main/java/io/netty/util/internal/UnterminatableExecutor.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/UnterminatableExecutor.java
rename to common/src/main/java/io/netty/util/internal/UnterminatableExecutor.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/Adler32.java b/common/src/main/java/io/netty/util/internal/jzlib/Adler32.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/Adler32.java
rename to common/src/main/java/io/netty/util/internal/jzlib/Adler32.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/CRC32.java b/common/src/main/java/io/netty/util/internal/jzlib/CRC32.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/CRC32.java
rename to common/src/main/java/io/netty/util/internal/jzlib/CRC32.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/Deflate.java b/common/src/main/java/io/netty/util/internal/jzlib/Deflate.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/Deflate.java
rename to common/src/main/java/io/netty/util/internal/jzlib/Deflate.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java b/common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/InfBlocks.java
rename to common/src/main/java/io/netty/util/internal/jzlib/InfBlocks.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/InfCodes.java b/common/src/main/java/io/netty/util/internal/jzlib/InfCodes.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/InfCodes.java
rename to common/src/main/java/io/netty/util/internal/jzlib/InfCodes.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/InfTree.java b/common/src/main/java/io/netty/util/internal/jzlib/InfTree.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/InfTree.java
rename to common/src/main/java/io/netty/util/internal/jzlib/InfTree.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/Inflate.java b/common/src/main/java/io/netty/util/internal/jzlib/Inflate.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/Inflate.java
rename to common/src/main/java/io/netty/util/internal/jzlib/Inflate.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/JZlib.java b/common/src/main/java/io/netty/util/internal/jzlib/JZlib.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/JZlib.java
rename to common/src/main/java/io/netty/util/internal/jzlib/JZlib.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/StaticTree.java b/common/src/main/java/io/netty/util/internal/jzlib/StaticTree.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/StaticTree.java
rename to common/src/main/java/io/netty/util/internal/jzlib/StaticTree.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/Tree.java b/common/src/main/java/io/netty/util/internal/jzlib/Tree.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/Tree.java
rename to common/src/main/java/io/netty/util/internal/jzlib/Tree.java
diff --git a/src/main/java/io/netty/util/internal/jzlib/ZStream.java b/common/src/main/java/io/netty/util/internal/jzlib/ZStream.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/jzlib/ZStream.java
rename to common/src/main/java/io/netty/util/internal/jzlib/ZStream.java
diff --git a/src/main/java/io/netty/util/internal/package-info.java b/common/src/main/java/io/netty/util/internal/package-info.java
similarity index 100%
rename from src/main/java/io/netty/util/internal/package-info.java
rename to common/src/main/java/io/netty/util/internal/package-info.java
diff --git a/src/main/java/io/netty/util/package-info.java b/common/src/main/java/io/netty/util/package-info.java
similarity index 100%
rename from src/main/java/io/netty/util/package-info.java
rename to common/src/main/java/io/netty/util/package-info.java
diff --git a/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java
rename to common/src/test/java/io/netty/logging/CommonsLoggerFactoryTest.java
diff --git a/src/test/java/io/netty/logging/CommonsLoggerTest.java b/common/src/test/java/io/netty/logging/CommonsLoggerTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/CommonsLoggerTest.java
rename to common/src/test/java/io/netty/logging/CommonsLoggerTest.java
diff --git a/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/InternalLoggerFactoryTest.java
rename to common/src/test/java/io/netty/logging/InternalLoggerFactoryTest.java
diff --git a/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/JBossLoggerFactoryTest.java
rename to common/src/test/java/io/netty/logging/JBossLoggerFactoryTest.java
diff --git a/src/test/java/io/netty/logging/JBossLoggerTest.java b/common/src/test/java/io/netty/logging/JBossLoggerTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/JBossLoggerTest.java
rename to common/src/test/java/io/netty/logging/JBossLoggerTest.java
diff --git a/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/JdkLoggerFactoryTest.java
rename to common/src/test/java/io/netty/logging/JdkLoggerFactoryTest.java
diff --git a/src/test/java/io/netty/logging/JdkLoggerTest.java b/common/src/test/java/io/netty/logging/JdkLoggerTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/JdkLoggerTest.java
rename to common/src/test/java/io/netty/logging/JdkLoggerTest.java
diff --git a/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java
rename to common/src/test/java/io/netty/logging/Log4JLoggerFactoryTest.java
diff --git a/src/test/java/io/netty/logging/Log4JLoggerTest.java b/common/src/test/java/io/netty/logging/Log4JLoggerTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/Log4JLoggerTest.java
rename to common/src/test/java/io/netty/logging/Log4JLoggerTest.java
diff --git a/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java b/common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java
rename to common/src/test/java/io/netty/logging/Slf4JLoggerFactoryTest.java
diff --git a/src/test/java/io/netty/logging/Slf4JLoggerTest.java b/common/src/test/java/io/netty/logging/Slf4JLoggerTest.java
similarity index 100%
rename from src/test/java/io/netty/logging/Slf4JLoggerTest.java
rename to common/src/test/java/io/netty/logging/Slf4JLoggerTest.java
diff --git a/src/test/java/io/netty/util/MapBackedSetTest.java b/common/src/test/java/io/netty/util/MapBackedSetTest.java
similarity index 100%
rename from src/test/java/io/netty/util/MapBackedSetTest.java
rename to common/src/test/java/io/netty/util/MapBackedSetTest.java
diff --git a/src/test/java/io/netty/util/internal/ConversionUtilTest.java b/common/src/test/java/io/netty/util/internal/ConversionUtilTest.java
similarity index 100%
rename from src/test/java/io/netty/util/internal/ConversionUtilTest.java
rename to common/src/test/java/io/netty/util/internal/ConversionUtilTest.java
diff --git a/src/test/java/io/netty/util/internal/StringUtilTest.java b/common/src/test/java/io/netty/util/internal/StringUtilTest.java
similarity index 100%
rename from src/test/java/io/netty/util/internal/StringUtilTest.java
rename to common/src/test/java/io/netty/util/internal/StringUtilTest.java
diff --git a/example/pom.xml b/example/pom.xml
new file mode 100644
index 0000000000..b21e2ea2e3
--- /dev/null
+++ b/example/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-example</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Example</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-handler</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport-sctp</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/src/main/java/io/netty/example/discard/DiscardClient.java b/example/src/main/java/io/netty/example/discard/DiscardClient.java
similarity index 100%
rename from src/main/java/io/netty/example/discard/DiscardClient.java
rename to example/src/main/java/io/netty/example/discard/DiscardClient.java
diff --git a/src/main/java/io/netty/example/discard/DiscardClientHandler.java b/example/src/main/java/io/netty/example/discard/DiscardClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/discard/DiscardClientHandler.java
rename to example/src/main/java/io/netty/example/discard/DiscardClientHandler.java
diff --git a/src/main/java/io/netty/example/discard/DiscardServer.java b/example/src/main/java/io/netty/example/discard/DiscardServer.java
similarity index 100%
rename from src/main/java/io/netty/example/discard/DiscardServer.java
rename to example/src/main/java/io/netty/example/discard/DiscardServer.java
diff --git a/src/main/java/io/netty/example/discard/DiscardServerHandler.java b/example/src/main/java/io/netty/example/discard/DiscardServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/discard/DiscardServerHandler.java
rename to example/src/main/java/io/netty/example/discard/DiscardServerHandler.java
diff --git a/src/main/java/io/netty/example/echo/EchoClient.java b/example/src/main/java/io/netty/example/echo/EchoClient.java
similarity index 100%
rename from src/main/java/io/netty/example/echo/EchoClient.java
rename to example/src/main/java/io/netty/example/echo/EchoClient.java
diff --git a/src/main/java/io/netty/example/echo/EchoClientHandler.java b/example/src/main/java/io/netty/example/echo/EchoClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/echo/EchoClientHandler.java
rename to example/src/main/java/io/netty/example/echo/EchoClientHandler.java
diff --git a/src/main/java/io/netty/example/echo/EchoServer.java b/example/src/main/java/io/netty/example/echo/EchoServer.java
similarity index 100%
rename from src/main/java/io/netty/example/echo/EchoServer.java
rename to example/src/main/java/io/netty/example/echo/EchoServer.java
diff --git a/src/main/java/io/netty/example/echo/EchoServerHandler.java b/example/src/main/java/io/netty/example/echo/EchoServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/echo/EchoServerHandler.java
rename to example/src/main/java/io/netty/example/echo/EchoServerHandler.java
diff --git a/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java b/example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java
similarity index 100%
rename from src/main/java/io/netty/example/factorial/BigIntegerDecoder.java
rename to example/src/main/java/io/netty/example/factorial/BigIntegerDecoder.java
diff --git a/src/main/java/io/netty/example/factorial/FactorialClient.java b/example/src/main/java/io/netty/example/factorial/FactorialClient.java
similarity index 100%
rename from src/main/java/io/netty/example/factorial/FactorialClient.java
rename to example/src/main/java/io/netty/example/factorial/FactorialClient.java
diff --git a/src/main/java/io/netty/example/factorial/FactorialClientHandler.java b/example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/factorial/FactorialClientHandler.java
rename to example/src/main/java/io/netty/example/factorial/FactorialClientHandler.java
diff --git a/src/main/java/io/netty/example/factorial/FactorialClientPipelineFactory.java b/example/src/main/java/io/netty/example/factorial/FactorialClientPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/factorial/FactorialClientPipelineFactory.java
rename to example/src/main/java/io/netty/example/factorial/FactorialClientPipelineFactory.java
diff --git a/src/main/java/io/netty/example/factorial/FactorialServer.java b/example/src/main/java/io/netty/example/factorial/FactorialServer.java
similarity index 100%
rename from src/main/java/io/netty/example/factorial/FactorialServer.java
rename to example/src/main/java/io/netty/example/factorial/FactorialServer.java
diff --git a/src/main/java/io/netty/example/factorial/FactorialServerHandler.java b/example/src/main/java/io/netty/example/factorial/FactorialServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/factorial/FactorialServerHandler.java
rename to example/src/main/java/io/netty/example/factorial/FactorialServerHandler.java
diff --git a/src/main/java/io/netty/example/factorial/FactorialServerPipelineFactory.java b/example/src/main/java/io/netty/example/factorial/FactorialServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/factorial/FactorialServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/factorial/FactorialServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/factorial/NumberEncoder.java b/example/src/main/java/io/netty/example/factorial/NumberEncoder.java
similarity index 100%
rename from src/main/java/io/netty/example/factorial/NumberEncoder.java
rename to example/src/main/java/io/netty/example/factorial/NumberEncoder.java
diff --git a/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java
similarity index 100%
rename from src/main/java/io/netty/example/http/file/HttpStaticFileServer.java
rename to example/src/main/java/io/netty/example/http/file/HttpStaticFileServer.java
diff --git a/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java
rename to example/src/main/java/io/netty/example/http/file/HttpStaticFileServerHandler.java
diff --git a/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/http/file/HttpStaticFileServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/http/snoop/HttpClient.java b/example/src/main/java/io/netty/example/http/snoop/HttpClient.java
similarity index 100%
rename from src/main/java/io/netty/example/http/snoop/HttpClient.java
rename to example/src/main/java/io/netty/example/http/snoop/HttpClient.java
diff --git a/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java b/example/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java
rename to example/src/main/java/io/netty/example/http/snoop/HttpClientPipelineFactory.java
diff --git a/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java b/example/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java
rename to example/src/main/java/io/netty/example/http/snoop/HttpRequestHandler.java
diff --git a/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java b/example/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java
rename to example/src/main/java/io/netty/example/http/snoop/HttpResponseHandler.java
diff --git a/src/main/java/io/netty/example/http/snoop/HttpServer.java b/example/src/main/java/io/netty/example/http/snoop/HttpServer.java
similarity index 100%
rename from src/main/java/io/netty/example/http/snoop/HttpServer.java
rename to example/src/main/java/io/netty/example/http/snoop/HttpServer.java
diff --git a/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/http/snoop/HttpServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/http/upload/HttpClient.java b/example/src/main/java/io/netty/example/http/upload/HttpClient.java
similarity index 100%
rename from src/main/java/io/netty/example/http/upload/HttpClient.java
rename to example/src/main/java/io/netty/example/http/upload/HttpClient.java
diff --git a/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java b/example/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java
rename to example/src/main/java/io/netty/example/http/upload/HttpClientPipelineFactory.java
diff --git a/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/http/upload/HttpRequestHandler.java
rename to example/src/main/java/io/netty/example/http/upload/HttpRequestHandler.java
diff --git a/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java b/example/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/http/upload/HttpResponseHandler.java
rename to example/src/main/java/io/netty/example/http/upload/HttpResponseHandler.java
diff --git a/src/main/java/io/netty/example/http/upload/HttpServer.java b/example/src/main/java/io/netty/example/http/upload/HttpServer.java
similarity index 100%
rename from src/main/java/io/netty/example/http/upload/HttpServer.java
rename to example/src/main/java/io/netty/example/http/upload/HttpServer.java
diff --git a/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/http/upload/HttpServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServer.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServer.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServer.java
rename to example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServer.java
diff --git a/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java
rename to example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerHandler.java
diff --git a/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/http/websocketx/autobahn/WebSocketServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/http/websocketx/autobahn/package-info.java b/example/src/main/java/io/netty/example/http/websocketx/autobahn/package-info.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/autobahn/package-info.java
rename to example/src/main/java/io/netty/example/http/websocketx/autobahn/package-info.java
diff --git a/src/main/java/io/netty/example/http/websocketx/client/App.java b/example/src/main/java/io/netty/example/http/websocketx/client/App.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/client/App.java
rename to example/src/main/java/io/netty/example/http/websocketx/client/App.java
diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketCallback.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketCallback.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketCallback.java
rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketCallback.java
diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java
rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClient.java
diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientFactory.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketClientFactory.java
rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientFactory.java
diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java
rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketClientHandler.java
diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketException.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketException.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketException.java
rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketException.java
diff --git a/src/main/java/io/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java b/example/src/main/java/io/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java
rename to example/src/main/java/io/netty/example/http/websocketx/client/WebSocketHttpResponseDecoder.java
diff --git a/src/main/java/io/netty/example/http/websocketx/client/package-info.java b/example/src/main/java/io/netty/example/http/websocketx/client/package-info.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/client/package-info.java
rename to example/src/main/java/io/netty/example/http/websocketx/client/package-info.java
diff --git a/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java
rename to example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServer.java
diff --git a/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java
rename to example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerHandler.java
diff --git a/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerIndexPage.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerIndexPage.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/server/WebSocketServerIndexPage.java
rename to example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerIndexPage.java
diff --git a/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/http/websocketx/server/WebSocketServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/http/websocketx/server/package-info.java b/example/src/main/java/io/netty/example/http/websocketx/server/package-info.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/server/package-info.java
rename to example/src/main/java/io/netty/example/http/websocketx/server/package-info.java
diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServer.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServer.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServer.java
rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServer.java
diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java
rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerHandler.java
diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java
rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerIndexPage.java
diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerSslContext.java
diff --git a/src/main/java/io/netty/example/http/websocketx/sslserver/package-info.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/package-info.java
similarity index 100%
rename from src/main/java/io/netty/example/http/websocketx/sslserver/package-info.java
rename to example/src/main/java/io/netty/example/http/websocketx/sslserver/package-info.java
diff --git a/src/main/java/io/netty/example/iostream/IOStream.java b/example/src/main/java/io/netty/example/iostream/IOStream.java
similarity index 100%
rename from src/main/java/io/netty/example/iostream/IOStream.java
rename to example/src/main/java/io/netty/example/iostream/IOStream.java
diff --git a/src/main/java/io/netty/example/local/LocalExample.java b/example/src/main/java/io/netty/example/local/LocalExample.java
similarity index 100%
rename from src/main/java/io/netty/example/local/LocalExample.java
rename to example/src/main/java/io/netty/example/local/LocalExample.java
diff --git a/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java b/example/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java
similarity index 100%
rename from src/main/java/io/netty/example/local/LocalExampleMultthreaded.java
rename to example/src/main/java/io/netty/example/local/LocalExampleMultthreaded.java
diff --git a/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java b/example/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/local/LocalServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/local/LocalServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/localtime/LocalTimeClient.java b/example/src/main/java/io/netty/example/localtime/LocalTimeClient.java
similarity index 100%
rename from src/main/java/io/netty/example/localtime/LocalTimeClient.java
rename to example/src/main/java/io/netty/example/localtime/LocalTimeClient.java
diff --git a/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java b/example/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java
rename to example/src/main/java/io/netty/example/localtime/LocalTimeClientHandler.java
diff --git a/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java b/example/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java
rename to example/src/main/java/io/netty/example/localtime/LocalTimeClientPipelineFactory.java
diff --git a/src/main/java/io/netty/example/localtime/LocalTimeProtocol.java b/example/src/main/java/io/netty/example/localtime/LocalTimeProtocol.java
similarity index 100%
rename from src/main/java/io/netty/example/localtime/LocalTimeProtocol.java
rename to example/src/main/java/io/netty/example/localtime/LocalTimeProtocol.java
diff --git a/src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto b/example/src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto
similarity index 100%
rename from src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto
rename to example/src/main/java/io/netty/example/localtime/LocalTimeProtocol.proto
diff --git a/src/main/java/io/netty/example/localtime/LocalTimeServer.java b/example/src/main/java/io/netty/example/localtime/LocalTimeServer.java
similarity index 100%
rename from src/main/java/io/netty/example/localtime/LocalTimeServer.java
rename to example/src/main/java/io/netty/example/localtime/LocalTimeServer.java
diff --git a/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java b/example/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java
rename to example/src/main/java/io/netty/example/localtime/LocalTimeServerHandler.java
diff --git a/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java b/example/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/localtime/LocalTimeServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/objectecho/ObjectEchoClient.java b/example/src/main/java/io/netty/example/objectecho/ObjectEchoClient.java
similarity index 100%
rename from src/main/java/io/netty/example/objectecho/ObjectEchoClient.java
rename to example/src/main/java/io/netty/example/objectecho/ObjectEchoClient.java
diff --git a/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java b/example/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java
rename to example/src/main/java/io/netty/example/objectecho/ObjectEchoClientHandler.java
diff --git a/src/main/java/io/netty/example/objectecho/ObjectEchoServer.java b/example/src/main/java/io/netty/example/objectecho/ObjectEchoServer.java
similarity index 100%
rename from src/main/java/io/netty/example/objectecho/ObjectEchoServer.java
rename to example/src/main/java/io/netty/example/objectecho/ObjectEchoServer.java
diff --git a/src/main/java/io/netty/example/objectecho/ObjectEchoServerHandler.java b/example/src/main/java/io/netty/example/objectecho/ObjectEchoServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/objectecho/ObjectEchoServerHandler.java
rename to example/src/main/java/io/netty/example/objectecho/ObjectEchoServerHandler.java
diff --git a/src/main/java/io/netty/example/portunification/PortUnificationServer.java b/example/src/main/java/io/netty/example/portunification/PortUnificationServer.java
similarity index 100%
rename from src/main/java/io/netty/example/portunification/PortUnificationServer.java
rename to example/src/main/java/io/netty/example/portunification/PortUnificationServer.java
diff --git a/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java b/example/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java
rename to example/src/main/java/io/netty/example/portunification/PortUnificationServerHandler.java
diff --git a/src/main/java/io/netty/example/proxy/HexDumpProxy.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxy.java
similarity index 100%
rename from src/main/java/io/netty/example/proxy/HexDumpProxy.java
rename to example/src/main/java/io/netty/example/proxy/HexDumpProxy.java
diff --git a/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java
rename to example/src/main/java/io/netty/example/proxy/HexDumpProxyInboundHandler.java
diff --git a/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java b/example/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java
rename to example/src/main/java/io/netty/example/proxy/HexDumpProxyPipelineFactory.java
diff --git a/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java
similarity index 100%
rename from src/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java
rename to example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClient.java
diff --git a/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java
rename to example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentClientHandler.java
diff --git a/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServer.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServer.java
similarity index 100%
rename from src/main/java/io/netty/example/qotm/QuoteOfTheMomentServer.java
rename to example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServer.java
diff --git a/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java b/example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java
rename to example/src/main/java/io/netty/example/qotm/QuoteOfTheMomentServerHandler.java
diff --git a/src/main/java/io/netty/example/sctp/SctpClient.java b/example/src/main/java/io/netty/example/sctp/SctpClient.java
similarity index 97%
rename from src/main/java/io/netty/example/sctp/SctpClient.java
rename to example/src/main/java/io/netty/example/sctp/SctpClient.java
index d12c171fac..39d1f4e24b 100644
--- a/src/main/java/io/netty/example/sctp/SctpClient.java
+++ b/example/src/main/java/io/netty/example/sctp/SctpClient.java
@@ -20,7 +20,7 @@ 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.channel.sctp.SctpClientSocketChannelFactory;
 import io.netty.handler.execution.ExecutionHandler;
 import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
 
diff --git a/src/main/java/io/netty/example/sctp/SctpClientHandler.java b/example/src/main/java/io/netty/example/sctp/SctpClientHandler.java
similarity index 97%
rename from src/main/java/io/netty/example/sctp/SctpClientHandler.java
rename to example/src/main/java/io/netty/example/sctp/SctpClientHandler.java
index 75702c6708..9c09e0a4e7 100644
--- a/src/main/java/io/netty/example/sctp/SctpClientHandler.java
+++ b/example/src/main/java/io/netty/example/sctp/SctpClientHandler.java
@@ -17,7 +17,7 @@ package io.netty.example.sctp;
 
 import io.netty.buffer.ChannelBuffers;
 import io.netty.channel.*;
-import io.netty.channel.socket.sctp.SctpPayload;
+import io.netty.channel.sctp.SctpPayload;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
diff --git a/src/main/java/io/netty/example/sctp/SctpServer.java b/example/src/main/java/io/netty/example/sctp/SctpServer.java
similarity index 97%
rename from src/main/java/io/netty/example/sctp/SctpServer.java
rename to example/src/main/java/io/netty/example/sctp/SctpServer.java
index e6150556e4..15a9749aac 100644
--- a/src/main/java/io/netty/example/sctp/SctpServer.java
+++ b/example/src/main/java/io/netty/example/sctp/SctpServer.java
@@ -19,7 +19,7 @@ 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.channel.sctp.SctpServerSocketChannelFactory;
 import io.netty.handler.execution.ExecutionHandler;
 import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
 
diff --git a/src/main/java/io/netty/example/sctp/SctpServerHandler.java b/example/src/main/java/io/netty/example/sctp/SctpServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/sctp/SctpServerHandler.java
rename to example/src/main/java/io/netty/example/sctp/SctpServerHandler.java
diff --git a/src/main/java/io/netty/example/securechat/SecureChatClient.java b/example/src/main/java/io/netty/example/securechat/SecureChatClient.java
similarity index 100%
rename from src/main/java/io/netty/example/securechat/SecureChatClient.java
rename to example/src/main/java/io/netty/example/securechat/SecureChatClient.java
diff --git a/src/main/java/io/netty/example/securechat/SecureChatClientHandler.java b/example/src/main/java/io/netty/example/securechat/SecureChatClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/securechat/SecureChatClientHandler.java
rename to example/src/main/java/io/netty/example/securechat/SecureChatClientHandler.java
diff --git a/src/main/java/io/netty/example/securechat/SecureChatClientPipelineFactory.java b/example/src/main/java/io/netty/example/securechat/SecureChatClientPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/securechat/SecureChatClientPipelineFactory.java
rename to example/src/main/java/io/netty/example/securechat/SecureChatClientPipelineFactory.java
diff --git a/src/main/java/io/netty/example/securechat/SecureChatKeyStore.java b/example/src/main/java/io/netty/example/securechat/SecureChatKeyStore.java
similarity index 100%
rename from src/main/java/io/netty/example/securechat/SecureChatKeyStore.java
rename to example/src/main/java/io/netty/example/securechat/SecureChatKeyStore.java
diff --git a/src/main/java/io/netty/example/securechat/SecureChatServer.java b/example/src/main/java/io/netty/example/securechat/SecureChatServer.java
similarity index 100%
rename from src/main/java/io/netty/example/securechat/SecureChatServer.java
rename to example/src/main/java/io/netty/example/securechat/SecureChatServer.java
diff --git a/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java b/example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/securechat/SecureChatServerHandler.java
rename to example/src/main/java/io/netty/example/securechat/SecureChatServerHandler.java
diff --git a/src/main/java/io/netty/example/securechat/SecureChatServerPipelineFactory.java b/example/src/main/java/io/netty/example/securechat/SecureChatServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/securechat/SecureChatServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/securechat/SecureChatServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java b/example/src/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java
rename to example/src/main/java/io/netty/example/securechat/SecureChatSslContextFactory.java
diff --git a/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java b/example/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java
rename to example/src/main/java/io/netty/example/securechat/SecureChatTrustManagerFactory.java
diff --git a/src/main/java/io/netty/example/telnet/TelnetClient.java b/example/src/main/java/io/netty/example/telnet/TelnetClient.java
similarity index 100%
rename from src/main/java/io/netty/example/telnet/TelnetClient.java
rename to example/src/main/java/io/netty/example/telnet/TelnetClient.java
diff --git a/src/main/java/io/netty/example/telnet/TelnetClientHandler.java b/example/src/main/java/io/netty/example/telnet/TelnetClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/telnet/TelnetClientHandler.java
rename to example/src/main/java/io/netty/example/telnet/TelnetClientHandler.java
diff --git a/src/main/java/io/netty/example/telnet/TelnetClientPipelineFactory.java b/example/src/main/java/io/netty/example/telnet/TelnetClientPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/telnet/TelnetClientPipelineFactory.java
rename to example/src/main/java/io/netty/example/telnet/TelnetClientPipelineFactory.java
diff --git a/src/main/java/io/netty/example/telnet/TelnetServer.java b/example/src/main/java/io/netty/example/telnet/TelnetServer.java
similarity index 100%
rename from src/main/java/io/netty/example/telnet/TelnetServer.java
rename to example/src/main/java/io/netty/example/telnet/TelnetServer.java
diff --git a/src/main/java/io/netty/example/telnet/TelnetServerHandler.java b/example/src/main/java/io/netty/example/telnet/TelnetServerHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/telnet/TelnetServerHandler.java
rename to example/src/main/java/io/netty/example/telnet/TelnetServerHandler.java
diff --git a/src/main/java/io/netty/example/telnet/TelnetServerPipelineFactory.java b/example/src/main/java/io/netty/example/telnet/TelnetServerPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/example/telnet/TelnetServerPipelineFactory.java
rename to example/src/main/java/io/netty/example/telnet/TelnetServerPipelineFactory.java
diff --git a/src/main/java/io/netty/example/uptime/UptimeClient.java b/example/src/main/java/io/netty/example/uptime/UptimeClient.java
similarity index 100%
rename from src/main/java/io/netty/example/uptime/UptimeClient.java
rename to example/src/main/java/io/netty/example/uptime/UptimeClient.java
diff --git a/src/main/java/io/netty/example/uptime/UptimeClientHandler.java b/example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java
similarity index 100%
rename from src/main/java/io/netty/example/uptime/UptimeClientHandler.java
rename to example/src/main/java/io/netty/example/uptime/UptimeClientHandler.java
diff --git a/handler/pom.xml b/handler/pom.xml
new file mode 100644
index 0000000000..9c9c64263e
--- /dev/null
+++ b/handler/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-handler</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Handler</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-codec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+    </plugins>
+  </build>
+</project>
+
diff --git a/src/main/java/io/netty/handler/execution/ChainedExecutor.java b/handler/src/main/java/io/netty/handler/execution/ChainedExecutor.java
similarity index 100%
rename from src/main/java/io/netty/handler/execution/ChainedExecutor.java
rename to handler/src/main/java/io/netty/handler/execution/ChainedExecutor.java
diff --git a/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java b/handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java
similarity index 100%
rename from src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java
rename to handler/src/main/java/io/netty/handler/execution/ChannelDownstreamEventRunnable.java
diff --git a/src/main/java/io/netty/handler/execution/ChannelEventRunnable.java b/handler/src/main/java/io/netty/handler/execution/ChannelEventRunnable.java
similarity index 100%
rename from src/main/java/io/netty/handler/execution/ChannelEventRunnable.java
rename to handler/src/main/java/io/netty/handler/execution/ChannelEventRunnable.java
diff --git a/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java b/handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java
similarity index 100%
rename from src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java
rename to handler/src/main/java/io/netty/handler/execution/ChannelUpstreamEventRunnable.java
diff --git a/src/main/java/io/netty/util/DefaultObjectSizeEstimator.java b/handler/src/main/java/io/netty/handler/execution/DefaultObjectSizeEstimator.java
similarity index 99%
rename from src/main/java/io/netty/util/DefaultObjectSizeEstimator.java
rename to handler/src/main/java/io/netty/handler/execution/DefaultObjectSizeEstimator.java
index 806986a062..738ca828d1 100644
--- a/src/main/java/io/netty/util/DefaultObjectSizeEstimator.java
+++ b/handler/src/main/java/io/netty/handler/execution/DefaultObjectSizeEstimator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.util;
+package io.netty.handler.execution;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
diff --git a/src/main/java/io/netty/container/microcontainer/NettyLoggerConfigurator.java b/handler/src/main/java/io/netty/handler/execution/EstimatableObjectWrapper.java
similarity index 59%
rename from src/main/java/io/netty/container/microcontainer/NettyLoggerConfigurator.java
rename to handler/src/main/java/io/netty/handler/execution/EstimatableObjectWrapper.java
index e06f91c7b8..21e55a97f0 100644
--- a/src/main/java/io/netty/container/microcontainer/NettyLoggerConfigurator.java
+++ b/handler/src/main/java/io/netty/handler/execution/EstimatableObjectWrapper.java
@@ -13,16 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.container.microcontainer;
-
-import io.netty.logging.InternalLoggerFactory;
-import io.netty.logging.JBossLoggerFactory;
+package io.netty.handler.execution;
 
 /**
- * A bean that configures the default {@link InternalLoggerFactory}.
+ * Represents an object which contains another object that needs to be taken
+ * into account by {@link ObjectSizeEstimator} for more accurate object size
+ * estimation.
  */
-public class NettyLoggerConfigurator {
-    public NettyLoggerConfigurator() {
-        InternalLoggerFactory.setDefaultFactory(new JBossLoggerFactory());
-    }
+public interface EstimatableObjectWrapper {
+
+    /**
+     * Returns the underlying object that needs to be taken into account
+     * by {@link ObjectSizeEstimator} for more accurate object size estimation.
+     */
+    Object unwrap();
 }
diff --git a/src/main/java/io/netty/handler/execution/ExecutionHandler.java b/handler/src/main/java/io/netty/handler/execution/ExecutionHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/execution/ExecutionHandler.java
rename to handler/src/main/java/io/netty/handler/execution/ExecutionHandler.java
diff --git a/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java b/handler/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
similarity index 99%
rename from src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
rename to handler/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
index efb91aea08..c50811882a 100644
--- a/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
+++ b/handler/src/main/java/io/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
@@ -33,8 +33,6 @@ 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;
diff --git a/src/main/java/io/netty/util/ObjectSizeEstimator.java b/handler/src/main/java/io/netty/handler/execution/ObjectSizeEstimator.java
similarity index 96%
rename from src/main/java/io/netty/util/ObjectSizeEstimator.java
rename to handler/src/main/java/io/netty/handler/execution/ObjectSizeEstimator.java
index 8810282d14..5603687f92 100644
--- a/src/main/java/io/netty/util/ObjectSizeEstimator.java
+++ b/handler/src/main/java/io/netty/handler/execution/ObjectSizeEstimator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.util;
+package io.netty.handler.execution;
 
 
 /**
diff --git a/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java b/handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
similarity index 99%
rename from src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
rename to handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
index 924c329a45..a6cfd6637d 100644
--- a/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
+++ b/handler/src/main/java/io/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
@@ -29,7 +29,6 @@ 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;
 
diff --git a/src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java b/handler/src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java
similarity index 100%
rename from src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java
rename to handler/src/main/java/io/netty/handler/execution/filter/ChannelDownstreamEventRunnableFilter.java
diff --git a/src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java b/handler/src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java
similarity index 100%
rename from src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java
rename to handler/src/main/java/io/netty/handler/execution/filter/ChannelEventRunnableFilter.java
diff --git a/src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java b/handler/src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java
similarity index 100%
rename from src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java
rename to handler/src/main/java/io/netty/handler/execution/filter/ChannelUpstreamEventRunnableFilter.java
diff --git a/src/main/java/io/netty/handler/execution/package-info.java b/handler/src/main/java/io/netty/handler/execution/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/execution/package-info.java
rename to handler/src/main/java/io/netty/handler/execution/package-info.java
diff --git a/src/main/java/io/netty/handler/ipfilter/CIDR.java b/handler/src/main/java/io/netty/handler/ipfilter/CIDR.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/CIDR.java
rename to handler/src/main/java/io/netty/handler/ipfilter/CIDR.java
diff --git a/src/main/java/io/netty/handler/ipfilter/CIDR4.java b/handler/src/main/java/io/netty/handler/ipfilter/CIDR4.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/CIDR4.java
rename to handler/src/main/java/io/netty/handler/ipfilter/CIDR4.java
diff --git a/src/main/java/io/netty/handler/ipfilter/CIDR6.java b/handler/src/main/java/io/netty/handler/ipfilter/CIDR6.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/CIDR6.java
rename to handler/src/main/java/io/netty/handler/ipfilter/CIDR6.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilterListener.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilterListener.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpFilterListener.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilterListener.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilterRule.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilterRule.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpFilterRule.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilterRule.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilterRuleHandler.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilterRuleHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpFilterRuleHandler.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilterRuleHandler.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilterRuleList.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilterRuleList.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpFilterRuleList.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilterRuleList.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilteringHandler.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilteringHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpFilteringHandler.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilteringHandler.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpFilteringHandlerImpl.java b/handler/src/main/java/io/netty/handler/ipfilter/IpFilteringHandlerImpl.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpFilteringHandlerImpl.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpFilteringHandlerImpl.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpSet.java b/handler/src/main/java/io/netty/handler/ipfilter/IpSet.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpSet.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpSet.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpSubnet.java b/handler/src/main/java/io/netty/handler/ipfilter/IpSubnet.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpSubnet.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpSubnet.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpSubnetFilterRule.java b/handler/src/main/java/io/netty/handler/ipfilter/IpSubnetFilterRule.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpSubnetFilterRule.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpSubnetFilterRule.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpV4Subnet.java b/handler/src/main/java/io/netty/handler/ipfilter/IpV4Subnet.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpV4Subnet.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpV4Subnet.java
diff --git a/src/main/java/io/netty/handler/ipfilter/IpV4SubnetFilterRule.java b/handler/src/main/java/io/netty/handler/ipfilter/IpV4SubnetFilterRule.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/IpV4SubnetFilterRule.java
rename to handler/src/main/java/io/netty/handler/ipfilter/IpV4SubnetFilterRule.java
diff --git a/src/main/java/io/netty/handler/ipfilter/OneIpFilterHandler.java b/handler/src/main/java/io/netty/handler/ipfilter/OneIpFilterHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/OneIpFilterHandler.java
rename to handler/src/main/java/io/netty/handler/ipfilter/OneIpFilterHandler.java
diff --git a/src/main/java/io/netty/handler/ipfilter/PatternRule.java b/handler/src/main/java/io/netty/handler/ipfilter/PatternRule.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/PatternRule.java
rename to handler/src/main/java/io/netty/handler/ipfilter/PatternRule.java
diff --git a/src/main/java/io/netty/handler/ipfilter/package-info.java b/handler/src/main/java/io/netty/handler/ipfilter/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/ipfilter/package-info.java
rename to handler/src/main/java/io/netty/handler/ipfilter/package-info.java
diff --git a/src/main/java/io/netty/handler/logging/LoggingHandler.java b/handler/src/main/java/io/netty/handler/logging/LoggingHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/logging/LoggingHandler.java
rename to handler/src/main/java/io/netty/handler/logging/LoggingHandler.java
diff --git a/src/main/java/io/netty/handler/logging/package-info.java b/handler/src/main/java/io/netty/handler/logging/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/logging/package-info.java
rename to handler/src/main/java/io/netty/handler/logging/package-info.java
diff --git a/src/main/java/io/netty/handler/queue/BlockingReadHandler.java b/handler/src/main/java/io/netty/handler/queue/BlockingReadHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/queue/BlockingReadHandler.java
rename to handler/src/main/java/io/netty/handler/queue/BlockingReadHandler.java
diff --git a/src/main/java/io/netty/handler/queue/BlockingReadTimeoutException.java b/handler/src/main/java/io/netty/handler/queue/BlockingReadTimeoutException.java
similarity index 100%
rename from src/main/java/io/netty/handler/queue/BlockingReadTimeoutException.java
rename to handler/src/main/java/io/netty/handler/queue/BlockingReadTimeoutException.java
diff --git a/src/main/java/io/netty/handler/queue/BufferedWriteHandler.java b/handler/src/main/java/io/netty/handler/queue/BufferedWriteHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/queue/BufferedWriteHandler.java
rename to handler/src/main/java/io/netty/handler/queue/BufferedWriteHandler.java
diff --git a/src/main/java/io/netty/handler/queue/package-info.java b/handler/src/main/java/io/netty/handler/queue/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/queue/package-info.java
rename to handler/src/main/java/io/netty/handler/queue/package-info.java
diff --git a/src/main/java/io/netty/handler/region/ChannelWritableByteChannel.java b/handler/src/main/java/io/netty/handler/region/ChannelWritableByteChannel.java
similarity index 100%
rename from src/main/java/io/netty/handler/region/ChannelWritableByteChannel.java
rename to handler/src/main/java/io/netty/handler/region/ChannelWritableByteChannel.java
diff --git a/src/main/java/io/netty/handler/region/FileRegionEncoder.java b/handler/src/main/java/io/netty/handler/region/FileRegionEncoder.java
similarity index 100%
rename from src/main/java/io/netty/handler/region/FileRegionEncoder.java
rename to handler/src/main/java/io/netty/handler/region/FileRegionEncoder.java
diff --git a/src/main/java/io/netty/handler/ssl/ImmediateExecutor.java b/handler/src/main/java/io/netty/handler/ssl/ImmediateExecutor.java
similarity index 100%
rename from src/main/java/io/netty/handler/ssl/ImmediateExecutor.java
rename to handler/src/main/java/io/netty/handler/ssl/ImmediateExecutor.java
diff --git a/src/main/java/io/netty/handler/ssl/SslBufferPool.java b/handler/src/main/java/io/netty/handler/ssl/SslBufferPool.java
similarity index 100%
rename from src/main/java/io/netty/handler/ssl/SslBufferPool.java
rename to handler/src/main/java/io/netty/handler/ssl/SslBufferPool.java
diff --git a/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/ssl/SslHandler.java
rename to handler/src/main/java/io/netty/handler/ssl/SslHandler.java
diff --git a/src/main/java/io/netty/handler/ssl/package-info.java b/handler/src/main/java/io/netty/handler/ssl/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/ssl/package-info.java
rename to handler/src/main/java/io/netty/handler/ssl/package-info.java
diff --git a/src/main/java/io/netty/handler/stream/ChunkedFile.java b/handler/src/main/java/io/netty/handler/stream/ChunkedFile.java
similarity index 100%
rename from src/main/java/io/netty/handler/stream/ChunkedFile.java
rename to handler/src/main/java/io/netty/handler/stream/ChunkedFile.java
diff --git a/src/main/java/io/netty/handler/stream/ChunkedInput.java b/handler/src/main/java/io/netty/handler/stream/ChunkedInput.java
similarity index 100%
rename from src/main/java/io/netty/handler/stream/ChunkedInput.java
rename to handler/src/main/java/io/netty/handler/stream/ChunkedInput.java
diff --git a/src/main/java/io/netty/handler/stream/ChunkedNioFile.java b/handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java
similarity index 100%
rename from src/main/java/io/netty/handler/stream/ChunkedNioFile.java
rename to handler/src/main/java/io/netty/handler/stream/ChunkedNioFile.java
diff --git a/src/main/java/io/netty/handler/stream/ChunkedNioStream.java b/handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java
similarity index 100%
rename from src/main/java/io/netty/handler/stream/ChunkedNioStream.java
rename to handler/src/main/java/io/netty/handler/stream/ChunkedNioStream.java
diff --git a/src/main/java/io/netty/handler/stream/ChunkedStream.java b/handler/src/main/java/io/netty/handler/stream/ChunkedStream.java
similarity index 100%
rename from src/main/java/io/netty/handler/stream/ChunkedStream.java
rename to handler/src/main/java/io/netty/handler/stream/ChunkedStream.java
diff --git a/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java b/handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
rename to handler/src/main/java/io/netty/handler/stream/ChunkedWriteHandler.java
diff --git a/src/main/java/io/netty/handler/stream/package-info.java b/handler/src/main/java/io/netty/handler/stream/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/stream/package-info.java
rename to handler/src/main/java/io/netty/handler/stream/package-info.java
diff --git a/src/main/java/io/netty/handler/timeout/DefaultIdleStateEvent.java b/handler/src/main/java/io/netty/handler/timeout/DefaultIdleStateEvent.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/DefaultIdleStateEvent.java
rename to handler/src/main/java/io/netty/handler/timeout/DefaultIdleStateEvent.java
diff --git a/src/main/java/io/netty/handler/timeout/IdleState.java b/handler/src/main/java/io/netty/handler/timeout/IdleState.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/IdleState.java
rename to handler/src/main/java/io/netty/handler/timeout/IdleState.java
diff --git a/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelHandler.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/IdleStateAwareChannelHandler.java
rename to handler/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelHandler.java
diff --git a/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java
rename to handler/src/main/java/io/netty/handler/timeout/IdleStateAwareChannelUpstreamHandler.java
diff --git a/src/main/java/io/netty/handler/timeout/IdleStateEvent.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateEvent.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/IdleStateEvent.java
rename to handler/src/main/java/io/netty/handler/timeout/IdleStateEvent.java
diff --git a/src/main/java/io/netty/handler/timeout/IdleStateHandler.java b/handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/IdleStateHandler.java
rename to handler/src/main/java/io/netty/handler/timeout/IdleStateHandler.java
diff --git a/src/main/java/io/netty/handler/timeout/ReadTimeoutException.java b/handler/src/main/java/io/netty/handler/timeout/ReadTimeoutException.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/ReadTimeoutException.java
rename to handler/src/main/java/io/netty/handler/timeout/ReadTimeoutException.java
diff --git a/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java b/handler/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java
rename to handler/src/main/java/io/netty/handler/timeout/ReadTimeoutHandler.java
diff --git a/src/main/java/io/netty/handler/timeout/TimeoutException.java b/handler/src/main/java/io/netty/handler/timeout/TimeoutException.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/TimeoutException.java
rename to handler/src/main/java/io/netty/handler/timeout/TimeoutException.java
diff --git a/src/main/java/io/netty/handler/timeout/WriteTimeoutException.java b/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutException.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/WriteTimeoutException.java
rename to handler/src/main/java/io/netty/handler/timeout/WriteTimeoutException.java
diff --git a/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java b/handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java
rename to handler/src/main/java/io/netty/handler/timeout/WriteTimeoutHandler.java
diff --git a/src/main/java/io/netty/handler/timeout/package-info.java b/handler/src/main/java/io/netty/handler/timeout/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/timeout/package-info.java
rename to handler/src/main/java/io/netty/handler/timeout/package-info.java
diff --git a/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java b/handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java
similarity index 71%
rename from src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java
rename to handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java
index edd22e13f0..8e2dfa8b75 100644
--- a/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java
+++ b/handler/src/main/java/io/netty/handler/traffic/AbstractTrafficShapingHandler.java
@@ -18,6 +18,7 @@ package io.netty.handler.traffic;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelEvent;
 import io.netty.channel.ChannelHandlerContext;
@@ -27,9 +28,7 @@ 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;
 
 /**
@@ -41,10 +40,6 @@ import io.netty.util.internal.ExecutorUtil;
  * the method doAccounting of this handler.<br>
  * <br>
  *
- * An {@link 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 DefaultObjectSizeEstimator} implementation.<br><br>
- *
  * If you want for any particular reasons to stop the monitoring (accounting) or to change
  * the read/write limit or the check interval, several methods allow that for you:<br>
  * <ul>
@@ -77,11 +72,6 @@ public abstract class AbstractTrafficShapingHandler extends
      */
     protected TrafficCounter trafficCounter = null;
 
-    /**
-     * ObjectSizeEstimator
-     */
-    private ObjectSizeEstimator objectSizeEstimator = null;
-
     /**
      * Executor to associated to any TrafficCounter
      */
@@ -109,17 +99,8 @@ public abstract class AbstractTrafficShapingHandler extends
      */
     final AtomicBoolean release = new AtomicBoolean(false);
 
-    /**
-    * @param newObjectSizeEstimator
-    * @param newExecutor
-    * @param newWriteLimit
-    * @param newReadLimit
-    * @param newCheckInterval
-    */
-    private void init(ObjectSizeEstimator newObjectSizeEstimator,
-            Executor newExecutor, long newWriteLimit, long newReadLimit,
-            long newCheckInterval) {
-        objectSizeEstimator = newObjectSizeEstimator;
+    private void init(
+            Executor newExecutor, long newWriteLimit, long newReadLimit, long newCheckInterval) {
         executor = newExecutor;
         writeLimit = newWriteLimit;
         readLimit = newReadLimit;
@@ -136,8 +117,6 @@ public abstract class AbstractTrafficShapingHandler extends
     }
 
     /**
-     * Constructor using default {@link ObjectSizeEstimator}
-     *
      * @param executor
      *          created for instance like Executors.newCachedThreadPool
      * @param writeLimit
@@ -150,36 +129,10 @@ public abstract class AbstractTrafficShapingHandler extends
      */
     public AbstractTrafficShapingHandler(Executor executor, long writeLimit,
             long readLimit, long checkInterval) {
-	    init(new DefaultObjectSizeEstimator(), executor, writeLimit, readLimit,
-                checkInterval);
+	    init(executor, writeLimit, readLimit, checkInterval);
     }
 
     /**
-     * Constructor using the specified ObjectSizeEstimator
-     *
-     * @param objectSizeEstimator
-     *            the {@link ObjectSizeEstimator} that will be used to compute
-     *            the size of the message
-     * @param executor
-     *          created for instance like Executors.newCachedThreadPool
-     * @param writeLimit
-     *          0 or a limit in bytes/s
-     * @param readLimit
-     *          0 or a limit in bytes/s
-     * @param checkInterval
-     *          The delay between two computations of performances for
-     *            channels or 0 if no stats are to be computed
-     */
-    public AbstractTrafficShapingHandler(
-            ObjectSizeEstimator objectSizeEstimator, Executor executor,
-            long writeLimit, long readLimit, long checkInterval) {
-	    init(objectSizeEstimator, executor, writeLimit, readLimit,
-                checkInterval);
-    }
-
-    /**
-     * Constructor using default {@link ObjectSizeEstimator} and using default Check Interval
-     *
      * @param executor
      *          created for instance like Executors.newCachedThreadPool
      * @param writeLimit
@@ -189,92 +142,11 @@ public abstract class AbstractTrafficShapingHandler extends
      */
     public AbstractTrafficShapingHandler(Executor executor, long writeLimit,
             long readLimit) {
-	    init(new DefaultObjectSizeEstimator(), executor, writeLimit, readLimit,
-                DEFAULT_CHECK_INTERVAL);
-    }
-
-    /**
-     * Constructor using the specified ObjectSizeEstimator and using default Check Interval
-     *
-     * @param objectSizeEstimator
-     *            the {@link ObjectSizeEstimator} that will be used to compute
-     *            the size of the message
-     * @param executor
-     *          created for instance like Executors.newCachedThreadPool
-     * @param writeLimit
-     *          0 or a limit in bytes/s
-     * @param readLimit
-     *          0 or a limit in bytes/s
-     */
-    public AbstractTrafficShapingHandler(
-            ObjectSizeEstimator objectSizeEstimator, Executor executor,
-            long writeLimit, long readLimit) {
-	    init(objectSizeEstimator, executor, writeLimit, readLimit,
-                DEFAULT_CHECK_INTERVAL);
-    }
-
-    /**
-     * Constructor using default {@link ObjectSizeEstimator} and using NO LIMIT and default Check Interval
-     *
-     * @param executor
-     *          created for instance like Executors.newCachedThreadPool
-     */
-    public AbstractTrafficShapingHandler(Executor executor) {
-	    init(new DefaultObjectSizeEstimator(), executor, 0, 0,
-                DEFAULT_CHECK_INTERVAL);
-    }
-
-    /**
-     * Constructor using the specified ObjectSizeEstimator and using NO LIMIT and default Check Interval
-     *
-     * @param objectSizeEstimator
-     *            the {@link ObjectSizeEstimator} that will be used to compute
-     *            the size of the message
-     * @param executor
-     *          created for instance like Executors.newCachedThreadPool
-     */
-    public AbstractTrafficShapingHandler(
-            ObjectSizeEstimator objectSizeEstimator, Executor executor) {
-	    init(objectSizeEstimator, executor, 0, 0, DEFAULT_CHECK_INTERVAL);
-    }
-
-    /**
-     * Constructor using default {@link ObjectSizeEstimator} and using NO LIMIT
-     *
-     * @param executor
-     *          created for instance like Executors.newCachedThreadPool
-     * @param checkInterval
-     *          The delay between two computations of performances for
-     *            channels or 0 if no stats are to be computed
-     */
-    public AbstractTrafficShapingHandler(Executor executor, long checkInterval) {
-	    init(new DefaultObjectSizeEstimator(), executor, 0, 0, checkInterval);
-    }
-
-    /**
-     * Constructor using the specified ObjectSizeEstimator and using NO LIMIT
-     *
-     * @param objectSizeEstimator
-     *            the {@link ObjectSizeEstimator} that will be used to compute
-     *            the size of the message
-     * @param executor
-     *          created for instance like Executors.newCachedThreadPool
-     * @param checkInterval
-     *          The delay between two computations of performances for
-     *            channels or 0 if no stats are to be computed
-     */
-    public AbstractTrafficShapingHandler(
-            ObjectSizeEstimator objectSizeEstimator, Executor executor,
-            long checkInterval) {
-	    init(objectSizeEstimator, executor, 0, 0, checkInterval);
+	    init(executor, writeLimit, readLimit, DEFAULT_CHECK_INTERVAL);
     }
 
     /**
      * Change the underlying limitations and check interval.
-     *
-     * @param newWriteLimit
-     * @param newReadLimit
-     * @param newCheckInterval
      */
     public void configure(long newWriteLimit, long newReadLimit,
             long newCheckInterval) {
@@ -284,9 +156,6 @@ public abstract class AbstractTrafficShapingHandler extends
 
     /**
      * Change the underlying limitations.
-     *
-     * @param newWriteLimit
-     * @param newReadLimit
      */
     public void configure(long newWriteLimit, long newReadLimit) {
         writeLimit = newWriteLimit;
@@ -298,8 +167,6 @@ public abstract class AbstractTrafficShapingHandler extends
 
     /**
      * Change the check interval.
-     *
-     * @param newCheckInterval
      */
     public void configure(long newCheckInterval) {
         checkInterval = newCheckInterval;
@@ -388,7 +255,7 @@ public abstract class AbstractTrafficShapingHandler extends
             throws Exception {
         try {
             long curtime = System.currentTimeMillis();
-            long size = objectSizeEstimator.estimateSize(arg1.getMessage());
+            long size = ((ChannelBuffer) arg1.getMessage()).readableBytes();
             if (trafficCounter != null) {
                 trafficCounter.bytesRecvFlowControl(arg0, size);
                 if (readLimit == 0) {
@@ -448,7 +315,7 @@ public abstract class AbstractTrafficShapingHandler extends
             throws Exception {
         try {
             long curtime = System.currentTimeMillis();
-            long size = objectSizeEstimator.estimateSize(arg1.getMessage());
+            long size = ((ChannelBuffer) arg1.getMessage()).readableBytes();
             if (trafficCounter != null) {
                 trafficCounter.bytesWriteFlowControl(size);
                 if (writeLimit == 0) {
diff --git a/src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java b/handler/src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
similarity index 73%
rename from src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
rename to handler/src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
index 197064e84d..4ee0f746ba 100644
--- a/src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
+++ b/handler/src/main/java/io/netty/handler/traffic/ChannelTrafficShapingHandler.java
@@ -23,7 +23,6 @@ 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
@@ -81,67 +80,6 @@ public class ChannelTrafficShapingHandler extends AbstractTrafficShapingHandler
         super(executor, writeLimit, readLimit);
     }
 
-    /**
-     * @param executor
-     * @param checkInterval
-     */
-    public ChannelTrafficShapingHandler(Executor executor, long checkInterval) {
-        super(executor, checkInterval);
-    }
-
-    /**
-     * @param executor
-     */
-    public ChannelTrafficShapingHandler(Executor executor) {
-        super(executor);
-    }
-
-    /**
-     * @param objectSizeEstimator
-     * @param executor
-     * @param writeLimit
-     * @param readLimit
-     * @param checkInterval
-     */
-    public ChannelTrafficShapingHandler(
-            ObjectSizeEstimator objectSizeEstimator, Executor executor,
-            long writeLimit, long readLimit, long checkInterval) {
-        super(objectSizeEstimator, executor, writeLimit, readLimit,
-                checkInterval);
-    }
-
-    /**
-     * @param objectSizeEstimator
-     * @param executor
-     * @param writeLimit
-     * @param readLimit
-     */
-    public ChannelTrafficShapingHandler(
-            ObjectSizeEstimator objectSizeEstimator, Executor executor,
-            long writeLimit, long readLimit) {
-        super(objectSizeEstimator, executor, writeLimit, readLimit);
-    }
-
-    /**
-     * @param objectSizeEstimator
-     * @param executor
-     * @param checkInterval
-     */
-    public ChannelTrafficShapingHandler(
-            ObjectSizeEstimator objectSizeEstimator, Executor executor,
-            long checkInterval) {
-        super(objectSizeEstimator, executor, checkInterval);
-    }
-
-    /**
-     * @param objectSizeEstimator
-     * @param executor
-     */
-    public ChannelTrafficShapingHandler(
-            ObjectSizeEstimator objectSizeEstimator, Executor executor) {
-        super(objectSizeEstimator, executor);
-    }
-
     @Override
     public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e)
             throws Exception {
diff --git a/src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java b/handler/src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
similarity index 67%
rename from src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
rename to handler/src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
index de979de39c..5810d2998d 100644
--- a/src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
+++ b/handler/src/main/java/io/netty/handler/traffic/GlobalTrafficShapingHandler.java
@@ -21,7 +21,6 @@ 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
@@ -92,70 +91,4 @@ public class GlobalTrafficShapingHandler extends AbstractTrafficShapingHandler {
         super(executor, writeLimit, readLimit);
         createGlobalTrafficCounter();
     }
-
-    /**
-     * @param executor
-     * @param checkInterval
-     */
-    public GlobalTrafficShapingHandler(Executor executor, long checkInterval) {
-        super(executor, checkInterval);
-        createGlobalTrafficCounter();
-    }
-
-    /**
-     * @param executor
-     */
-    public GlobalTrafficShapingHandler(Executor executor) {
-        super(executor);
-        createGlobalTrafficCounter();
-    }
-
-    /**
-     * @param objectSizeEstimator
-     * @param executor
-     * @param writeLimit
-     * @param readLimit
-     * @param checkInterval
-     */
-    public GlobalTrafficShapingHandler(ObjectSizeEstimator objectSizeEstimator,
-            Executor executor, long writeLimit, long readLimit,
-            long checkInterval) {
-        super(objectSizeEstimator, executor, writeLimit, readLimit,
-                checkInterval);
-        createGlobalTrafficCounter();
-    }
-
-    /**
-     * @param objectSizeEstimator
-     * @param executor
-     * @param writeLimit
-     * @param readLimit
-     */
-    public GlobalTrafficShapingHandler(ObjectSizeEstimator objectSizeEstimator,
-            Executor executor, long writeLimit, long readLimit) {
-        super(objectSizeEstimator, executor, writeLimit, readLimit);
-        createGlobalTrafficCounter();
-    }
-
-    /**
-     * @param objectSizeEstimator
-     * @param executor
-     * @param checkInterval
-     */
-    public GlobalTrafficShapingHandler(ObjectSizeEstimator objectSizeEstimator,
-            Executor executor, long checkInterval) {
-        super(objectSizeEstimator, executor, checkInterval);
-        createGlobalTrafficCounter();
-    }
-
-    /**
-     * @param objectSizeEstimator
-     * @param executor
-     */
-    public GlobalTrafficShapingHandler(ObjectSizeEstimator objectSizeEstimator,
-            Executor executor) {
-        super(objectSizeEstimator, executor);
-        createGlobalTrafficCounter();
-    }
-
 }
diff --git a/src/main/java/io/netty/handler/traffic/TrafficCounter.java b/handler/src/main/java/io/netty/handler/traffic/TrafficCounter.java
similarity index 100%
rename from src/main/java/io/netty/handler/traffic/TrafficCounter.java
rename to handler/src/main/java/io/netty/handler/traffic/TrafficCounter.java
diff --git a/src/main/java/io/netty/handler/traffic/package-info.java b/handler/src/main/java/io/netty/handler/traffic/package-info.java
similarity index 100%
rename from src/main/java/io/netty/handler/traffic/package-info.java
rename to handler/src/main/java/io/netty/handler/traffic/package-info.java
diff --git a/src/test/java/io/netty/handler/ipfilter/IpFilterRuleTest.java b/handler/src/test/java/io/netty/handler/ipfilter/IpFilterRuleTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/ipfilter/IpFilterRuleTest.java
rename to handler/src/test/java/io/netty/handler/ipfilter/IpFilterRuleTest.java
diff --git a/src/test/java/io/netty/handler/ssl/ImmediateExecutorTest.java b/handler/src/test/java/io/netty/handler/ssl/ImmediateExecutorTest.java
similarity index 100%
rename from src/test/java/io/netty/handler/ssl/ImmediateExecutorTest.java
rename to handler/src/test/java/io/netty/handler/ssl/ImmediateExecutorTest.java
diff --git a/pom.xml b/pom.xml
index 7881d13231..3411b34bc0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,20 +24,16 @@
   </parent>
 
   <groupId>io.netty</groupId>
-  <artifactId>netty</artifactId>
-  <packaging>bundle</packaging>
+  <artifactId>netty-parent</artifactId>
+  <packaging>pom</packaging>
   <version>4.0.0.Alpha1-SNAPSHOT</version>
 
-  <name>The Netty Project</name>
-  <url>http://io.netty/</url>
+  <name>Netty</name>
+  <url>http://netty.io/</url>
   <description>
-    The Netty project is an effort to provide an asynchronous event-driven
-    network application framework and tools for rapid development of
-    maintainable high performance and high scalability protocol servers and
-    clients.  In other words, Netty is a NIO client server framework which
-    enables quick and easy development of network applications such as protocol
-    servers and clients. It greatly simplifies and streamlines network
-    programming such as TCP and UDP socket server.
+    Netty is an asynchronous event-driven network application framework for 
+    rapid development of maintainable high performance protocol servers and
+    clients.
   </description>
 
   <organization>
@@ -70,110 +66,105 @@
     </developer>
   </developers>
 
+  <modules>
+    <module>common</module>
+    <module>buffer</module>
+    <module>codec</module>
+    <module>codec-http</module>
+    <module>transport</module>
+    <module>transport-http</module>
+    <module>transport-rxtx</module>
+    <module>transport-sctp</module>
+    <module>handler</module>
+    <module>example</module>
+    <module>all</module>
+    <module>testsuite</module>
+  </modules>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>2.4.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.rxtx</groupId>
+        <artifactId>rxtx</artifactId>
+        <version>2.1.7</version>
+      </dependency>
+
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>2.5</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>1.4.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.osgi.compendium</artifactId>
+        <version>1.4.0</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>javax.servlet</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.foundation</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>1.6.4</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>1.1.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging-spi</artifactId>
+        <version>2.1.2.GA</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>1.2.16</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>mail</artifactId>
+            <groupId>javax.mail</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>jms</artifactId>
+            <groupId>javax.jms</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>jmxtools</artifactId>
+            <groupId>com.sun.jdmk</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>jmxri</artifactId>
+            <groupId>com.sun.jmx</groupId>
+          </exclusion>
+        </exclusions>
+        <optional>true</optional>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
-    <!-- Google Protocol Buffers - completely optional -->
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>2.4.1</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- RXTX - completely optional -->
-    <!-- Used for serial port communication transport -->
-    <dependency>
-      <groupId>org.rxtx</groupId>
-      <artifactId>rxtx</artifactId>
-      <version>2.1.7</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- Servlet API - completely optional -->
-    <!-- Used for HTTP tunneling transport -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>2.5</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- IoC/DI containers - completely optional -->
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>1.4.0</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>javax.servlet</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.foundation</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <!-- Logging frameworks - completely optional -->
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-      <version>1.6.4</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.1.1</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging-spi</artifactId>
-      <version>2.1.2.GA</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.16</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>mail</artifactId>
-          <groupId>javax.mail</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jms</artifactId>
-          <groupId>javax.jms</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jmxtools</artifactId>
-          <groupId>com.sun.jdmk</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jmxri</artifactId>
-          <groupId>com.sun.jmx</groupId>
-        </exclusion>
-      </exclusions>
-      <optional>true</optional>
-    </dependency>
-
     <!-- Testing frameworks and related dependencies -->
     <dependency>
       <groupId>junit</groupId>
@@ -207,22 +198,7 @@
     </dependency>
   </dependencies>
 
-  <properties>
-    <jdk.min.version>1.6</jdk.min.version>
-    <maven.min.version>2.2.1</maven.min.version>
-    <attach-distribution>false</attach-distribution>
-  </properties>
-
   <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/resources</directory>
-      </resource>
-      <resource>
-        <directory>${basedir}/target/license</directory>
-      </resource>
-    </resources>
-
     <pluginManagement>
       <plugins>
         <!--This plugin's configuration is used to store Eclipse m2e settings only. 
@@ -290,330 +266,6 @@
           <optimize>true</optimize>
           <showDeprecation>true</showDeprecation>
           <showWarnings>true</showWarnings>
-          <excludes>
-            <!-- Exclude sctp from build for now -->
-            <!-- See: https://github.com/netty/netty/issues/120 -->
-            <exclude>**/sctp/*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.5</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-        <executions>
-          <execution>
-            <id>copy-legal-info</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/target/license/META-INF</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}</directory>
-                  <filtering>false</filtering>
-                  <includes>
-                    <include>LICENSE.txt</include>
-                    <include>NOTICE.txt</include>
-                    <include>license/*.txt</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.10</version>
-        <configuration>
-          <forkMode>once</forkMode>
-          <excludes>
-            <exclude>**/Abstract*</exclude>
-            <exclude>**/TestUtil*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.4</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName>
-            <Bundle-DocURL>${project.url}</Bundle-DocURL>
-            <Bundle-Activator>
-              ${project.groupId}.container.osgi.NettyBundleActivator
-            </Bundle-Activator>
-            <Export-Package>
-              !${project.groupId}.example.*,
-              !${project.groupId}.util.internal.*,
-              ${project.groupId}.*;version=${project.version}
-            </Export-Package>
-            <Private-Package>
-              ${project.groupId}.example.*,
-              ${project.groupId}.util.internal.*,
-            </Private-Package>
-            <Import-Package>
-              *;resolution:=optional
-            </Import-Package>
-            <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
-            <Bundle-BuddyPolicy>registered</Bundle-BuddyPolicy>
-            <Main-Class>${project.groupId}.util.Version</Main-Class>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.2</version>
-        <executions>
-          <execution>
-            <id>attach-source</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-            <configuration>
-              <attach>true</attach>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.7</version>
-        <executions>
-          <execution>
-            <id>write-version</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <taskdef resource="net/sf/antcontrib/antlib.xml" />
-                <exec executable="git" outputproperty="gitOutput" resultproperty="gitExitCode" failonerror="false" failifexecutionfails="false">
-                  <arg value="log"/>
-                  <arg value="-1"/>
-                  <arg value="--format=format:%h"/>
-                </exec>
-                <if>
-                  <equals arg2="0" arg1="${gitExitCode}"/>
-                  <then>
-                    <property name="buildNumber" value="${gitOutput}"/>
-                  </then>
-                  <else>
-                    <property name="buildNumber" value="unknown"/>
-                  </else>
-                </if>
-                <echo>Build number: ${buildNumber}</echo>
-                <mkdir dir="${project.build.directory}" />
-                <echo message="${project.version}" file="${project.build.directory}/version.txt" />
-		<echo message="// DO NOT MODIFY - WILL BE OVERWRITTEN DURING THE BUILD PROCESS${line.separator}package io.netty.util;${line.separator}/**${line.separator} * Provides the version information of Netty.${line.separator} * @apiviz.landmark${line.separator} */${line.separator}public final class Version {${line.separator} /** The version identifier. */${line.separator} public static final String ID = &quot;${project.version}-${buildNumber}&quot;;${line.separator} /** Prints out the version identifier to stdout. */${line.separator} public static void main(String[] args) { System.out.println(ID); }${line.separator} private Version() { super(); }${line.separator}}${line.separator}" file="${basedir}/src/main/java/io/netty/util/Version.java" />
-              </tasks>
-            </configuration>
-          </execution>
-          <execution>
-            <id>remove-examples</id>
-            <phase>package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <taskdef resource="net/sf/antcontrib/antlib.xml" />
-                <if>
-                  <or>
-                    <equals arg2="jar" arg1="${project.packaging}" />
-                    <equals arg2="bundle" arg1="${project.packaging}" />
-                  </or>
-                  <then>
-                    <move file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${project.build.finalName}.orig.jar" />
-                    <zip destfile="${project.build.directory}/${project.build.finalName}.jar">
-                      <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}.orig.jar" dirmode="755">
-                        <include name="META-INF/MANIFEST.MF" />
-                      </zipfileset>
-                      <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}.orig.jar" dirmode="755">
-                        <exclude name="META-INF/MANIFEST.MF" />
-                        <exclude name="*/*/*/example/**" />
-                      </zipfileset>
-                    </zip>
-                    <delete file="${project.build.directory}/${project.build.finalName}.orig.jar" />
-                    <checksum file="${project.build.directory}/${project.build.finalName}.jar" algorithm="md5" forceoverwrite="yes" />
-                    <checksum file="${project.build.directory}/${project.build.finalName}.jar" algorithm="sha1" forceoverwrite="yes" />
-                    <move file="${project.build.directory}/${project.build.finalName}-sources.jar" tofile="${project.build.directory}/${project.build.finalName}-sources.orig.jar" />
-                    <zip destfile="${project.build.directory}/${project.build.finalName}-sources.jar">
-                      <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}-sources.orig.jar" dirmode="755">
-                        <include name="META-INF/MANIFEST.MF" />
-                      </zipfileset>
-                      <zipfileset filemode="644" src="${project.build.directory}/${project.build.finalName}-sources.orig.jar" dirmode="755">
-                        <exclude name="META-INF/MANIFEST.MF" />
-                        <exclude name="*/*/*/example/**" />
-                      </zipfileset>
-                    </zip>
-                    <delete file="${project.build.directory}/${project.build.finalName}-sources.orig.jar" />
-                    <checksum file="${project.build.directory}/${project.build.finalName}-sources.jar" algorithm="md5" forceoverwrite="yes" />
-                    <checksum file="${project.build.directory}/${project.build.finalName}-sources.jar" algorithm="sha1" forceoverwrite="yes" />
-                  </then>
-                </if>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.8.2</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant-launcher</artifactId>
-            <version>1.8.2</version>
-          </dependency>
-          <dependency>
-            <groupId>ant-contrib</groupId>
-            <artifactId>ant-contrib</artifactId>
-            <version>1.0b3</version>
-            <exclusions>
-              <exclusion>
-                <groupId>ant</groupId>
-                <artifactId>ant</artifactId>
-              </exclusion>
-            </exclusions>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.8</version>
-        <executions>
-          <execution>
-            <id>attach-javadoc</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <doclet>org.jboss.apiviz.APIviz</doclet>
-	  <docletPath>${basedir}/lib/apiviz-1.3.1.GA.jar</docletPath>
-          <attach>true</attach>
-          <javadocDirectory>${basedir}/src/javadoc</javadocDirectory>
-          <docfilessubdirs>true</docfilessubdirs>
-          <useStandardDocletOptions>true</useStandardDocletOptions>
-          <outputDirectory>${project.build.directory}/api</outputDirectory>
-          <charset>UTF-8</charset>
-          <docencoding>UTF-8</docencoding>
-          <breakiterator>true</breakiterator>
-          <version>false</version>
-          <author>false</author>
-          <keywords>true</keywords>
-          <overview>${basedir}/src/javadoc/overview.html</overview>
-          <doctitle>${project.name} API Reference (${project.version})</doctitle>
-          <windowtitle>${project.name} API Reference (${project.version})</windowtitle>
-          <additionalparam>
-            -link http://java.sun.com/javase/6/docs/api/
-            -link http://code.google.com/apis/protocolbuffers/docs/reference/java/
-            -link http://java.sun.com/products/servlet/2.5/docs/servlet-2_5-mr2/
-            -link http://www.osgi.org/javadoc/r4v41/
-            -link http://www.slf4j.org/apidocs/
-            -link http://commons.apache.org/logging/commons-logging-1.1.1/apidocs/
-            -link http://logging.apache.org/log4j/1.2/apidocs/
-
-            -group "Low-level data representation" ${project.groupId}.buffer*
-            -group "Central interface for all I/O operations" ${project.groupId}.channel*
-            -group "Client &amp; Server bootstrapping utilities" ${project.groupId}.bootstrap*
-            -group "Reusable I/O event interceptors" ${project.groupId}.handler*
-            -group "Miscellaneous" ${project.groupId}.logging*:${project.groupId}.util*
-
-            -sourceclasspath ${project.build.outputDirectory}
-            -nopackagediagram
-          </additionalparam>
-          <encoding>UTF-8</encoding>
-          <locale>en_US</locale>
-          <excludePackageNames>${project.groupId}.example*:${project.groupId}.container*:${project.groupId}.util.internal*</excludePackageNames>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.2</version>
-        <executions>
-          <execution>
-            <id>generate-xref</id>
-            <phase>package</phase>
-            <goals>
-              <goal>jxr</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <inputEncoding>UTF-8</inputEncoding>
-          <outputEncoding>UTF-8</outputEncoding>
-          <linkJavadoc>true</linkJavadoc>
-          <destDir>${project.build.directory}/xref</destDir>
-          <javadocDir>${project.build.directory}/api</javadocDir>
-          <docTitle>${project.name} Source Xref (${project.version})</docTitle>
-          <windowTitle>${project.name} Source Xref (${project.version})</windowTitle>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
-        <executions>
-          <execution>
-            <id>generate-distribution</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptors>
-            <descriptor>${basedir}/src/assembly/default.xml</descriptor>
-          </descriptors>
-          <attach>${attach-distribution}</attach>
-          <appendAssemblyId>true</appendAssemblyId>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-gpg-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <id>sign-artifacts</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>sign</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.2.1</version>
-        <configuration>
-          <!-- We don't want to use the default release profile because it
-               causes the JavaDoc and source jars to be deployed twice. -->
-          <useReleaseProfile>false</useReleaseProfile>
-          <!-- Activate a custom profile called "release" -->
-          <arguments>-Prelease</arguments>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.8</version>
-        <configuration>
-          <downloadSources>true</downloadSources>
-          <addVersionToProjectName>true</addVersionToProjectName>
         </configuration>
       </plugin>
     </plugins>
diff --git a/src/assembly/default.xml b/src/assembly/default.xml
deleted file mode 100644
index bc23c01229..0000000000
--- a/src/assembly/default.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2011 The Netty Project
-  ~
-  ~ The Netty Project licenses this file to you under the Apache License,
-  ~ version 2.0 (the "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at:
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<assembly>
-  <id>dist</id>
-  <formats>
-    <format>tar.bz2</format>
-  </formats>
-  <includeSiteDirectory>false</includeSiteDirectory>
-  <fileSets>
-    <!-- Source Code -->
-    <fileSet>
-      <includes>
-        <include>**/README*</include>
-        <include>**/LICENSE*</include>
-        <include>**/NOTICE*</include>
-        <include>**/COPYRIGHT*</include>
-        <include>**/*.txt</include>
-        <include>**/*.xml</include>
-        <include>**/license/**</include>
-        <include>**/src/**</include>
-      </includes>
-      <excludes>
-        <exclude>**/target/**</exclude>
-        <exclude>**/.*/**</exclude>
-      </excludes>
-    </fileSet>
-
-    <!-- JARs -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>jar</outputDirectory>
-      <includes>
-        <include>${project.build.finalName}*.jar</include>
-      </includes>
-      <excludes>
-        <exclude>${project.build.finalName}*-javadoc.jar</exclude>
-      </excludes>
-    </fileSet>
-
-    <!-- Documentation (API) -->
-    <fileSet>
-      <directory>target/api</directory>
-      <outputDirectory>doc/api</outputDirectory>
-      <includes>
-        <include>**/**</include>
-      </includes>
-    </fileSet>
-
-    <!-- Documentation (XRef) -->
-    <fileSet>
-      <directory>target/xref</directory>
-      <outputDirectory>doc/xref</outputDirectory>
-      <includes>
-        <include>**/**</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
-
diff --git a/src/javadoc/overview.html b/src/javadoc/overview.html
deleted file mode 100644
index 2400b25973..0000000000
--- a/src/javadoc/overview.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  ~ Copyright 2011 The Netty Project
-  ~
-  ~ The Netty Project licenses this file to you under the Apache License,
-  ~ version 2.0 (the "License"); you may not use this file except in compliance
-  ~ with the License. You may obtain a copy of the License at:
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<html>
-<head>
-  <title>The Netty Project API Reference</title>
-</head>
-<body>
-<div style="text-align: center;"><img src="http://netty.io/images/architecture.png"></div>
-<p style="text-align: justify;"><a href="http://netty.io/" target="_top"><em>The Netty project</em></a> is an effort to provide an asynchronous event-driven network application framework and tools for rapid development of maintainable high performance and high scalability protocol servers and clients&#46;  In other words, Netty is a NIO client server framework which enables quick and easy development of network applications such as protocol servers and clients&#46;  It greatly simplifies and streamlines network programming such as TCP/IP socket server&#46;</p>
-</body>
-</html>
diff --git a/src/main/java/io/netty/container/osgi/NettyBundleActivator.java b/src/main/java/io/netty/container/osgi/NettyBundleActivator.java
deleted file mode 100644
index 8b2f66fd3a..0000000000
--- a/src/main/java/io/netty/container/osgi/NettyBundleActivator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.container.osgi;
-
-import io.netty.logging.InternalLoggerFactory;
-import io.netty.logging.OsgiLoggerFactory;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * An OSGi {@link BundleActivator} that configures logging.
- */
-public class NettyBundleActivator implements BundleActivator {
-
-    private OsgiLoggerFactory loggerFactory;
-
-    @Override
-    public void start(BundleContext ctx) throws Exception {
-        // Switch the internal logger to the OSGi LogService.
-        loggerFactory = new OsgiLoggerFactory(ctx);
-        InternalLoggerFactory.setDefaultFactory(loggerFactory);
-    }
-
-    @Override
-    public void stop(BundleContext ctx) throws Exception {
-        if (loggerFactory != null) {
-            InternalLoggerFactory.setDefaultFactory(loggerFactory.getFallback());
-            loggerFactory.destroy();
-            loggerFactory = null;
-        }
-    }
-}
diff --git a/src/main/java/io/netty/util/DebugUtil.java b/src/main/java/io/netty/util/DebugUtil.java
deleted file mode 100644
index 773740c083..0000000000
--- a/src/main/java/io/netty/util/DebugUtil.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.util;
-
-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 "io.netty.debug"} system property (e.g.
- * {@code java -Dio.netty.debug ...})
- * <p>
- * If debug mode is disabled (default), the stack trace of the exceptions are
- * compressed to help debugging a user application.
- * <p>
- * If debug mode is enabled, the stack trace of the exceptions raised in
- * {@link ChannelPipeline} or {@link ChannelSink} are retained as it is to help
- * debugging Netty.
- */
-public class DebugUtil {
-
-    /**
-     * Returns {@code true} if and only if Netty debug mode is enabled.
-     */
-    public static boolean isDebugEnabled() {
-        String value;
-        try {
-            value = SystemPropertyUtil.get("io.netty.debug");
-        } catch (Exception e) {
-            value = null;
-        }
-
-        if (value == null) {
-            return false;
-        }
-
-        value = value.trim().toUpperCase();
-        return !value.startsWith("N") &&
-               !value.startsWith("F") &&
-               !value.equals("0");
-    }
-
-    private DebugUtil() {
-        // Unused
-    }
-}
diff --git a/src/main/java/io/netty/util/NamedThreadFactory.java b/src/main/java/io/netty/util/NamedThreadFactory.java
deleted file mode 100644
index 33fa15e084..0000000000
--- a/src/main/java/io/netty/util/NamedThreadFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.util;
-
-import java.util.concurrent.Executors;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-
-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.
- * This class is useful when you want to customize the name of the I/O threads:
- * <pre>
- * {@link ChannelFactory} f = new {@link NioServerSocketChannelFactory}(
- *         {@link Executors}.{@link Executors#newCachedThreadPool(java.util.concurrent.ThreadFactory) newCachedThreadPool}(new {@link NamedThreadFactory}("myServerBoss-")),
- *         {@link Executors}.{@link Executors#newCachedThreadPool(java.util.concurrent.ThreadFactory) newCachedThreadPool}(new {@link NamedThreadFactory}("myServerWorker-")));
- * </pre>
- */
-public class NamedThreadFactory implements ThreadFactory {
-
-    private final ThreadGroup group;
-    private final AtomicInteger threadId = new AtomicInteger(1);
-    private final String prefix;
-    private final boolean daemon;
-    private final int priority;
-
-    /**
-     * Creates a new factory that creates a {@link Thread} with the specified name prefix.
-     *
-     * @param prefix the prefix of the new thread's name
-     */
-    public NamedThreadFactory(String prefix) {
-         this(prefix, false, Thread.NORM_PRIORITY);
-    }
-
-    /**
-     * Creates a new factory that creates a {@link Thread} with the specified name prefix.
-     *
-     * @param prefix the prefix of the new thread's name
-     * @param daemon {@code true} if the new thread is a daemon thread
-     * @param priority the priority of the new thread
-     */
-    public NamedThreadFactory(String prefix, boolean daemon, int priority) {
-        if (prefix == null) {
-            throw new NullPointerException("prefix");
-        }
-        if (priority < Thread.MIN_PRIORITY || priority > Thread.MAX_PRIORITY) {
-            throw new IllegalArgumentException(
-                    "priority: " + priority +
-                    " (expected: >= " + Thread.MIN_PRIORITY + " && <= " + Thread.MAX_PRIORITY + ')');
-        }
-
-        this.prefix = prefix;
-        this.daemon = daemon;
-        this.priority = priority;
-
-        SecurityManager s = System.getSecurityManager();
-        if (s != null) {
-            group = s.getThreadGroup();
-        } else {
-            group = Thread.currentThread().getThreadGroup();
-        }
-    }
-
-    /**
-     * {@inheritDoc} The name of the thread is {@code "prefix + threadId"}. (e.g. {@code "ioThread-1"} if
-     * {@code prefix} is {@code "ioThread-"}.
-     */
-    @Override
-    public Thread newThread(Runnable r) {
-        Thread t = new Thread(group, r, prefix + threadId.getAndIncrement());
-        t.setDaemon(daemon);
-        t.setPriority(priority);
-        return t;
-    }
-}
diff --git a/src/main/java/io/netty/util/VirtualExecutorService.java b/src/main/java/io/netty/util/VirtualExecutorService.java
deleted file mode 100644
index 3326d1b728..0000000000
--- a/src/main/java/io/netty/util/VirtualExecutorService.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.util;
-
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.AbstractExecutorService;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
-
-import io.netty.channel.ChannelFactory;
-import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
-
-
-/**
- * A delegating {@link ExecutorService} with its own termination management.
- * <p>
- * {@link VirtualExecutorService} is used when you want to inject an
- * {@link ExecutorService} but you do not want to allow the explicit termination
- * of threads on shutdown request.  It is particularly useful when the
- * {@link ExecutorService} to inject is shared by different components and
- * the life cycle of the components depend on the termination of the injected
- * {@link ExecutorService}.
- *
- * <pre>
- * ExecutorService globalExecutor = ...;
- * ExecutorService virtualExecutor = new {@link VirtualExecutorService}(globalExecutor);
- *
- * {@link ChannelFactory} factory =
- *         new {@link NioServerSocketChannelFactory}(virtualExecutor, virtualExecutor);
- * ...
- *
- * // ChannelFactory.releaseExternalResources() shuts down the executor and
- * // interrupts the I/O threads to terminate all I/O tasks and to release all
- * // resources acquired by ChannelFactory.
- * factory.releaseExternalResources();
- *
- * // Note that globalExecutor is not shut down because VirtualExecutorService
- * // implements its own termination management. All threads which were acquired
- * // by ChannelFactory via VirtualExecutorService are returned to the pool.
- * assert !globalExecutor.isShutdown();
- * </pre>
- *
- * <h3>The differences from an ordinary {@link ExecutorService}</h3>
- *
- * A shutdown request ({@link #shutdown()} or {@link #shutdownNow()}) does not
- * shut down its parent {@link Executor} but simply sets its internal flag to
- * reject further execution request.
- * <p>
- * {@link #shutdownNow()} interrupts only the thread which is executing the
- * task executed via {@link VirtualExecutorService}.
- * <p>
- * {@link #awaitTermination(long, TimeUnit)} does not wait for real thread
- * termination but wait until {@link VirtualExecutorService} is shut down and
- * its active tasks are finished and the threads are returned to the parent
- * {@link Executor}.
- * @apiviz.landmark
- */
-public class VirtualExecutorService extends AbstractExecutorService {
-
-    private final Executor e;
-    private final ExecutorService s;
-    final Object startStopLock = new Object();
-    volatile boolean shutdown;
-    Set<Thread> activeThreads = new MapBackedSet<Thread>(new IdentityHashMap<Thread, Boolean>());
-
-    /**
-     * Creates a new instance with the specified parent {@link Executor}.
-     */
-    public VirtualExecutorService(Executor parent) {
-        if (parent == null) {
-            throw new NullPointerException("parent");
-        }
-
-        if (parent instanceof ExecutorService) {
-            e = null;
-            s = (ExecutorService) parent;
-        } else {
-            e = parent;
-            s = null;
-        }
-    }
-
-    @Override
-    public boolean isShutdown() {
-        synchronized (startStopLock) {
-            return shutdown;
-        }
-    }
-
-    @Override
-    public boolean isTerminated() {
-        synchronized (startStopLock) {
-            return shutdown && activeThreads.isEmpty();
-        }
-    }
-
-    @Override
-    public void shutdown() {
-        synchronized (startStopLock) {
-            if (shutdown) {
-                return;
-            }
-            shutdown = true;
-        }
-    }
-
-    @Override
-    public List<Runnable> shutdownNow() {
-        synchronized (startStopLock) {
-            if (!isTerminated()) {
-                shutdown();
-                for (Thread t: activeThreads) {
-                    t.interrupt();
-                }
-            }
-        }
-
-        return Collections.emptyList();
-    }
-
-    @Override
-    public boolean awaitTermination(long timeout, TimeUnit unit)
-            throws InterruptedException {
-        synchronized (startStopLock) {
-            while (!isTerminated()) {
-                startStopLock.wait(TimeUnit.MILLISECONDS.convert(timeout, unit));
-            }
-
-            return isTerminated();
-        }
-    }
-
-    @Override
-    public void execute(Runnable command) {
-        if (command == null) {
-            throw new NullPointerException("command");
-        }
-
-        if (shutdown) {
-            throw new RejectedExecutionException();
-        }
-
-        if (s != null) {
-            s.execute(new ChildExecutorRunnable(command));
-        } else {
-            e.execute(new ChildExecutorRunnable(command));
-        }
-    }
-
-    private class ChildExecutorRunnable implements Runnable {
-
-        private final Runnable runnable;
-
-        ChildExecutorRunnable(Runnable runnable) {
-            this.runnable = runnable;
-        }
-
-        @Override
-        public void run() {
-            Thread thread = Thread.currentThread();
-            synchronized (startStopLock) {
-                activeThreads.add(thread);
-            }
-            try {
-                runnable.run();
-            } finally {
-                synchronized (startStopLock) {
-                    boolean removed = activeThreads.remove(thread);
-                    assert removed;
-                    if (isTerminated()) {
-                        startStopLock.notifyAll();
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/main/java/io/netty/util/internal/StackTraceSimplifier.java b/src/main/java/io/netty/util/internal/StackTraceSimplifier.java
deleted file mode 100644
index 3146416dc1..0000000000
--- a/src/main/java/io/netty/util/internal/StackTraceSimplifier.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.util.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-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
- * {@link StackTraceElement}s.  Please note that the stack trace simplification
- * is disabled if {@linkplain DebugUtil debug mode} is turned on.
- */
-public class StackTraceSimplifier {
-
-    private static final boolean SIMPLIFY_STACK_TRACE = !DebugUtil.isDebugEnabled();
-    private static final Pattern EXCLUDED_STACK_TRACE =
-        Pattern.compile(
-                "^io\\.netty\\." +
-                "(util\\.internal\\.DeadLockProofWorker" +
-                "|channel\\.(SimpleChannel(Upstream|Downstream)?Handler|(Default|Static)ChannelPipeline.*))(\\$.*)?$");
-
-    /**
-     * Removes unnecessary {@link StackTraceElement}s from the specified
-     * exception.  {@link SimpleChannelHandler}, {@link DefaultChannelPipeline},
-     * and {@link StaticChannelPipeline} will be dropped from the trace.
-     */
-    public static void simplify(Throwable e) {
-        if (!SIMPLIFY_STACK_TRACE) {
-            return;
-        }
-
-        if (e.getCause() != null) {
-            simplify(e.getCause());
-        }
-
-        StackTraceElement[] trace = e.getStackTrace();
-        if (trace == null || trace.length == 0) {
-            return;
-        }
-
-        // Perhaps Netty bug.  Let us not strip things out.
-        if (EXCLUDED_STACK_TRACE.matcher(trace[0].getClassName()).matches()) {
-            return;
-        }
-
-        List<StackTraceElement> simpleTrace =
-            new ArrayList<StackTraceElement>(trace.length);
-
-        simpleTrace.add(trace[0]);
-
-        // Remove unnecessary stack trace elements.
-        for (int i = 1; i < trace.length; i ++) {
-            if (EXCLUDED_STACK_TRACE.matcher(trace[i].getClassName()).matches()) {
-                continue;
-            }
-            simpleTrace.add(trace[i]);
-        }
-
-        e.setStackTrace(
-                simpleTrace.toArray(new StackTraceElement[simpleTrace.size()]));
-    }
-}
diff --git a/src/site/template.vm b/src/site/template.vm
deleted file mode 100644
index 6b7fbee917..0000000000
--- a/src/site/template.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-#*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *#
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <title>$project.name - Redirecting...</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
-    <meta http-equiv="Refresh" content="0;URL=$project.url" />
-  </head>
-  <body>
-    <a href="$project.url">Please click here if not redirected automatically.</a>
-  </body>
-</html>
diff --git a/src/test/java/io/netty/channel/socket/nio/NioDatagramChannelTest.java b/src/test/java/io/netty/channel/socket/nio/NioDatagramChannelTest.java
deleted file mode 100644
index ffb89db37f..0000000000
--- a/src/test/java/io/netty/channel/socket/nio/NioDatagramChannelTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.channel.socket.nio;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.InetSocketAddress;
-import java.util.concurrent.Executors;
-
-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;
-
-/**
- * Tests NIO (UDP) datagrams
- */
-public class NioDatagramChannelTest {
-    private static Channel sc;
-
-    private static InetSocketAddress inetSocketAddress;
-
-    @BeforeClass
-    public static void setupChannel() {
-        final NioDatagramChannelFactory channelFactory = new NioDatagramChannelFactory(
-                Executors.newCachedThreadPool());
-        final ConnectionlessBootstrap sb = new ConnectionlessBootstrap(channelFactory);
-        inetSocketAddress = new InetSocketAddress("localhost", 9999);
-        sc = sb.bind(inetSocketAddress);
-        final SimpleHandler handler = new SimpleHandler();
-        sc.getPipeline().addFirst("handler", handler);
-    }
-
-    @Test
-    public void checkBoundPort() throws Throwable {
-        final InetSocketAddress socketAddress = (InetSocketAddress) sc
-                .getLocalAddress();
-        assertEquals(9999, socketAddress.getPort());
-    }
-
-    @Test
-    public void sendReciveOne() throws Throwable {
-        final String expectedPayload = "some payload";
-        sendRecive(expectedPayload);
-    }
-
-    @Test
-    public void sendReciveMultiple() throws Throwable {
-        final String expectedPayload = "some payload";
-        for (int i = 0; i < 1000; i ++) {
-            sendRecive(expectedPayload);
-        }
-    }
-
-    public void clientBootstrap() {
-        final NioDatagramChannelFactory channelFactory = new NioDatagramChannelFactory(
-                Executors.newCachedThreadPool());
-        final ConnectionlessBootstrap bootstrap = new ConnectionlessBootstrap(channelFactory);
-        bootstrap.getPipeline().addLast("test", new SimpleHandler());
-        bootstrap.setOption("tcpNoDelay", true);
-        bootstrap.setOption("keepAlive", true);
-        InetSocketAddress clientAddress = new InetSocketAddress("localhost",
-                8888);
-        bootstrap.setOption("localAddress", clientAddress);
-
-        ChannelFuture ccf = bootstrap.connect(inetSocketAddress);
-        ccf.awaitUninterruptibly();
-
-        Channel cc = ccf.getChannel();
-        final String payload = "client payload";
-        ChannelFuture write = cc.write(ChannelBuffers.wrappedBuffer(payload
-                .getBytes(), 0, payload.length()));
-        write.awaitUninterruptibly();
-    }
-
-    @AfterClass
-    public static void closeChannel() {
-        if (sc != null) {
-            final ChannelFuture future = sc.close();
-            if (future != null) {
-                future.awaitUninterruptibly();
-            }
-        }
-    }
-
-    private void sendRecive(final String expectedPayload) throws IOException {
-        final UdpClient udpClient = new UdpClient(inetSocketAddress
-                .getAddress(), inetSocketAddress.getPort());
-        final DatagramPacket dp = udpClient.send(expectedPayload.getBytes());
-
-        dp.setData(new byte[expectedPayload.length()]);
-        assertFalse("The payload should have been cleared", expectedPayload
-                .equals(new String(dp.getData())));
-
-        udpClient.receive(dp, 4000);
-
-        assertEquals(expectedPayload, new String(dp.getData()));
-        udpClient.close();
-    }
-
-}
diff --git a/src/test/java/io/netty/channel/socket/nio/SimpleHandler.java b/src/test/java/io/netty/channel/socket/nio/SimpleHandler.java
deleted file mode 100644
index f624921220..0000000000
--- a/src/test/java/io/netty/channel/socket/nio/SimpleHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.channel.socket.nio;
-
-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
- */
-public class SimpleHandler extends SimpleChannelHandler {
-
-    /**
-     * Called when a message is received
-     * 
-     * @param ctx The channel handler context
-     * @param e The message event
-     */
-    @Override
-    public void messageReceived(final ChannelHandlerContext ctx,
-            final MessageEvent e) throws Exception {
-        final ChannelBuffer cb = (ChannelBuffer) e.getMessage();
-        final byte[] actual = new byte[cb.readableBytes()];
-        cb.getBytes(0, actual);
-        //System.out.println("TestHandler payload : " + new String(actual));
-        ctx.sendDownstream(e);
-    }
-}
diff --git a/src/test/java/io/netty/handler/ssl/AbstractSocketSslEchoTest.java b/src/test/java/io/netty/handler/ssl/AbstractSocketSslEchoTest.java
deleted file mode 100644
index 193a8c9f7c..0000000000
--- a/src/test/java/io/netty/handler/ssl/AbstractSocketSslEchoTest.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.handler.ssl;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.Random;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.net.ssl.SSLEngine;
-
-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;
-
-
-/**
- */
-public abstract class AbstractSocketSslEchoTest {
-    static final InternalLogger logger =
-        InternalLoggerFactory.getInstance(AbstractSocketSslEchoTest.class);
-
-    private static final Random random = new Random();
-    static final byte[] data = new byte[1048576];
-
-    private static ExecutorService executor;
-    private static ExecutorService eventExecutor;
-
-    static {
-        random.nextBytes(data);
-    }
-
-    @BeforeClass
-    public static void init() {
-        executor = Executors.newCachedThreadPool();
-        eventExecutor = new OrderedMemoryAwareThreadPoolExecutor(16, 0, 0);
-    }
-
-    @AfterClass
-    public static void destroy() {
-        ExecutorUtil.terminate(executor, eventExecutor);
-    }
-
-    protected abstract ChannelFactory newServerSocketChannelFactory(Executor executor);
-    protected abstract ChannelFactory newClientSocketChannelFactory(Executor executor);
-
-    protected boolean isExecutorRequired() {
-        return false;
-    }
-
-    @Test
-    public void testSslEcho() throws Throwable {
-        ServerBootstrap sb = new ServerBootstrap(newServerSocketChannelFactory(executor));
-        ClientBootstrap cb = new ClientBootstrap(newClientSocketChannelFactory(executor));
-
-        EchoHandler sh = new EchoHandler(true);
-        EchoHandler ch = new EchoHandler(false);
-
-        SSLEngine sse = SecureChatSslContextFactory.getServerContext().createSSLEngine();
-        SSLEngine cse = SecureChatSslContextFactory.getClientContext().createSSLEngine();
-        sse.setUseClientMode(false);
-        cse.setUseClientMode(true);
-
-        // Workaround for blocking I/O transport write-write dead lock.
-        sb.setOption("receiveBufferSize", 1048576);
-        sb.setOption("receiveBufferSize", 1048576);
-
-        sb.getPipeline().addFirst("ssl", new SslHandler(sse));
-        sb.getPipeline().addLast("handler", sh);
-        cb.getPipeline().addFirst("ssl", new SslHandler(cse));
-        cb.getPipeline().addLast("handler", ch);
-
-        if (isExecutorRequired()) {
-            sb.getPipeline().addFirst("executor",new ExecutionHandler(eventExecutor));
-            cb.getPipeline().addFirst("executor",new ExecutionHandler(eventExecutor));
-        }
-
-        Channel sc = sb.bind(new InetSocketAddress(0));
-        int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
-
-        ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
-        ccf.awaitUninterruptibly();
-        if (!ccf.isSuccess()) {
-            logger.error("Connection attempt failed", ccf.getCause());
-            sc.close().awaitUninterruptibly();
-        }
-        assertTrue(ccf.isSuccess());
-
-        Channel cc = ccf.getChannel();
-        ChannelFuture hf = cc.getPipeline().get(SslHandler.class).handshake();
-        hf.awaitUninterruptibly();
-        if (!hf.isSuccess()) {
-            logger.error("Handshake failed", hf.getCause());
-            sh.channel.close().awaitUninterruptibly();
-            ch.channel.close().awaitUninterruptibly();
-            sc.close().awaitUninterruptibly();
-        }
-
-        assertTrue(hf.isSuccess());
-
-        for (int i = 0; i < data.length;) {
-            int length = Math.min(random.nextInt(1024 * 64), data.length - i);
-            cc.write(ChannelBuffers.wrappedBuffer(data, i, length));
-            i += length;
-        }
-
-        while (ch.counter < data.length) {
-            if (sh.exception.get() != null) {
-                break;
-            }
-            if (ch.exception.get() != null) {
-                break;
-            }
-
-            try {
-                Thread.sleep(1);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
-        }
-
-        while (sh.counter < data.length) {
-            if (sh.exception.get() != null) {
-                break;
-            }
-            if (ch.exception.get() != null) {
-                break;
-            }
-
-            try {
-                Thread.sleep(1);
-            } catch (InterruptedException e) {
-                // Ignore.
-            }
-        }
-
-        sh.channel.close().awaitUninterruptibly();
-        ch.channel.close().awaitUninterruptibly();
-        sc.close().awaitUninterruptibly();
-
-        if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {
-            throw sh.exception.get();
-        }
-        if (ch.exception.get() != null && !(ch.exception.get() instanceof IOException)) {
-            throw ch.exception.get();
-        }
-        if (sh.exception.get() != null) {
-            throw sh.exception.get();
-        }
-        if (ch.exception.get() != null) {
-            throw ch.exception.get();
-        }
-    }
-
-    private static class EchoHandler extends SimpleChannelUpstreamHandler {
-        volatile Channel channel;
-        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
-        volatile int counter;
-        private final boolean server;
-
-        EchoHandler(boolean server) {
-            this.server = server;
-        }
-
-        @Override
-        public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e)
-                throws Exception {
-            channel = e.getChannel();
-        }
-
-        @Override
-        public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
-                throws Exception {
-            ChannelBuffer m = (ChannelBuffer) e.getMessage();
-            byte[] actual = new byte[m.readableBytes()];
-            m.getBytes(0, actual);
-
-            int lastIdx = counter;
-            for (int i = 0; i < actual.length; i ++) {
-                assertEquals(data[i + lastIdx], actual[i]);
-            }
-
-            if (channel.getParent() != null) {
-                channel.write(m);
-            }
-
-            counter += actual.length;
-        }
-
-        @Override
-        public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e)
-                throws Exception {
-            logger.warn(
-                    "Unexpected exception from the " +
-                    (server? "server" : "client") + " side", e.getCause());
-
-            exception.compareAndSet(null, e.getCause());
-            e.getChannel().close();
-        }
-    }
-}
diff --git a/src/test/java/io/netty/util/DebugUtilTest.java b/src/test/java/io/netty/util/DebugUtilTest.java
deleted file mode 100644
index b97c6eae71..0000000000
--- a/src/test/java/io/netty/util/DebugUtilTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.util;
-
-import static org.junit.Assert.*;
-
-import java.security.Permission;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-
-/**
- */
-public class DebugUtilTest {
-
-    public void shouldReturnFalseIfPropertyIsNotSet() {
-        assertFalse(DebugUtil.isDebugEnabled());
-    }
-
-    @Test
-    public void shouldReturnTrueInDebugMode() {
-        System.setProperty("io.netty.debug", "true");
-        assertTrue(DebugUtil.isDebugEnabled());
-    }
-
-    @Test
-    public void shouldReturnFalseInNonDebugMode() {
-        System.setProperty("io.netty.debug", "false");
-        assertFalse(DebugUtil.isDebugEnabled());
-    }
-
-    @Test
-    public void shouldNotBombOutWhenSecurityManagerIsInAction() {
-        System.setProperty("io.netty.debug", "true");
-        System.setSecurityManager(new SecurityManager() {
-            @Override
-            public void checkPropertyAccess(String key) {
-                throw new SecurityException();
-            }
-
-            @Override
-            public void checkPermission(Permission perm, Object context) {
-                // Allow
-            }
-
-            @Override
-            public void checkPermission(Permission perm) {
-                // Allow
-            }
-
-        });
-        try {
-            assertFalse(DebugUtil.isDebugEnabled());
-        } finally {
-            System.setSecurityManager(null);
-        }
-    }
-
-    @Before @After
-    public void cleanup() {
-        System.clearProperty("io.netty.debug");
-    }
-}
diff --git a/src/test/java/io/netty/util/internal/StackTraceSimplifierTest.java b/src/test/java/io/netty/util/internal/StackTraceSimplifierTest.java
deleted file mode 100644
index de7eb91181..0000000000
--- a/src/test/java/io/netty/util/internal/StackTraceSimplifierTest.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright 2011 The Netty Project
- *
- * The Netty Project licenses this file to you under the Apache License,
- * version 2.0 (the "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package io.netty.util.internal;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-import io.netty.buffer.ChannelBuffer;
-import io.netty.channel.Channel;
-import io.netty.channel.DefaultChannelPipeline;
-import io.netty.channel.SimpleChannelHandler;
-import org.junit.Test;
-
-
-/**
- */
-public class StackTraceSimplifierTest {
-
-    @Test
-    public void testBasicSimplification() {
-        Exception e = new Exception();
-        e.setStackTrace(new StackTraceElement[] {
-                new StackTraceElement(ChannelBuffer.class.getName(), "a", null, 1),
-                new StackTraceElement("com.example.Foo", "b", null, 1),
-                new StackTraceElement(SimpleChannelHandler.class.getName(), "c", null, 1),
-        });
-
-        StackTraceSimplifier.simplify(e);
-
-        StackTraceElement[] simplified = e.getStackTrace();
-        assertEquals(2, simplified.length);
-        assertEquals(ChannelBuffer.class.getName(), simplified[0].getClassName());
-        assertEquals("com.example.Foo", simplified[1].getClassName());
-    }
-
-    @Test
-    public void testNestedSimplification() {
-        Exception e1 = new Exception();
-        e1.setStackTrace(new StackTraceElement[] {
-                new StackTraceElement(ChannelBuffer.class.getName(), "a", null, 1),
-                new StackTraceElement("com.example.Foo", "b", null, 1),
-                new StackTraceElement(SimpleChannelHandler.class.getName(), "c", null, 1),
-                new StackTraceElement(DefaultChannelPipeline.class.getName(), "d", null, 1),
-        });
-
-        Exception e2 = new Exception(e1);
-        e2.setStackTrace(new StackTraceElement[] {
-                new StackTraceElement(Channel.class.getName(), "a", null, 1),
-                new StackTraceElement("com.example.Bar", "b", null, 1),
-                new StackTraceElement(SimpleChannelHandler.class.getName(), "c", null, 1),
-                new StackTraceElement(DefaultChannelPipeline.class.getName(), "d", null, 1),
-        });
-
-        StackTraceSimplifier.simplify(e2);
-
-        StackTraceElement[] simplified1 = e1.getStackTrace();
-        assertEquals(2, simplified1.length);
-        assertEquals(ChannelBuffer.class.getName(), simplified1[0].getClassName());
-        assertEquals("com.example.Foo", simplified1[1].getClassName());
-
-        StackTraceElement[] simplified2 = e2.getStackTrace();
-        assertEquals(2, simplified2.length);
-        assertEquals(Channel.class.getName(), simplified2[0].getClassName());
-        assertEquals("com.example.Bar", simplified2[1].getClassName());
-    }
-
-    @Test
-    public void testNettyBugDetection() {
-        Exception e = new Exception();
-        e.setStackTrace(new StackTraceElement[] {
-                new StackTraceElement(DefaultChannelPipeline.class.getName(), "a", null, 1),
-                new StackTraceElement(ChannelBuffer.class.getName(), "a", null, 1),
-                new StackTraceElement("com.example.Foo", "b", null, 1),
-                new StackTraceElement(SimpleChannelHandler.class.getName(), "c", null, 1),
-        });
-
-        StackTraceSimplifier.simplify(e);
-
-        StackTraceElement[] simplified = e.getStackTrace();
-        for (StackTraceElement ste: simplified) {
-            System.out.println(ste);
-        }
-        assertEquals(4, simplified.length);
-    }
-
-    @Test
-    public void testEmptyStackTrace() {
-        Exception e = new Exception();
-        e.setStackTrace(new StackTraceElement[0]);
-
-        StackTraceSimplifier.simplify(e);
-        assertEquals(0, e.getStackTrace().length);
-    }
-
-
-    @Test
-    public void testNullStackTrace() {
-        Exception e = createNiceMock(Exception.class);
-        expect(e.getStackTrace()).andReturn(null).anyTimes();
-        replay(e);
-
-        StackTraceSimplifier.simplify(e);
-        assertNull(e.getStackTrace());
-        verify(e);
-    }
-}
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
new file mode 100644
index 0000000000..3b541f4cf0
--- /dev/null
+++ b/testsuite/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-testsuite</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Testsuite</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-handler</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+    </plugins>
+  </build>
+</project>
+
diff --git a/src/test/java/io/netty/bootstrap/AbstractSocketClientBootstrapTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketClientBootstrapTest.java
similarity index 84%
rename from src/test/java/io/netty/bootstrap/AbstractSocketClientBootstrapTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketClientBootstrapTest.java
index fb80aaae2f..a362933930 100644
--- a/src/test/java/io/netty/bootstrap/AbstractSocketClientBootstrapTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketClientBootstrapTest.java
@@ -13,9 +13,8 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.bootstrap;
+package io.netty.testsuite.transport.socket;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
@@ -25,16 +24,19 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.easymock.EasyMock;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import io.netty.bootstrap.ClientBootstrap;
 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.testsuite.util.DummyHandler;
+import io.netty.util.SocketAddresses;
 import io.netty.util.internal.ExecutorUtil;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
 
 
 /**
@@ -83,7 +85,7 @@ public abstract class AbstractSocketClientBootstrapTest {
             bootstrap.setOption(
                     "remoteAddress",
                     new InetSocketAddress(
-                            TestUtil.getLocalHost(),
+                            SocketAddresses.LOCALHOST,
                             serverSocket.socket().getLocalPort()));
 
             ChannelFuture future = bootstrap.connect();
@@ -120,7 +122,7 @@ public abstract class AbstractSocketClientBootstrapTest {
             bootstrap.setOption(
                     "remoteAddress",
                     new InetSocketAddress(
-                            TestUtil.getLocalHost(),
+                            SocketAddresses.LOCALHOST,
                             serverSocket.socket().getLocalPort()));
             bootstrap.setOption("localAddress", new InetSocketAddress(0));
 
@@ -145,29 +147,29 @@ public abstract class AbstractSocketClientBootstrapTest {
 
     @Test(expected = ChannelPipelineException.class)
     public void testFailedPipelineInitialization() throws Exception {
-        ClientBootstrap bootstrap = new ClientBootstrap(createMock(ChannelFactory.class));
-        ChannelPipelineFactory pipelineFactory = createMock(ChannelPipelineFactory.class);
+        ClientBootstrap bootstrap = new ClientBootstrap(EasyMock.createMock(ChannelFactory.class));
+        ChannelPipelineFactory pipelineFactory = EasyMock.createMock(ChannelPipelineFactory.class);
         bootstrap.setPipelineFactory(pipelineFactory);
 
-        expect(pipelineFactory.getPipeline()).andThrow(new ChannelPipelineException());
-        replay(pipelineFactory);
+        EasyMock.expect(pipelineFactory.getPipeline()).andThrow(new ChannelPipelineException());
+        EasyMock.replay(pipelineFactory);
 
-        bootstrap.connect(new InetSocketAddress(TestUtil.getLocalHost(), 1));
+        bootstrap.connect(new InetSocketAddress(SocketAddresses.LOCALHOST, 1));
     }
 
     @Test(expected = IllegalStateException.class)
     public void shouldHaveRemoteAddressOption() {
-        new ClientBootstrap(createMock(ChannelFactory.class)).connect();
+        new ClientBootstrap(EasyMock.createMock(ChannelFactory.class)).connect();
     }
 
 
     @Test(expected = NullPointerException.class)
     public void shouldDisallowNullRemoteAddressParameter1() {
-        new ClientBootstrap(createMock(ChannelFactory.class)).connect(null);
+        new ClientBootstrap(EasyMock.createMock(ChannelFactory.class)).connect(null);
     }
 
     @Test(expected = NullPointerException.class)
     public void shouldDisallowNullRemoteAddressParameter2() {
-        new ClientBootstrap(createMock(ChannelFactory.class)).connect(null, null);
+        new ClientBootstrap(EasyMock.createMock(ChannelFactory.class)).connect(null, null);
     }
 }
diff --git a/src/test/java/io/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketCompatibleObjectStreamEchoTest.java
similarity index 94%
rename from src/test/java/io/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketCompatibleObjectStreamEchoTest.java
index 1d0b24aa46..c0ea5bda83 100644
--- a/src/test/java/io/netty/handler/codec/serialization/AbstractSocketCompatibleObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketCompatibleObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import static org.junit.Assert.*;
 
@@ -35,7 +35,9 @@ 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.handler.codec.serialization.CompatibleObjectDecoder;
+import io.netty.handler.codec.serialization.CompatibleObjectEncoder;
+import io.netty.util.SocketAddresses;
 import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -96,7 +98,7 @@ public abstract class AbstractSocketCompatibleObjectStreamEchoTest {
         Channel sc = sb.bind(new InetSocketAddress(0));
         int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
 
-        ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
+        ChannelFuture ccf = cb.connect(new InetSocketAddress(SocketAddresses.LOCALHOST, port));
         assertTrue(ccf.awaitUninterruptibly().isSuccess());
 
         Channel cc = ccf.getChannel();
diff --git a/src/test/java/io/netty/channel/socket/AbstractSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/channel/socket/AbstractSocketEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketEchoTest.java
index b41e33999c..2259805802 100644
--- a/src/test/java/io/netty/channel/socket/AbstractSocketEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket;
+package io.netty.testsuite.transport.socket;
 
 import static org.junit.Assert.*;
 
@@ -37,7 +37,7 @@ 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.SocketAddresses;
 import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -84,7 +84,7 @@ public abstract class AbstractSocketEchoTest {
         Channel sc = sb.bind(new InetSocketAddress(0));
         int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
 
-        ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
+        ChannelFuture ccf = cb.connect(new InetSocketAddress(SocketAddresses.LOCALHOST, port));
         assertTrue(ccf.awaitUninterruptibly().isSuccess());
 
         Channel cc = ccf.getChannel();
diff --git a/src/test/java/io/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketFixedLengthEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketFixedLengthEchoTest.java
index c9bad3eaee..2c93c10f2d 100644
--- a/src/test/java/io/netty/handler/codec/frame/AbstractSocketFixedLengthEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketFixedLengthEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.frame;
+package io.netty.testsuite.transport.socket;
 
 import static org.junit.Assert.*;
 
@@ -37,7 +37,8 @@ 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.handler.codec.frame.FixedLengthFrameDecoder;
+import io.netty.util.SocketAddresses;
 import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -86,7 +87,7 @@ public abstract class AbstractSocketFixedLengthEchoTest {
         Channel sc = sb.bind(new InetSocketAddress(0));
         int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
 
-        ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
+        ChannelFuture ccf = cb.connect(new InetSocketAddress(SocketAddresses.LOCALHOST, port));
         assertTrue(ccf.awaitUninterruptibly().isSuccess());
 
         Channel cc = ccf.getChannel();
diff --git a/src/test/java/io/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketObjectStreamEchoTest.java
similarity index 95%
rename from src/test/java/io/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketObjectStreamEchoTest.java
index 2051ecea49..8d665b0524 100644
--- a/src/test/java/io/netty/handler/codec/serialization/AbstractSocketObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import static org.junit.Assert.*;
 
@@ -35,7 +35,9 @@ 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.handler.codec.serialization.ObjectDecoder;
+import io.netty.handler.codec.serialization.ObjectEncoder;
+import io.netty.util.SocketAddresses;
 import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -95,7 +97,7 @@ public abstract class AbstractSocketObjectStreamEchoTest {
         Channel sc = sb.bind(new InetSocketAddress(0));
         int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
 
-        ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
+        ChannelFuture ccf = cb.connect(new InetSocketAddress(SocketAddresses.LOCALHOST, port));
         assertTrue(ccf.awaitUninterruptibly().isSuccess());
 
         Channel cc = ccf.getChannel();
diff --git a/src/test/java/io/netty/bootstrap/AbstractSocketServerBootstrapTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketServerBootstrapTest.java
similarity index 88%
rename from src/test/java/io/netty/bootstrap/AbstractSocketServerBootstrapTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketServerBootstrapTest.java
index 15edd45227..63438d2be7 100644
--- a/src/test/java/io/netty/bootstrap/AbstractSocketServerBootstrapTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketServerBootstrapTest.java
@@ -13,9 +13,8 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.bootstrap;
+package io.netty.testsuite.transport.socket;
 
-import static org.easymock.EasyMock.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;
@@ -26,6 +25,8 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import io.netty.bootstrap.ClientBootstrap;
+import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelFactory;
@@ -36,9 +37,11 @@ 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.testsuite.util.DummyHandler;
+import io.netty.util.SocketAddresses;
 import io.netty.util.internal.ExecutorUtil;
+
+import org.easymock.EasyMock;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -127,7 +130,7 @@ public abstract class AbstractSocketServerBootstrapTest {
         Socket socket = null;
         try {
             socket = new Socket(
-                    TestUtil.getLocalHost(),
+                    SocketAddresses.LOCALHOST,
                     ((InetSocketAddress) channel.getLocalAddress()).getPort());
 
             // Wait until the connection is open in the server side.
@@ -176,25 +179,25 @@ public abstract class AbstractSocketServerBootstrapTest {
 
     @Test(expected = ChannelPipelineException.class)
     public void testFailedPipelineInitialization() throws Exception {
-        ClientBootstrap bootstrap = new ClientBootstrap(createMock(ChannelFactory.class));
-        ChannelPipelineFactory pipelineFactory = createMock(ChannelPipelineFactory.class);
+        ClientBootstrap bootstrap = new ClientBootstrap(EasyMock.createMock(ChannelFactory.class));
+        ChannelPipelineFactory pipelineFactory = EasyMock.createMock(ChannelPipelineFactory.class);
         bootstrap.setPipelineFactory(pipelineFactory);
 
-        expect(pipelineFactory.getPipeline()).andThrow(new ChannelPipelineException());
-        replay(pipelineFactory);
+        EasyMock.expect(pipelineFactory.getPipeline()).andThrow(new ChannelPipelineException());
+        EasyMock.replay(pipelineFactory);
 
-        bootstrap.connect(new InetSocketAddress(TestUtil.getLocalHost(), 1));
+        bootstrap.connect(new InetSocketAddress(SocketAddresses.LOCALHOST, 1));
     }
 
     @Test(expected = IllegalStateException.class)
     public void shouldHaveLocalAddressOption() {
-        new ServerBootstrap(createMock(ServerChannelFactory.class)).bind();
+        new ServerBootstrap(EasyMock.createMock(ServerChannelFactory.class)).bind();
     }
 
 
     @Test(expected = NullPointerException.class)
     public void shouldDisallowNullLocalAddressParameter() {
-        new ServerBootstrap(createMock(ServerChannelFactory.class)).bind(null);
+        new ServerBootstrap(EasyMock.createMock(ServerChannelFactory.class)).bind(null);
     }
 
     private static class ParentChannelHandler extends SimpleChannelUpstreamHandler {
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketSslEchoTest.java
new file mode 100644
index 0000000000..08b5d35ce7
--- /dev/null
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketSslEchoTest.java
@@ -0,0 +1,652 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.netty.testsuite.transport.socket;
+
+import static org.junit.Assert.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetSocketAddress;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.Security;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.Random;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.ManagerFactoryParameters;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactorySpi;
+import javax.net.ssl.X509TrustManager;
+
+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.handler.execution.ExecutionHandler;
+import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
+import io.netty.handler.ssl.SslHandler;
+import io.netty.logging.InternalLogger;
+import io.netty.logging.InternalLoggerFactory;
+import io.netty.util.SocketAddresses;
+import io.netty.util.internal.ExecutorUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+
+/**
+ */
+public abstract class AbstractSocketSslEchoTest {
+    static final InternalLogger logger =
+        InternalLoggerFactory.getInstance(AbstractSocketSslEchoTest.class);
+
+    private static final Random random = new Random();
+    static final byte[] data = new byte[1048576];
+
+    private static ExecutorService executor;
+    private static ExecutorService eventExecutor;
+
+    static {
+        random.nextBytes(data);
+    }
+
+    @BeforeClass
+    public static void init() {
+        executor = Executors.newCachedThreadPool();
+        eventExecutor = new OrderedMemoryAwareThreadPoolExecutor(16, 0, 0);
+    }
+
+    @AfterClass
+    public static void destroy() {
+        ExecutorUtil.terminate(executor, eventExecutor);
+    }
+
+    protected abstract ChannelFactory newServerSocketChannelFactory(Executor executor);
+    protected abstract ChannelFactory newClientSocketChannelFactory(Executor executor);
+
+    protected boolean isExecutorRequired() {
+        return false;
+    }
+
+    @Test
+    public void testSslEcho() throws Throwable {
+        ServerBootstrap sb = new ServerBootstrap(newServerSocketChannelFactory(executor));
+        ClientBootstrap cb = new ClientBootstrap(newClientSocketChannelFactory(executor));
+
+        EchoHandler sh = new EchoHandler(true);
+        EchoHandler ch = new EchoHandler(false);
+
+        SSLEngine sse = BogusSslContextFactory.getServerContext().createSSLEngine();
+        SSLEngine cse = BogusSslContextFactory.getClientContext().createSSLEngine();
+        sse.setUseClientMode(false);
+        cse.setUseClientMode(true);
+
+        // Workaround for blocking I/O transport write-write dead lock.
+        sb.setOption("receiveBufferSize", 1048576);
+        sb.setOption("receiveBufferSize", 1048576);
+
+        sb.getPipeline().addFirst("ssl", new SslHandler(sse));
+        sb.getPipeline().addLast("handler", sh);
+        cb.getPipeline().addFirst("ssl", new SslHandler(cse));
+        cb.getPipeline().addLast("handler", ch);
+
+        if (isExecutorRequired()) {
+            sb.getPipeline().addFirst("executor",new ExecutionHandler(eventExecutor));
+            cb.getPipeline().addFirst("executor",new ExecutionHandler(eventExecutor));
+        }
+
+        Channel sc = sb.bind(new InetSocketAddress(0));
+        int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
+
+        ChannelFuture ccf = cb.connect(new InetSocketAddress(SocketAddresses.LOCALHOST, port));
+        ccf.awaitUninterruptibly();
+        if (!ccf.isSuccess()) {
+            logger.error("Connection attempt failed", ccf.getCause());
+            sc.close().awaitUninterruptibly();
+        }
+        assertTrue(ccf.isSuccess());
+
+        Channel cc = ccf.getChannel();
+        ChannelFuture hf = cc.getPipeline().get(SslHandler.class).handshake();
+        hf.awaitUninterruptibly();
+        if (!hf.isSuccess()) {
+            logger.error("Handshake failed", hf.getCause());
+            sh.channel.close().awaitUninterruptibly();
+            ch.channel.close().awaitUninterruptibly();
+            sc.close().awaitUninterruptibly();
+        }
+
+        assertTrue(hf.isSuccess());
+
+        for (int i = 0; i < data.length;) {
+            int length = Math.min(random.nextInt(1024 * 64), data.length - i);
+            cc.write(ChannelBuffers.wrappedBuffer(data, i, length));
+            i += length;
+        }
+
+        while (ch.counter < data.length) {
+            if (sh.exception.get() != null) {
+                break;
+            }
+            if (ch.exception.get() != null) {
+                break;
+            }
+
+            try {
+                Thread.sleep(1);
+            } catch (InterruptedException e) {
+                // Ignore.
+            }
+        }
+
+        while (sh.counter < data.length) {
+            if (sh.exception.get() != null) {
+                break;
+            }
+            if (ch.exception.get() != null) {
+                break;
+            }
+
+            try {
+                Thread.sleep(1);
+            } catch (InterruptedException e) {
+                // Ignore.
+            }
+        }
+
+        sh.channel.close().awaitUninterruptibly();
+        ch.channel.close().awaitUninterruptibly();
+        sc.close().awaitUninterruptibly();
+
+        if (sh.exception.get() != null && !(sh.exception.get() instanceof IOException)) {
+            throw sh.exception.get();
+        }
+        if (ch.exception.get() != null && !(ch.exception.get() instanceof IOException)) {
+            throw ch.exception.get();
+        }
+        if (sh.exception.get() != null) {
+            throw sh.exception.get();
+        }
+        if (ch.exception.get() != null) {
+            throw ch.exception.get();
+        }
+    }
+
+    private static class EchoHandler extends SimpleChannelUpstreamHandler {
+        volatile Channel channel;
+        final AtomicReference<Throwable> exception = new AtomicReference<Throwable>();
+        volatile int counter;
+        private final boolean server;
+
+        EchoHandler(boolean server) {
+            this.server = server;
+        }
+
+        @Override
+        public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e)
+                throws Exception {
+            channel = e.getChannel();
+        }
+
+        @Override
+        public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
+                throws Exception {
+            ChannelBuffer m = (ChannelBuffer) e.getMessage();
+            byte[] actual = new byte[m.readableBytes()];
+            m.getBytes(0, actual);
+
+            int lastIdx = counter;
+            for (int i = 0; i < actual.length; i ++) {
+                assertEquals(data[i + lastIdx], actual[i]);
+            }
+
+            if (channel.getParent() != null) {
+                channel.write(m);
+            }
+
+            counter += actual.length;
+        }
+
+        @Override
+        public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e)
+                throws Exception {
+            logger.warn(
+                    "Unexpected exception from the " +
+                    (server? "server" : "client") + " side", e.getCause());
+
+            exception.compareAndSet(null, e.getCause());
+            e.getChannel().close();
+        }
+    }
+
+    private static class BogusSslContextFactory {
+
+        private static final String PROTOCOL = "TLS";
+        private static final SSLContext SERVER_CONTEXT;
+        private static final SSLContext CLIENT_CONTEXT;
+
+        static {
+            String algorithm = Security.getProperty("ssl.KeyManagerFactory.algorithm");
+            if (algorithm == null) {
+                algorithm = "SunX509";
+            }
+
+            SSLContext serverContext = null;
+            SSLContext clientContext = null;
+            try {
+                KeyStore ks = KeyStore.getInstance("JKS");
+                ks.load(BogusKeyStore.asInputStream(),
+                        BogusKeyStore.getKeyStorePassword());
+
+                // Set up key manager factory to use our key store
+                KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
+                kmf.init(ks, BogusKeyStore.getCertificatePassword());
+
+                // Initialize the SSLContext to work with our key managers.
+                serverContext = SSLContext.getInstance(PROTOCOL);
+                serverContext.init(kmf.getKeyManagers(), null, null);
+            } catch (Exception e) {
+                throw new Error(
+                        "Failed to initialize the server-side SSLContext", e);
+            }
+
+            try {
+                clientContext = SSLContext.getInstance(PROTOCOL);
+                clientContext.init(null, BogusTrustManagerFactory.getTrustManagers(), null);
+            } catch (Exception e) {
+                throw new Error(
+                        "Failed to initialize the client-side SSLContext", e);
+            }
+
+            SERVER_CONTEXT = serverContext;
+            CLIENT_CONTEXT = clientContext;
+        }
+
+        public static SSLContext getServerContext() {
+            return SERVER_CONTEXT;
+        }
+
+        public static SSLContext getClientContext() {
+            return CLIENT_CONTEXT;
+        }
+    }
+
+    /**
+     * Bogus {@link javax.net.ssl.TrustManagerFactorySpi} which accepts any certificate
+     * even if it is invalid.
+     */
+    private static class BogusTrustManagerFactory extends TrustManagerFactorySpi {
+
+        private static final TrustManager DUMMY_TRUST_MANAGER = new X509TrustManager() {
+            @Override
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[0];
+            }
+
+            @Override
+            public void checkClientTrusted(
+                    X509Certificate[] chain, String authType) throws CertificateException {
+                // Always trust - it is an example.
+                // You should do something in the real world.
+                // You will reach here only if you enabled client certificate auth,
+                // as described in SecureChatSslContextFactory.
+                System.err.println(
+                        "UNKNOWN CLIENT CERTIFICATE: " + chain[0].getSubjectDN());
+            }
+
+            @Override
+            public void checkServerTrusted(
+                    X509Certificate[] chain, String authType) throws CertificateException {
+                // Always trust - it is an example.
+                // You should do something in the real world.
+                System.err.println(
+                        "UNKNOWN SERVER CERTIFICATE: " + chain[0].getSubjectDN());
+            }
+        };
+
+        public static TrustManager[] getTrustManagers() {
+            return new TrustManager[] { DUMMY_TRUST_MANAGER };
+        }
+
+        @Override
+        protected TrustManager[] engineGetTrustManagers() {
+            return getTrustManagers();
+        }
+
+        @Override
+        protected void engineInit(KeyStore keystore) throws KeyStoreException {
+            // Unused
+        }
+
+        @Override
+        protected void engineInit(ManagerFactoryParameters managerFactoryParameters)
+                throws InvalidAlgorithmParameterException {
+            // Unused
+        }
+    }
+
+    /**
+     * A bogus key store which provides all the required information to
+     * create an example SSL connection.
+     *
+     * To generate a bogus key store:
+     * <pre>
+     * keytool  -genkey -alias bogus -keysize 2048 -validity 36500
+     *          -keyalg RSA -dname "CN=bogus"
+     *          -keypass secret -storepass secret
+     *          -keystore cert.jks
+     * </pre>
+     */
+    private static class BogusKeyStore {
+        private static final short[] DATA = {
+            0xfe, 0xed, 0xfe, 0xed, 0x00, 0x00, 0x00, 0x02,
+            0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01,
+            0x00, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c,
+            0x65, 0x00, 0x00, 0x01, 0x1a, 0x9f, 0x57, 0xa5,
+            0x27, 0x00, 0x00, 0x01, 0x9a, 0x30, 0x82, 0x01,
+            0x96, 0x30, 0x0e, 0x06, 0x0a, 0x2b, 0x06, 0x01,
+            0x04, 0x01, 0x2a, 0x02, 0x11, 0x01, 0x01, 0x05,
+            0x00, 0x04, 0x82, 0x01, 0x82, 0x48, 0x6d, 0xcf,
+            0x16, 0xb5, 0x50, 0x95, 0x36, 0xbf, 0x47, 0x27,
+            0x50, 0x58, 0x0d, 0xa2, 0x52, 0x7e, 0x25, 0xab,
+            0x14, 0x1a, 0x26, 0x5e, 0x2d, 0x8a, 0x23, 0x90,
+            0x60, 0x7f, 0x12, 0x20, 0x56, 0xd1, 0x43, 0xa2,
+            0x6b, 0x47, 0x5d, 0xed, 0x9d, 0xd4, 0xe5, 0x83,
+            0x28, 0x89, 0xc2, 0x16, 0x4c, 0x76, 0x06, 0xad,
+            0x8e, 0x8c, 0x29, 0x1a, 0x9b, 0x0f, 0xdd, 0x60,
+            0x4b, 0xb4, 0x62, 0x82, 0x9e, 0x4a, 0x63, 0x83,
+            0x2e, 0xd2, 0x43, 0x78, 0xc2, 0x32, 0x1f, 0x60,
+            0xa9, 0x8a, 0x7f, 0x0f, 0x7c, 0xa6, 0x1d, 0xe6,
+            0x92, 0x9e, 0x52, 0xc7, 0x7d, 0xbb, 0x35, 0x3b,
+            0xaa, 0x89, 0x73, 0x4c, 0xfb, 0x99, 0x54, 0x97,
+            0x99, 0x28, 0x6e, 0x66, 0x5b, 0xf7, 0x9b, 0x7e,
+            0x6d, 0x8a, 0x2f, 0xfa, 0xc3, 0x1e, 0x71, 0xb9,
+            0xbd, 0x8f, 0xc5, 0x63, 0x25, 0x31, 0x20, 0x02,
+            0xff, 0x02, 0xf0, 0xc9, 0x2c, 0xdd, 0x3a, 0x10,
+            0x30, 0xab, 0xe5, 0xad, 0x3d, 0x1a, 0x82, 0x77,
+            0x46, 0xed, 0x03, 0x38, 0xa4, 0x73, 0x6d, 0x36,
+            0x36, 0x33, 0x70, 0xb2, 0x63, 0x20, 0xca, 0x03,
+            0xbf, 0x5a, 0xf4, 0x7c, 0x35, 0xf0, 0x63, 0x1a,
+            0x12, 0x33, 0x12, 0x58, 0xd9, 0xa2, 0x63, 0x6b,
+            0x63, 0x82, 0x41, 0x65, 0x70, 0x37, 0x4b, 0x99,
+            0x04, 0x9f, 0xdd, 0x5e, 0x07, 0x01, 0x95, 0x9f,
+            0x36, 0xe8, 0xc3, 0x66, 0x2a, 0x21, 0x69, 0x68,
+            0x40, 0xe6, 0xbc, 0xbb, 0x85, 0x81, 0x21, 0x13,
+            0xe6, 0xa4, 0xcf, 0xd3, 0x67, 0xe3, 0xfd, 0x75,
+            0xf0, 0xdf, 0x83, 0xe0, 0xc5, 0x36, 0x09, 0xac,
+            0x1b, 0xd4, 0xf7, 0x2a, 0x23, 0x57, 0x1c, 0x5c,
+            0x0f, 0xf4, 0xcf, 0xa2, 0xcf, 0xf5, 0xbd, 0x9c,
+            0x69, 0x98, 0x78, 0x3a, 0x25, 0xe4, 0xfd, 0x85,
+            0x11, 0xcc, 0x7d, 0xef, 0xeb, 0x74, 0x60, 0xb1,
+            0xb7, 0xfb, 0x1f, 0x0e, 0x62, 0xff, 0xfe, 0x09,
+            0x0a, 0xc3, 0x80, 0x2f, 0x10, 0x49, 0x89, 0x78,
+            0xd2, 0x08, 0xfa, 0x89, 0x22, 0x45, 0x91, 0x21,
+            0xbc, 0x90, 0x3e, 0xad, 0xb3, 0x0a, 0xb4, 0x0e,
+            0x1c, 0xa1, 0x93, 0x92, 0xd8, 0x72, 0x07, 0x54,
+            0x60, 0xe7, 0x91, 0xfc, 0xd9, 0x3c, 0xe1, 0x6f,
+            0x08, 0xe4, 0x56, 0xf6, 0x0b, 0xb0, 0x3c, 0x39,
+            0x8a, 0x2d, 0x48, 0x44, 0x28, 0x13, 0xca, 0xe9,
+            0xf7, 0xa3, 0xb6, 0x8a, 0x5f, 0x31, 0xa9, 0x72,
+            0xf2, 0xde, 0x96, 0xf2, 0xb1, 0x53, 0xb1, 0x3e,
+            0x24, 0x57, 0xfd, 0x18, 0x45, 0x1f, 0xc5, 0x33,
+            0x1b, 0xa4, 0xe8, 0x21, 0xfa, 0x0e, 0xb2, 0xb9,
+            0xcb, 0xc7, 0x07, 0x41, 0xdd, 0x2f, 0xb6, 0x6a,
+            0x23, 0x18, 0xed, 0xc1, 0xef, 0xe2, 0x4b, 0xec,
+            0xc9, 0xba, 0xfb, 0x46, 0x43, 0x90, 0xd7, 0xb5,
+            0x68, 0x28, 0x31, 0x2b, 0x8d, 0xa8, 0x51, 0x63,
+            0xf7, 0x53, 0x99, 0x19, 0x68, 0x85, 0x66, 0x00,
+            0x00, 0x00, 0x01, 0x00, 0x05, 0x58, 0x2e, 0x35,
+            0x30, 0x39, 0x00, 0x00, 0x02, 0x3a, 0x30, 0x82,
+            0x02, 0x36, 0x30, 0x82, 0x01, 0xe0, 0xa0, 0x03,
+            0x02, 0x01, 0x02, 0x02, 0x04, 0x48, 0x59, 0xf1,
+            0x92, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48,
+            0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00,
+            0x30, 0x81, 0xa0, 0x31, 0x0b, 0x30, 0x09, 0x06,
+            0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x4b, 0x52,
+            0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04,
+            0x08, 0x13, 0x0a, 0x4b, 0x79, 0x75, 0x6e, 0x67,
+            0x67, 0x69, 0x2d, 0x64, 0x6f, 0x31, 0x14, 0x30,
+            0x12, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13, 0x0b,
+            0x53, 0x65, 0x6f, 0x6e, 0x67, 0x6e, 0x61, 0x6d,
+            0x2d, 0x73, 0x69, 0x31, 0x1a, 0x30, 0x18, 0x06,
+            0x03, 0x55, 0x04, 0x0a, 0x13, 0x11, 0x54, 0x68,
+            0x65, 0x20, 0x4e, 0x65, 0x74, 0x74, 0x79, 0x20,
+            0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x31,
+            0x18, 0x30, 0x16, 0x06, 0x03, 0x55, 0x04, 0x0b,
+            0x13, 0x0f, 0x45, 0x78, 0x61, 0x6d, 0x70, 0x6c,
+            0x65, 0x20, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72,
+            0x73, 0x31, 0x30, 0x30, 0x2e, 0x06, 0x03, 0x55,
+            0x04, 0x03, 0x13, 0x27, 0x73, 0x65, 0x63, 0x75,
+            0x72, 0x65, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x65,
+            0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x6e,
+            0x65, 0x74, 0x74, 0x79, 0x2e, 0x67, 0x6c, 0x65,
+            0x61, 0x6d, 0x79, 0x6e, 0x6f, 0x64, 0x65, 0x2e,
+            0x6e, 0x65, 0x74, 0x30, 0x20, 0x17, 0x0d, 0x30,
+            0x38, 0x30, 0x36, 0x31, 0x39, 0x30, 0x35, 0x34,
+            0x31, 0x33, 0x38, 0x5a, 0x18, 0x0f, 0x32, 0x31,
+            0x38, 0x37, 0x31, 0x31, 0x32, 0x34, 0x30, 0x35,
+            0x34, 0x31, 0x33, 0x38, 0x5a, 0x30, 0x81, 0xa0,
+            0x31, 0x0b, 0x30, 0x09, 0x06, 0x03, 0x55, 0x04,
+            0x06, 0x13, 0x02, 0x4b, 0x52, 0x31, 0x13, 0x30,
+            0x11, 0x06, 0x03, 0x55, 0x04, 0x08, 0x13, 0x0a,
+            0x4b, 0x79, 0x75, 0x6e, 0x67, 0x67, 0x69, 0x2d,
+            0x64, 0x6f, 0x31, 0x14, 0x30, 0x12, 0x06, 0x03,
+            0x55, 0x04, 0x07, 0x13, 0x0b, 0x53, 0x65, 0x6f,
+            0x6e, 0x67, 0x6e, 0x61, 0x6d, 0x2d, 0x73, 0x69,
+            0x31, 0x1a, 0x30, 0x18, 0x06, 0x03, 0x55, 0x04,
+            0x0a, 0x13, 0x11, 0x54, 0x68, 0x65, 0x20, 0x4e,
+            0x65, 0x74, 0x74, 0x79, 0x20, 0x50, 0x72, 0x6f,
+            0x6a, 0x65, 0x63, 0x74, 0x31, 0x18, 0x30, 0x16,
+            0x06, 0x03, 0x55, 0x04, 0x0b, 0x13, 0x0f, 0x45,
+            0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x20, 0x41,
+            0x75, 0x74, 0x68, 0x6f, 0x72, 0x73, 0x31, 0x30,
+            0x30, 0x2e, 0x06, 0x03, 0x55, 0x04, 0x03, 0x13,
+            0x27, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65, 0x63,
+            0x68, 0x61, 0x74, 0x2e, 0x65, 0x78, 0x61, 0x6d,
+            0x70, 0x6c, 0x65, 0x2e, 0x6e, 0x65, 0x74, 0x74,
+            0x79, 0x2e, 0x67, 0x6c, 0x65, 0x61, 0x6d, 0x79,
+            0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6e, 0x65, 0x74,
+            0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
+            0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
+            0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41,
+            0x00, 0xc3, 0xe3, 0x5e, 0x41, 0xa7, 0x87, 0x11,
+            0x00, 0x42, 0x2a, 0xb0, 0x4b, 0xed, 0xb2, 0xe0,
+            0x23, 0xdb, 0xb1, 0x3d, 0x58, 0x97, 0x35, 0x60,
+            0x0b, 0x82, 0x59, 0xd3, 0x00, 0xea, 0xd4, 0x61,
+            0xb8, 0x79, 0x3f, 0xb6, 0x3c, 0x12, 0x05, 0x93,
+            0x2e, 0x9a, 0x59, 0x68, 0x14, 0x77, 0x3a, 0xc8,
+            0x50, 0x25, 0x57, 0xa4, 0x49, 0x18, 0x63, 0x41,
+            0xf0, 0x2d, 0x28, 0xec, 0x06, 0xfb, 0xb4, 0x9f,
+            0xbf, 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, 0x0d,
+            0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
+            0x01, 0x01, 0x05, 0x05, 0x00, 0x03, 0x41, 0x00,
+            0x65, 0x6c, 0x30, 0x01, 0xc2, 0x8e, 0x3e, 0xcb,
+            0xb3, 0x77, 0x48, 0xe9, 0x66, 0x61, 0x9a, 0x40,
+            0x86, 0xaf, 0xf6, 0x03, 0xeb, 0xba, 0x6a, 0xf2,
+            0xfd, 0xe2, 0xaf, 0x36, 0x5e, 0x7b, 0xaa, 0x22,
+            0x04, 0xdd, 0x2c, 0x20, 0xc4, 0xfc, 0xdd, 0xd0,
+            0x82, 0x20, 0x1c, 0x3d, 0xd7, 0x9e, 0x5e, 0x5c,
+            0x92, 0x5a, 0x76, 0x71, 0x28, 0xf5, 0x07, 0x7d,
+            0xa2, 0x81, 0xba, 0x77, 0x9f, 0x2a, 0xd9, 0x44,
+            0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x6d, 0x79,
+            0x6b, 0x65, 0x79, 0x00, 0x00, 0x01, 0x1a, 0x9f,
+            0x5b, 0x56, 0xa0, 0x00, 0x00, 0x01, 0x99, 0x30,
+            0x82, 0x01, 0x95, 0x30, 0x0e, 0x06, 0x0a, 0x2b,
+            0x06, 0x01, 0x04, 0x01, 0x2a, 0x02, 0x11, 0x01,
+            0x01, 0x05, 0x00, 0x04, 0x82, 0x01, 0x81, 0x29,
+            0xa8, 0xb6, 0x08, 0x0c, 0x85, 0x75, 0x3e, 0xdd,
+            0xb5, 0xe5, 0x1a, 0x87, 0x68, 0xd1, 0x90, 0x4b,
+            0x29, 0x31, 0xee, 0x90, 0xbc, 0x9d, 0x73, 0xa0,
+            0x3f, 0xe9, 0x0b, 0xa4, 0xef, 0x30, 0x9b, 0x36,
+            0x9a, 0xb2, 0x54, 0x77, 0x81, 0x07, 0x4b, 0xaa,
+            0xa5, 0x77, 0x98, 0xe1, 0xeb, 0xb5, 0x7c, 0x4e,
+            0x48, 0xd5, 0x08, 0xfc, 0x2c, 0x36, 0xe2, 0x65,
+            0x03, 0xac, 0xe5, 0xf3, 0x96, 0xb7, 0xd0, 0xb5,
+            0x3b, 0x92, 0xe4, 0x14, 0x05, 0x7a, 0x6a, 0x92,
+            0x56, 0xfe, 0x4e, 0xab, 0xd3, 0x0e, 0x32, 0x04,
+            0x22, 0x22, 0x74, 0x47, 0x7d, 0xec, 0x21, 0x99,
+            0x30, 0x31, 0x64, 0x46, 0x64, 0x9b, 0xc7, 0x13,
+            0xbf, 0xbe, 0xd0, 0x31, 0x49, 0xe7, 0x3c, 0xbf,
+            0xba, 0xb1, 0x20, 0xf9, 0x42, 0xf4, 0xa9, 0xa9,
+            0xe5, 0x13, 0x65, 0x32, 0xbf, 0x7c, 0xcc, 0x91,
+            0xd3, 0xfd, 0x24, 0x47, 0x0b, 0xe5, 0x53, 0xad,
+            0x50, 0x30, 0x56, 0xd1, 0xfa, 0x9c, 0x37, 0xa8,
+            0xc1, 0xce, 0xf6, 0x0b, 0x18, 0xaa, 0x7c, 0xab,
+            0xbd, 0x1f, 0xdf, 0xe4, 0x80, 0xb8, 0xa7, 0xe0,
+            0xad, 0x7d, 0x50, 0x74, 0xf1, 0x98, 0x78, 0xbc,
+            0x58, 0xb9, 0xc2, 0x52, 0xbe, 0xd2, 0x5b, 0x81,
+            0x94, 0x83, 0x8f, 0xb9, 0x4c, 0xee, 0x01, 0x2b,
+            0x5e, 0xc9, 0x6e, 0x9b, 0xf5, 0x63, 0x69, 0xe4,
+            0xd8, 0x0b, 0x47, 0xd8, 0xfd, 0xd8, 0xe0, 0xed,
+            0xa8, 0x27, 0x03, 0x74, 0x1e, 0x5d, 0x32, 0xe6,
+            0x5c, 0x63, 0xc2, 0xfb, 0x3f, 0xee, 0xb4, 0x13,
+            0xc6, 0x0e, 0x6e, 0x74, 0xe0, 0x22, 0xac, 0xce,
+            0x79, 0xf9, 0x43, 0x68, 0xc1, 0x03, 0x74, 0x2b,
+            0xe1, 0x18, 0xf8, 0x7f, 0x76, 0x9a, 0xea, 0x82,
+            0x3f, 0xc2, 0xa6, 0xa7, 0x4c, 0xfe, 0xae, 0x29,
+            0x3b, 0xc1, 0x10, 0x7c, 0xd5, 0x77, 0x17, 0x79,
+            0x5f, 0xcb, 0xad, 0x1f, 0xd8, 0xa1, 0xfd, 0x90,
+            0xe1, 0x6b, 0xb2, 0xef, 0xb9, 0x41, 0x26, 0xa4,
+            0x0b, 0x4f, 0xc6, 0x83, 0x05, 0x6f, 0xf0, 0x64,
+            0x40, 0xe1, 0x44, 0xc4, 0xf9, 0x40, 0x2b, 0x3b,
+            0x40, 0xdb, 0xaf, 0x35, 0xa4, 0x9b, 0x9f, 0xc4,
+            0x74, 0x07, 0xe5, 0x18, 0x60, 0xc5, 0xfe, 0x15,
+            0x0e, 0x3a, 0x25, 0x2a, 0x11, 0xee, 0x78, 0x2f,
+            0xb8, 0xd1, 0x6e, 0x4e, 0x3c, 0x0a, 0xb5, 0xb9,
+            0x40, 0x86, 0x27, 0x6d, 0x8f, 0x53, 0xb7, 0x77,
+            0x36, 0xec, 0x5d, 0xed, 0x32, 0x40, 0x43, 0x82,
+            0xc3, 0x52, 0x58, 0xc4, 0x26, 0x39, 0xf3, 0xb3,
+            0xad, 0x58, 0xab, 0xb7, 0xf7, 0x8e, 0x0e, 0xba,
+            0x8e, 0x78, 0x9d, 0xbf, 0x58, 0x34, 0xbd, 0x77,
+            0x73, 0xa6, 0x50, 0x55, 0x00, 0x60, 0x26, 0xbf,
+            0x6d, 0xb4, 0x98, 0x8a, 0x18, 0x83, 0x89, 0xf8,
+            0xcd, 0x0d, 0x49, 0x06, 0xae, 0x51, 0x6e, 0xaf,
+            0xbd, 0xe2, 0x07, 0x13, 0xd8, 0x64, 0xcc, 0xbf,
+            0x00, 0x00, 0x00, 0x01, 0x00, 0x05, 0x58, 0x2e,
+            0x35, 0x30, 0x39, 0x00, 0x00, 0x02, 0x34, 0x30,
+            0x82, 0x02, 0x30, 0x30, 0x82, 0x01, 0xda, 0xa0,
+            0x03, 0x02, 0x01, 0x02, 0x02, 0x04, 0x48, 0x59,
+            0xf2, 0x84, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
+            0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05,
+            0x00, 0x30, 0x81, 0x9d, 0x31, 0x0b, 0x30, 0x09,
+            0x06, 0x03, 0x55, 0x04, 0x06, 0x13, 0x02, 0x4b,
+            0x52, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55,
+            0x04, 0x08, 0x13, 0x0a, 0x4b, 0x79, 0x75, 0x6e,
+            0x67, 0x67, 0x69, 0x2d, 0x64, 0x6f, 0x31, 0x14,
+            0x30, 0x12, 0x06, 0x03, 0x55, 0x04, 0x07, 0x13,
+            0x0b, 0x53, 0x65, 0x6f, 0x6e, 0x67, 0x6e, 0x61,
+            0x6d, 0x2d, 0x73, 0x69, 0x31, 0x1a, 0x30, 0x18,
+            0x06, 0x03, 0x55, 0x04, 0x0a, 0x13, 0x11, 0x54,
+            0x68, 0x65, 0x20, 0x4e, 0x65, 0x74, 0x74, 0x79,
+            0x20, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74,
+            0x31, 0x15, 0x30, 0x13, 0x06, 0x03, 0x55, 0x04,
+            0x0b, 0x13, 0x0c, 0x43, 0x6f, 0x6e, 0x74, 0x72,
+            0x69, 0x62, 0x75, 0x74, 0x6f, 0x72, 0x73, 0x31,
+            0x30, 0x30, 0x2e, 0x06, 0x03, 0x55, 0x04, 0x03,
+            0x13, 0x27, 0x73, 0x65, 0x63, 0x75, 0x72, 0x65,
+            0x63, 0x68, 0x61, 0x74, 0x2e, 0x65, 0x78, 0x61,
+            0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x6e, 0x65, 0x74,
+            0x74, 0x79, 0x2e, 0x67, 0x6c, 0x65, 0x61, 0x6d,
+            0x79, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x6e, 0x65,
+            0x74, 0x30, 0x20, 0x17, 0x0d, 0x30, 0x38, 0x30,
+            0x36, 0x31, 0x39, 0x30, 0x35, 0x34, 0x35, 0x34,
+            0x30, 0x5a, 0x18, 0x0f, 0x32, 0x31, 0x38, 0x37,
+            0x31, 0x31, 0x32, 0x33, 0x30, 0x35, 0x34, 0x35,
+            0x34, 0x30, 0x5a, 0x30, 0x81, 0x9d, 0x31, 0x0b,
+            0x30, 0x09, 0x06, 0x03, 0x55, 0x04, 0x06, 0x13,
+            0x02, 0x4b, 0x52, 0x31, 0x13, 0x30, 0x11, 0x06,
+            0x03, 0x55, 0x04, 0x08, 0x13, 0x0a, 0x4b, 0x79,
+            0x75, 0x6e, 0x67, 0x67, 0x69, 0x2d, 0x64, 0x6f,
+            0x31, 0x14, 0x30, 0x12, 0x06, 0x03, 0x55, 0x04,
+            0x07, 0x13, 0x0b, 0x53, 0x65, 0x6f, 0x6e, 0x67,
+            0x6e, 0x61, 0x6d, 0x2d, 0x73, 0x69, 0x31, 0x1a,
+            0x30, 0x18, 0x06, 0x03, 0x55, 0x04, 0x0a, 0x13,
+            0x11, 0x54, 0x68, 0x65, 0x20, 0x4e, 0x65, 0x74,
+            0x74, 0x79, 0x20, 0x50, 0x72, 0x6f, 0x6a, 0x65,
+            0x63, 0x74, 0x31, 0x15, 0x30, 0x13, 0x06, 0x03,
+            0x55, 0x04, 0x0b, 0x13, 0x0c, 0x43, 0x6f, 0x6e,
+            0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x6f, 0x72,
+            0x73, 0x31, 0x30, 0x30, 0x2e, 0x06, 0x03, 0x55,
+            0x04, 0x03, 0x13, 0x27, 0x73, 0x65, 0x63, 0x75,
+            0x72, 0x65, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x65,
+            0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x6e,
+            0x65, 0x74, 0x74, 0x79, 0x2e, 0x67, 0x6c, 0x65,
+            0x61, 0x6d, 0x79, 0x6e, 0x6f, 0x64, 0x65, 0x2e,
+            0x6e, 0x65, 0x74, 0x30, 0x5c, 0x30, 0x0d, 0x06,
+            0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
+            0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30,
+            0x48, 0x02, 0x41, 0x00, 0x95, 0xb3, 0x47, 0x17,
+            0x95, 0x0f, 0x57, 0xcf, 0x66, 0x72, 0x0a, 0x7e,
+            0x5b, 0x54, 0xea, 0x8c, 0x6f, 0x79, 0xde, 0x94,
+            0xac, 0x0b, 0x5a, 0xd4, 0xd6, 0x1b, 0x58, 0x12,
+            0x1a, 0x16, 0x3d, 0xfe, 0xdf, 0xa5, 0x2b, 0x86,
+            0xbc, 0x64, 0xd4, 0x80, 0x1e, 0x3f, 0xf9, 0xe2,
+            0x04, 0x03, 0x79, 0x9b, 0xc1, 0x5c, 0xf0, 0xf1,
+            0xf3, 0xf1, 0xe3, 0xbf, 0x3f, 0xc0, 0x1f, 0xdd,
+            0xdb, 0xc0, 0x5b, 0x21, 0x02, 0x03, 0x01, 0x00,
+            0x01, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48,
+            0x86, 0xf7, 0x0d, 0x01, 0x01, 0x05, 0x05, 0x00,
+            0x03, 0x41, 0x00, 0x02, 0xd7, 0xdd, 0xbd, 0x0c,
+            0x8e, 0x21, 0x20, 0xef, 0x9e, 0x4f, 0x1f, 0xf5,
+            0x49, 0xf1, 0xae, 0x58, 0x9b, 0x94, 0x3a, 0x1f,
+            0x70, 0x33, 0xf0, 0x9b, 0xbb, 0xe9, 0xc0, 0xf3,
+            0x72, 0xcb, 0xde, 0xb6, 0x56, 0x72, 0xcc, 0x1c,
+            0xf0, 0xd6, 0x5a, 0x2a, 0xbc, 0xa1, 0x7e, 0x23,
+            0x83, 0xe9, 0xe7, 0xcf, 0x9e, 0xa5, 0xf9, 0xcc,
+            0xc2, 0x61, 0xf4, 0xdb, 0x40, 0x93, 0x1d, 0x63,
+            0x8a, 0x50, 0x4c, 0x11, 0x39, 0xb1, 0x91, 0xc1,
+            0xe6, 0x9d, 0xd9, 0x1a, 0x62, 0x1b, 0xb8, 0xd3,
+            0xd6, 0x9a, 0x6d, 0xb9, 0x8e, 0x15, 0x51 };
+
+        public static InputStream asInputStream() {
+            byte[] data = new byte[DATA.length];
+            for (int i = 0; i < data.length; i ++) {
+                data[i] = (byte) DATA[i];
+            }
+            return new ByteArrayInputStream(data);
+        }
+
+        public static char[] getCertificatePassword() {
+            return "secret".toCharArray();
+        }
+
+        public static char[] getKeyStorePassword() {
+            return "secret".toCharArray();
+        }
+
+        private BogusKeyStore() {
+            // Unused
+        }
+    }
+}
diff --git a/src/test/java/io/netty/handler/codec/string/AbstractSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketStringEchoTest.java
similarity index 95%
rename from src/test/java/io/netty/handler/codec/string/AbstractSocketStringEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketStringEchoTest.java
index c8be69048f..4c49379aa3 100644
--- a/src/test/java/io/netty/handler/codec/string/AbstractSocketStringEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSocketStringEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.string;
+package io.netty.testsuite.transport.socket;
 
 import static org.junit.Assert.*;
 
@@ -37,8 +37,10 @@ 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.handler.codec.string.StringDecoder;
+import io.netty.handler.codec.string.StringEncoder;
 import io.netty.util.CharsetUtil;
-import io.netty.util.TestUtil;
+import io.netty.util.SocketAddresses;
 import io.netty.util.internal.ExecutorUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -100,7 +102,7 @@ public abstract class AbstractSocketStringEchoTest {
         Channel sc = sb.bind(new InetSocketAddress(0));
         int port = ((InetSocketAddress) sc.getLocalAddress()).getPort();
 
-        ChannelFuture ccf = cb.connect(new InetSocketAddress(TestUtil.getLocalHost(), port));
+        ChannelFuture ccf = cb.connect(new InetSocketAddress(SocketAddresses.LOCALHOST, port));
         assertTrue(ccf.awaitUninterruptibly().isSuccess());
 
         Channel cc = ccf.getChannel();
diff --git a/src/test/java/io/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketCompatibleObjectStreamEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketCompatibleObjectStreamEchoTest.java
index 9725515f8d..ddfa9ac798 100644
--- a/src/test/java/io/netty/handler/codec/serialization/NioNioSocketCompatibleObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketCompatibleObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketFixedLengthEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketFixedLengthEchoTest.java
index e9c41f03e3..ab6c35d016 100644
--- a/src/test/java/io/netty/handler/codec/frame/NioNioSocketFixedLengthEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketFixedLengthEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.frame;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketObjectStreamEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketObjectStreamEchoTest.java
index 596d59bc41..37dd041aac 100644
--- a/src/test/java/io/netty/handler/codec/serialization/NioNioSocketObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/string/NioNioSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketStringEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/string/NioNioSocketStringEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketStringEchoTest.java
index 492567e22f..3ffcaaf9ff 100644
--- a/src/test/java/io/netty/handler/codec/string/NioNioSocketStringEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioNioSocketStringEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.string;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketCompatibleObjectStreamEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketCompatibleObjectStreamEchoTest.java
index b18110b3e1..5fa5ea84af 100644
--- a/src/test/java/io/netty/handler/codec/serialization/NioOioSocketCompatibleObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketCompatibleObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketFixedLengthEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketFixedLengthEchoTest.java
index c5a0260bc5..5606117fc0 100644
--- a/src/test/java/io/netty/handler/codec/frame/NioOioSocketFixedLengthEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketFixedLengthEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.frame;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketObjectStreamEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketObjectStreamEchoTest.java
index e693a10568..376cebc1c2 100644
--- a/src/test/java/io/netty/handler/codec/serialization/NioOioSocketObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/string/NioOioSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketStringEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/string/NioOioSocketStringEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketStringEchoTest.java
index 763e9956f4..de39c167d3 100644
--- a/src/test/java/io/netty/handler/codec/string/NioOioSocketStringEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/NioOioSocketStringEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.string;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketCompatibleObjectStreamEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketCompatibleObjectStreamEchoTest.java
index 8d7e232aa5..1705d25be2 100644
--- a/src/test/java/io/netty/handler/codec/serialization/OioNioSocketCompatibleObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketCompatibleObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketFixedLengthEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketFixedLengthEchoTest.java
index 8dfee2731b..59f0930143 100644
--- a/src/test/java/io/netty/handler/codec/frame/OioNioSocketFixedLengthEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketFixedLengthEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.frame;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/serialization/OioNioSocketObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketObjectStreamEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/serialization/OioNioSocketObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketObjectStreamEchoTest.java
index c877cf3b6f..9e8689e406 100644
--- a/src/test/java/io/netty/handler/codec/serialization/OioNioSocketObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/string/OioNioSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketStringEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/string/OioNioSocketStringEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketStringEchoTest.java
index a593dc7022..dab455dac5 100644
--- a/src/test/java/io/netty/handler/codec/string/OioNioSocketStringEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioNioSocketStringEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.string;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketCompatibleObjectStreamEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketCompatibleObjectStreamEchoTest.java
index 98c47ab2ed..f9c04c8be8 100644
--- a/src/test/java/io/netty/handler/codec/serialization/OioOioSocketCompatibleObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketCompatibleObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketFixedLengthEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketFixedLengthEchoTest.java
index 77ba5de155..603bf4c3e4 100644
--- a/src/test/java/io/netty/handler/codec/frame/OioOioSocketFixedLengthEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketFixedLengthEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.frame;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketObjectStreamEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketObjectStreamEchoTest.java
index d3149e04d6..ea3c1d38dd 100644
--- a/src/test/java/io/netty/handler/codec/serialization/OioOioSocketObjectStreamEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketObjectStreamEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.serialization;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/handler/codec/string/OioOioSocketStringEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketStringEchoTest.java
similarity index 96%
rename from src/test/java/io/netty/handler/codec/string/OioOioSocketStringEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketStringEchoTest.java
index 74f5164302..20b547b8fa 100644
--- a/src/test/java/io/netty/handler/codec/string/OioOioSocketStringEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/OioOioSocketStringEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.codec.string;
+package io.netty.testsuite.transport.socket;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/test/java/io/netty/channel/socket/NioClientSocketShutdownTimeTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioClientSocketShutdownTimeTest.java
similarity index 93%
rename from src/test/java/io/netty/channel/socket/NioClientSocketShutdownTimeTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioClientSocketShutdownTimeTest.java
index 51ffc8236a..7d488ddebc 100644
--- a/src/test/java/io/netty/channel/socket/NioClientSocketShutdownTimeTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioClientSocketShutdownTimeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket;
+package io.netty.testsuite.transport.socket.nio;
 
 import static org.junit.Assert.*;
 
@@ -22,13 +22,13 @@ import java.net.InetSocketAddress;
 import java.nio.channels.ServerSocketChannel;
 import java.util.concurrent.Executors;
 
+import org.junit.Test;
+
 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;
-
+import io.netty.testsuite.util.DummyHandler;
+import io.netty.util.SocketAddresses;
 
 /**
  */
@@ -52,7 +52,7 @@ public class NioClientSocketShutdownTimeTest {
             serverSocket.configureBlocking(false);
 
             ChannelFuture f = b.connect(new InetSocketAddress(
-                    TestUtil.getLocalHost(),
+                    SocketAddresses.LOCALHOST,
                     serverSocket.socket().getLocalPort()));
 
             serverSocket.accept();
diff --git a/src/test/java/io/netty/channel/socket/NioServerSocketShutdownTimeTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioServerSocketShutdownTimeTest.java
similarity index 96%
rename from src/test/java/io/netty/channel/socket/NioServerSocketShutdownTimeTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioServerSocketShutdownTimeTest.java
index 534fc0cb68..2c063ee6ae 100644
--- a/src/test/java/io/netty/channel/socket/NioServerSocketShutdownTimeTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioServerSocketShutdownTimeTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket;
+package io.netty.testsuite.transport.socket.nio;
 
 import static org.junit.Assert.*;
 
@@ -28,7 +28,7 @@ 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 io.netty.util.SocketAddresses;
 import org.junit.Test;
 
 
@@ -57,7 +57,7 @@ public class NioServerSocketShutdownTimeTest {
         Socket socket = null;
         try {
             socket = new Socket(
-                    TestUtil.getLocalHost(),
+                    SocketAddresses.LOCALHOST,
                     ((InetSocketAddress) channel.getLocalAddress()).getPort());
 
             while (!handler.connected) {
diff --git a/src/test/java/io/netty/bootstrap/NioSocketClientBootstrapTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioSocketClientBootstrapTest.java
similarity index 90%
rename from src/test/java/io/netty/bootstrap/NioSocketClientBootstrapTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioSocketClientBootstrapTest.java
index a1a77dfd3d..56b80ad5ab 100644
--- a/src/test/java/io/netty/bootstrap/NioSocketClientBootstrapTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioSocketClientBootstrapTest.java
@@ -13,12 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.bootstrap;
+package io.netty.testsuite.transport.socket.nio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketClientBootstrapTest;
 
 /**
  * A test for New I/O socket client bootstraps
diff --git a/src/test/java/io/netty/bootstrap/NioSocketServerBootstrapTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioSocketServerBootstrapTest.java
similarity index 90%
rename from src/test/java/io/netty/bootstrap/NioSocketServerBootstrapTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioSocketServerBootstrapTest.java
index f2e63968ff..7347ecdd5c 100644
--- a/src/test/java/io/netty/bootstrap/NioSocketServerBootstrapTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/NioSocketServerBootstrapTest.java
@@ -13,12 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.bootstrap;
+package io.netty.testsuite.transport.socket.nio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketServerBootstrapTest;
 
 /**
  * A test for New I/O socket server bootstraps
diff --git a/src/test/java/io/netty/channel/socket/nio/UdpClient.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/UdpClient.java
similarity index 95%
rename from src/test/java/io/netty/channel/socket/nio/UdpClient.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/UdpClient.java
index d891b20626..09c7847ce2 100644
--- a/src/test/java/io/netty/channel/socket/nio/UdpClient.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/UdpClient.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.nio;
+package io.netty.testsuite.transport.socket.nio;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -65,11 +65,10 @@ public class UdpClient {
      * @param payload The payload of bytes to send
      * @return The datagram packet sent
      */
-    public DatagramPacket send(final byte[] payload) throws IOException {
+    public void send(final byte[] payload) throws IOException {
         final DatagramPacket dp =
                 new DatagramPacket(payload, payload.length, address, port);
         clientSocket.send(dp);
-        return dp;
     }
 
     /**
diff --git a/src/test/java/io/netty/channel/socket/NioNioSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketEchoTest.java
similarity index 91%
rename from src/test/java/io/netty/channel/socket/NioNioSocketEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketEchoTest.java
index 44c234ae58..b2c1687832 100644
--- a/src/test/java/io/netty/channel/socket/NioNioSocketEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketEchoTest.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket;
+package io.netty.testsuite.transport.socket.nio.nio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketEchoTest;
 
 /**
  */
diff --git a/src/test/java/io/netty/handler/ssl/NioNioSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketSslEchoTest.java
similarity index 91%
rename from src/test/java/io/netty/handler/ssl/NioNioSocketSslEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketSslEchoTest.java
index bc1fca4c8e..93bf5fddd7 100644
--- a/src/test/java/io/netty/handler/ssl/NioNioSocketSslEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/nio/NioNioSocketSslEchoTest.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.ssl;
+package io.netty.testsuite.transport.socket.nio.nio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketSslEchoTest;
 
 /**
  */
diff --git a/src/test/java/io/netty/channel/socket/NioOioSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketEchoTest.java
similarity index 91%
rename from src/test/java/io/netty/channel/socket/NioOioSocketEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketEchoTest.java
index 10c3fee546..4a3c80141f 100644
--- a/src/test/java/io/netty/channel/socket/NioOioSocketEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketEchoTest.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket;
+package io.netty.testsuite.transport.socket.nio.oio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketEchoTest;
 
 /**
  */
diff --git a/src/test/java/io/netty/handler/ssl/NioOioSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketSslEchoTest.java
similarity index 91%
rename from src/test/java/io/netty/handler/ssl/NioOioSocketSslEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketSslEchoTest.java
index 6a9b9b2e10..cfe662e544 100644
--- a/src/test/java/io/netty/handler/ssl/NioOioSocketSslEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/nio/oio/NioOioSocketSslEchoTest.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.ssl;
+package io.netty.testsuite.transport.socket.nio.oio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.nio.NioClientSocketChannelFactory;
 import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketSslEchoTest;
 
 /**
  */
diff --git a/src/test/java/io/netty/bootstrap/OioSocketClientBootstrapTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/OioSocketClientBootstrapTest.java
similarity index 90%
rename from src/test/java/io/netty/bootstrap/OioSocketClientBootstrapTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/OioSocketClientBootstrapTest.java
index c6d864eacd..dc965f9b69 100644
--- a/src/test/java/io/netty/bootstrap/OioSocketClientBootstrapTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/OioSocketClientBootstrapTest.java
@@ -13,12 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.bootstrap;
+package io.netty.testsuite.transport.socket.oio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketClientBootstrapTest;
 
 /**
  * A test for "Old" I/O socket client bootstraps
diff --git a/src/test/java/io/netty/bootstrap/OioSocketServerBootstrapTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/OioSocketServerBootstrapTest.java
similarity index 90%
rename from src/test/java/io/netty/bootstrap/OioSocketServerBootstrapTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/OioSocketServerBootstrapTest.java
index afd75d66b1..47da2f6660 100644
--- a/src/test/java/io/netty/bootstrap/OioSocketServerBootstrapTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/OioSocketServerBootstrapTest.java
@@ -13,12 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.bootstrap;
+package io.netty.testsuite.transport.socket.oio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketServerBootstrapTest;
 
 /**
  * A socket server bootstrap test for "Old" I/O
diff --git a/src/test/java/io/netty/channel/socket/OioNioSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketEchoTest.java
similarity index 91%
rename from src/test/java/io/netty/channel/socket/OioNioSocketEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketEchoTest.java
index b9e25256f9..c78028496c 100644
--- a/src/test/java/io/netty/channel/socket/OioNioSocketEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketEchoTest.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket;
+package io.netty.testsuite.transport.socket.oio.nio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketEchoTest;
 
 /**
  */
diff --git a/src/test/java/io/netty/handler/ssl/OioNioSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketSslEchoTest.java
similarity index 91%
rename from src/test/java/io/netty/handler/ssl/OioNioSocketSslEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketSslEchoTest.java
index 52a3abc3e5..d14effe29a 100644
--- a/src/test/java/io/netty/handler/ssl/OioNioSocketSslEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/nio/OioNioSocketSslEchoTest.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.ssl;
+package io.netty.testsuite.transport.socket.oio.nio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.nio.NioServerSocketChannelFactory;
 import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketSslEchoTest;
 
 /**
  */
diff --git a/src/test/java/io/netty/channel/socket/OioOioSocketEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketEchoTest.java
similarity index 91%
rename from src/test/java/io/netty/channel/socket/OioOioSocketEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketEchoTest.java
index c7d1a33e08..19c543a4e6 100644
--- a/src/test/java/io/netty/channel/socket/OioOioSocketEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketEchoTest.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket;
+package io.netty.testsuite.transport.socket.oio.oio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
 import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketEchoTest;
 
 /**
  */
diff --git a/src/test/java/io/netty/handler/ssl/OioOioSocketSslEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketSslEchoTest.java
similarity index 91%
rename from src/test/java/io/netty/handler/ssl/OioOioSocketSslEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketSslEchoTest.java
index 97a26491c5..65b7dec947 100644
--- a/src/test/java/io/netty/handler/ssl/OioOioSocketSslEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/oio/oio/OioOioSocketSslEchoTest.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.handler.ssl;
+package io.netty.testsuite.transport.socket.oio.oio;
 
 import java.util.concurrent.Executor;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.socket.oio.OioClientSocketChannelFactory;
 import io.netty.channel.socket.oio.OioServerSocketChannelFactory;
+import io.netty.testsuite.transport.socket.AbstractSocketSslEchoTest;
 
 /**
  */
diff --git a/src/test/java/io/netty/util/DummyHandler.java b/testsuite/src/test/java/io/netty/testsuite/util/DummyHandler.java
similarity index 92%
rename from src/test/java/io/netty/util/DummyHandler.java
rename to testsuite/src/test/java/io/netty/testsuite/util/DummyHandler.java
index ed2e7ed815..5ec679a904 100644
--- a/src/test/java/io/netty/util/DummyHandler.java
+++ b/testsuite/src/test/java/io/netty/testsuite/util/DummyHandler.java
@@ -13,25 +13,20 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.util;
+package io.netty.testsuite.util;
 
 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.
- */
 public class DummyHandler implements ChannelUpstreamHandler, ChannelDownstreamHandler {
 
-    @Override
     public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent e)
             throws Exception {
         ctx.sendUpstream(e);
     }
 
-    @Override
     public void handleDownstream(ChannelHandlerContext ctx, ChannelEvent e)
             throws Exception {
         ctx.sendDownstream(e);
diff --git a/transport-http/pom.xml b/transport-http/pom.xml
new file mode 100644
index 0000000000..258604e89d
--- /dev/null
+++ b/transport-http/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-transport-http</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Transport/HTTP</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/src/main/java/io/netty/channel/socket/http/AcceptedServerChannelPipelineFactory.java b/transport-http/src/main/java/io/netty/channel/socket/http/AcceptedServerChannelPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/AcceptedServerChannelPipelineFactory.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/AcceptedServerChannelPipelineFactory.java
diff --git a/src/main/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatch.java b/transport-http/src/main/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatch.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatch.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatch.java
diff --git a/src/main/java/io/netty/channel/socket/http/DefaultTunnelIdGenerator.java b/transport-http/src/main/java/io/netty/channel/socket/http/DefaultTunnelIdGenerator.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/DefaultTunnelIdGenerator.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/DefaultTunnelIdGenerator.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannel.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannel.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannel.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelConfig.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelConfig.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelFactory.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelFactory.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelReceiver.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelReceiver.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelReceiver.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelReceiver.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSink.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSink.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSink.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelChannelConfig.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelChannelConfig.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannel.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannel.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannel.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfig.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfig.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelFactory.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelFactory.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelSink.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelSink.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientChannelSink.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelClientPollHandler.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientPollHandler.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelClientPollHandler.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientPollHandler.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelClientSendHandler.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientSendHandler.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelClientSendHandler.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientSendHandler.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelClientWorkerOwner.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientWorkerOwner.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelClientWorkerOwner.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelClientWorkerOwner.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelMessageUtils.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelMessageUtils.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelMessageUtils.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelMessageUtils.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannel.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannel.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannel.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelConfig.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelConfig.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactory.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactory.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelSink.java b/transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelSink.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/HttpTunnelServerChannelSink.java
diff --git a/src/main/java/io/netty/channel/socket/http/SaturationManager.java b/transport-http/src/main/java/io/netty/channel/socket/http/SaturationManager.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/SaturationManager.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/SaturationManager.java
diff --git a/src/main/java/io/netty/channel/socket/http/SaturationStateChange.java b/transport-http/src/main/java/io/netty/channel/socket/http/SaturationStateChange.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/SaturationStateChange.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/SaturationStateChange.java
diff --git a/src/main/java/io/netty/channel/socket/http/ServerMessageSwitch.java b/transport-http/src/main/java/io/netty/channel/socket/http/ServerMessageSwitch.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/ServerMessageSwitch.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/ServerMessageSwitch.java
diff --git a/src/main/java/io/netty/channel/socket/http/ServerMessageSwitchDownstreamInterface.java b/transport-http/src/main/java/io/netty/channel/socket/http/ServerMessageSwitchDownstreamInterface.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/ServerMessageSwitchDownstreamInterface.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/ServerMessageSwitchDownstreamInterface.java
diff --git a/src/main/java/io/netty/channel/socket/http/ServerMessageSwitchUpstreamInterface.java b/transport-http/src/main/java/io/netty/channel/socket/http/ServerMessageSwitchUpstreamInterface.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/ServerMessageSwitchUpstreamInterface.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/ServerMessageSwitchUpstreamInterface.java
diff --git a/src/main/java/io/netty/channel/socket/http/TunnelIdGenerator.java b/transport-http/src/main/java/io/netty/channel/socket/http/TunnelIdGenerator.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/TunnelIdGenerator.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/TunnelIdGenerator.java
diff --git a/src/main/java/io/netty/channel/socket/http/TunnelWrappedServerChannelHandler.java b/transport-http/src/main/java/io/netty/channel/socket/http/TunnelWrappedServerChannelHandler.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/TunnelWrappedServerChannelHandler.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/TunnelWrappedServerChannelHandler.java
diff --git a/src/main/java/io/netty/channel/socket/http/WriteFragmenter.java b/transport-http/src/main/java/io/netty/channel/socket/http/WriteFragmenter.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/WriteFragmenter.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/WriteFragmenter.java
diff --git a/src/main/java/io/netty/channel/socket/http/WriteSplitter.java b/transport-http/src/main/java/io/netty/channel/socket/http/WriteSplitter.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/WriteSplitter.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/WriteSplitter.java
diff --git a/src/main/java/io/netty/channel/socket/http/package-info.java b/transport-http/src/main/java/io/netty/channel/socket/http/package-info.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/http/package-info.java
rename to transport-http/src/main/java/io/netty/channel/socket/http/package-info.java
diff --git a/src/test/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatchTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatchTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatchTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/AcceptedServerChannelRequestDispatchTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/FakeChannelConfig.java b/transport-http/src/test/java/io/netty/channel/socket/http/FakeChannelConfig.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/FakeChannelConfig.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/FakeChannelConfig.java
diff --git a/src/test/java/io/netty/channel/socket/http/FakeChannelSink.java b/transport-http/src/test/java/io/netty/channel/socket/http/FakeChannelSink.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/FakeChannelSink.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/FakeChannelSink.java
diff --git a/src/test/java/io/netty/channel/socket/http/FakeClientSocketChannelFactory.java b/transport-http/src/test/java/io/netty/channel/socket/http/FakeClientSocketChannelFactory.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/FakeClientSocketChannelFactory.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/FakeClientSocketChannelFactory.java
diff --git a/src/test/java/io/netty/channel/socket/http/FakeServerSocketChannel.java b/transport-http/src/test/java/io/netty/channel/socket/http/FakeServerSocketChannel.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/FakeServerSocketChannel.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/FakeServerSocketChannel.java
diff --git a/src/test/java/io/netty/channel/socket/http/FakeServerSocketChannelConfig.java b/transport-http/src/test/java/io/netty/channel/socket/http/FakeServerSocketChannelConfig.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/FakeServerSocketChannelConfig.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/FakeServerSocketChannelConfig.java
diff --git a/src/test/java/io/netty/channel/socket/http/FakeServerSocketChannelFactory.java b/transport-http/src/test/java/io/netty/channel/socket/http/FakeServerSocketChannelFactory.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/FakeServerSocketChannelFactory.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/FakeServerSocketChannelFactory.java
diff --git a/src/test/java/io/netty/channel/socket/http/FakeSocketChannel.java b/transport-http/src/test/java/io/netty/channel/socket/http/FakeSocketChannel.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/FakeSocketChannel.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/FakeSocketChannel.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSinkTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSinkTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSinkTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelAcceptedChannelSinkTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfigTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfigTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfigTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelConfigTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelClientChannelTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelClientPollHandlerTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelClientPollHandlerTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelClientPollHandlerTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelClientPollHandlerTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelClientSendHandlerTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelClientSendHandlerTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelClientSendHandlerTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelClientSendHandlerTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactoryTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactoryTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactoryTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelFactoryTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelSinkTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelSinkTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelSinkTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelSinkTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelServerChannelTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelSoakTester.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelSoakTester.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelSoakTester.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelSoakTester.java
diff --git a/src/test/java/io/netty/channel/socket/http/HttpTunnelTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/HttpTunnelTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/HttpTunnelTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/MockChannelStateListener.java b/transport-http/src/test/java/io/netty/channel/socket/http/MockChannelStateListener.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/MockChannelStateListener.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/MockChannelStateListener.java
diff --git a/src/test/java/io/netty/channel/socket/http/NettyTestUtils.java b/transport-http/src/test/java/io/netty/channel/socket/http/NettyTestUtils.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/NettyTestUtils.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/NettyTestUtils.java
diff --git a/src/test/java/io/netty/channel/socket/http/NettyTestUtilsTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/NettyTestUtilsTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/NettyTestUtilsTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/NettyTestUtilsTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/NullChannelHandler.java b/transport-http/src/test/java/io/netty/channel/socket/http/NullChannelHandler.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/NullChannelHandler.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/NullChannelHandler.java
diff --git a/src/test/java/io/netty/channel/socket/http/SaturationManagerTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/SaturationManagerTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/SaturationManagerTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/SaturationManagerTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/ServerMessageSwitchTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/ServerMessageSwitchTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/ServerMessageSwitchTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/ServerMessageSwitchTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/UpstreamEventCatcher.java b/transport-http/src/test/java/io/netty/channel/socket/http/UpstreamEventCatcher.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/UpstreamEventCatcher.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/UpstreamEventCatcher.java
diff --git a/src/test/java/io/netty/channel/socket/http/WriteFragmenterTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/WriteFragmenterTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/WriteFragmenterTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/WriteFragmenterTest.java
diff --git a/src/test/java/io/netty/channel/socket/http/WriteSplitterTest.java b/transport-http/src/test/java/io/netty/channel/socket/http/WriteSplitterTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/socket/http/WriteSplitterTest.java
rename to transport-http/src/test/java/io/netty/channel/socket/http/WriteSplitterTest.java
diff --git a/transport-rxtx/pom.xml b/transport-rxtx/pom.xml
new file mode 100644
index 0000000000..ca39dd2e2c
--- /dev/null
+++ b/transport-rxtx/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-transport-rxtx</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Transport/RXTX</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.rxtx</groupId>
+      <artifactId>rxtx</artifactId>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/src/main/java/io/netty/channel/rxtx/RXTXChannel.java b/transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/rxtx/RXTXChannel.java
rename to transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXChannel.java
diff --git a/src/main/java/io/netty/channel/rxtx/RXTXChannelConfig.java b/transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/rxtx/RXTXChannelConfig.java
rename to transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXChannelConfig.java
diff --git a/src/main/java/io/netty/channel/rxtx/RXTXChannelFactory.java b/transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/rxtx/RXTXChannelFactory.java
rename to transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXChannelFactory.java
diff --git a/src/main/java/io/netty/channel/rxtx/RXTXChannelSink.java b/transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXChannelSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/rxtx/RXTXChannelSink.java
rename to transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXChannelSink.java
diff --git a/src/main/java/io/netty/channel/rxtx/RXTXDeviceAddress.java b/transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXDeviceAddress.java
similarity index 100%
rename from src/main/java/io/netty/channel/rxtx/RXTXDeviceAddress.java
rename to transport-rxtx/src/main/java/io/netty/channel/rxtx/RXTXDeviceAddress.java
diff --git a/transport-sctp/pom.xml b/transport-sctp/pom.xml
new file mode 100644
index 0000000000..c14941d722
--- /dev/null
+++ b/transport-sctp/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-transport-sctp</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Transport/SCTP</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/AbstractNotificationHandler.java b/transport-sctp/src/main/java/com/sun/nio/sctp/AbstractNotificationHandler.java
new file mode 100644
index 0000000000..bade95b264
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/AbstractNotificationHandler.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+public class AbstractNotificationHandler<T> implements NotificationHandler<T> {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+
+    public HandlerResult handleNotification(AssociationChangeNotification notification, Object o) {
+        return null;
+    }
+
+    public HandlerResult handleNotification(Notification notification, Object o) {
+        return null;
+    }
+
+    public HandlerResult handleNotification(PeerAddressChangeNotification notification, Object o) {
+        return null;
+    }
+
+    public HandlerResult handleNotification(SendFailedNotification notification, Object o) {
+        return null;
+    }
+
+    public HandlerResult handleNotification(ShutdownNotification notification, Object o) {
+        return null;
+    }
+}
diff --git a/src/main/java/io/netty/container/osgi/package-info.java b/transport-sctp/src/main/java/com/sun/nio/sctp/Association.java
similarity index 83%
rename from src/main/java/io/netty/container/osgi/package-info.java
rename to transport-sctp/src/main/java/com/sun/nio/sctp/Association.java
index f146965fa3..e190295f5e 100644
--- a/src/main/java/io/netty/container/osgi/package-info.java
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/Association.java
@@ -13,10 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+package com.sun.nio.sctp;
 
-/**
- * <a href="http://www.osgi.org/">OSGi framework</a> integration.
- *
- * @apiviz.exclude
- */
-package io.netty.container.osgi;
+public class Association {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/AssociationChangeNotification.java b/transport-sctp/src/main/java/com/sun/nio/sctp/AssociationChangeNotification.java
new file mode 100644
index 0000000000..8b8098c851
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/AssociationChangeNotification.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+public abstract class AssociationChangeNotification implements Notification {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/HandlerResult.java b/transport-sctp/src/main/java/com/sun/nio/sctp/HandlerResult.java
new file mode 100644
index 0000000000..f75088140b
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/HandlerResult.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+/**
+ * TODO Document me.
+ *
+ * @author <a href="http://gleamynode.net/">Trustin Lee</a>
+ */
+public enum HandlerResult {
+    CONTINUE, RETURN;
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/MessageInfo.java b/transport-sctp/src/main/java/com/sun/nio/sctp/MessageInfo.java
new file mode 100644
index 0000000000..bab8487f3f
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/MessageInfo.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+import java.net.SocketAddress;
+
+public abstract class MessageInfo {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+
+    public static MessageInfo createOutgoing(Association association, SocketAddress address, int streamNumber) {
+        return null;
+    }
+
+    public abstract SocketAddress address();
+    public abstract int streamNumber();
+    public abstract MessageInfo streamNumber(int streamNumber);
+    public abstract int payloadProtocolID();
+    public abstract MessageInfo payloadProtocolID(int ppid);
+    public abstract boolean isComplete();
+
+}
diff --git a/src/main/java/io/netty/container/spring/package-info.java b/transport-sctp/src/main/java/com/sun/nio/sctp/Notification.java
similarity index 81%
rename from src/main/java/io/netty/container/spring/package-info.java
rename to transport-sctp/src/main/java/com/sun/nio/sctp/Notification.java
index 42a55f3152..32f1a809c9 100644
--- a/src/main/java/io/netty/container/spring/package-info.java
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/Notification.java
@@ -13,10 +13,8 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+package com.sun.nio.sctp;
 
-/**
- * <a href="http://www.springframework.org/">Spring framework</a> integration.
- *
- * @apiviz.exclude
- */
-package io.netty.container.spring;
+public interface Notification {
+    Association association();
+}
diff --git a/src/main/java/io/netty/container/microcontainer/package-info.java b/transport-sctp/src/main/java/com/sun/nio/sctp/NotificationHandler.java
similarity index 80%
rename from src/main/java/io/netty/container/microcontainer/package-info.java
rename to transport-sctp/src/main/java/com/sun/nio/sctp/NotificationHandler.java
index 485a26f619..1b86c0c57e 100644
--- a/src/main/java/io/netty/container/microcontainer/package-info.java
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/NotificationHandler.java
@@ -13,10 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+package com.sun.nio.sctp;
 
-/**
- * <a href="http://www.jboss.org/jbossmc/">JBoss Microcontainer</a> integration.
- *
- * @apiviz.exclude
- */
-package io.netty.container.microcontainer;
+public interface NotificationHandler<T> {
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/PeerAddressChangeNotification.java b/transport-sctp/src/main/java/com/sun/nio/sctp/PeerAddressChangeNotification.java
new file mode 100644
index 0000000000..7c61551edb
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/PeerAddressChangeNotification.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+public abstract class PeerAddressChangeNotification implements Notification {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/SctpChannel.java b/transport-sctp/src/main/java/com/sun/nio/sctp/SctpChannel.java
new file mode 100644
index 0000000000..287c40041b
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/SctpChannel.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.spi.AbstractSelectableChannel;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.Set;
+
+public abstract class SctpChannel extends AbstractSelectableChannel {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+
+    public static SctpChannel open() throws IOException {
+        return null;
+    }
+    
+    protected SctpChannel(SelectorProvider provider) {
+        super(provider);
+    }
+
+    public abstract <T> T getOption(SctpSocketOption<T> name) throws IOException;
+    public abstract <T> SctpChannel setOption(SctpSocketOption<T> name, T value) throws IOException;
+
+    public abstract Set<SocketAddress> getAllLocalAddresses() throws IOException;
+    public abstract Set<SocketAddress> getRemoteAddresses() throws IOException;
+
+    public abstract Association association() throws IOException;
+    public abstract SctpChannel bind(SocketAddress local) throws IOException;
+    public abstract boolean connect(SocketAddress remote) throws IOException;
+    public abstract boolean finishConnect() throws IOException;
+    public abstract <T> MessageInfo receive(ByteBuffer dst, T attachment, NotificationHandler<T> handler) throws IOException;
+    public abstract int send(ByteBuffer src, MessageInfo messageInfo) throws IOException;
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/SctpServerChannel.java b/transport-sctp/src/main/java/com/sun/nio/sctp/SctpServerChannel.java
new file mode 100644
index 0000000000..772a768825
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/SctpServerChannel.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+import java.nio.channels.spi.AbstractSelectableChannel;
+import java.nio.channels.spi.SelectorProvider;
+import java.util.Set;
+
+public abstract class SctpServerChannel extends AbstractSelectableChannel {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+
+    public static SctpServerChannel open() throws IOException {
+        return null;
+    }
+    
+    protected SctpServerChannel(SelectorProvider provider) {
+        super(provider);
+    }
+
+    public abstract <T> T getOption(SctpSocketOption<T> name) throws IOException;
+    public abstract <T> SctpChannel setOption(SctpSocketOption<T> name, T value) throws IOException;
+
+    public abstract Set<SocketAddress> getAllLocalAddresses() throws IOException;
+
+    public abstract SctpServerChannel bind(SocketAddress local) throws IOException;
+    public abstract SctpServerChannel bind(SocketAddress local, int backlog) throws IOException;
+    public abstract SctpChannel accept() throws IOException;
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/SctpSocketOption.java b/transport-sctp/src/main/java/com/sun/nio/sctp/SctpSocketOption.java
new file mode 100644
index 0000000000..66ca504ceb
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/SctpSocketOption.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+public interface SctpSocketOption<T> {
+    String name();
+    Class<T> type();
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/SctpStandardSocketOptions.java b/transport-sctp/src/main/java/com/sun/nio/sctp/SctpStandardSocketOptions.java
new file mode 100644
index 0000000000..f5418a9b31
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/SctpStandardSocketOptions.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+import java.net.SocketAddress;
+
+public class SctpStandardSocketOptions {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+
+    public static final SctpSocketOption<Boolean> SCTP_DISABLE_FRAGMENTS = null;
+    public static final SctpSocketOption<Boolean> SCTP_EXPLICIT_COMPLETE = null;
+    public static final SctpSocketOption<Integer> SCTP_FRAGMENT_INTERLEAVE = null;
+    public static final SctpSocketOption<InitMaxStreams> SCTP_INIT_MAXSTREAMS = null;
+    public static final SctpSocketOption<Boolean> SCTP_NODELAY = null;
+    public static final SctpSocketOption<SocketAddress> SCTP_PRIMARY_ADDR = null;
+    public static final SctpSocketOption<SocketAddress> SCTP_SET_PEER_PRIMARY_ADDR = null;
+    public static final SctpSocketOption<Integer> SO_LINGER = null;
+    public static final SctpSocketOption<Integer> SO_RCVBUF = null;
+    public static final SctpSocketOption<Integer> SO_SNDBUF = null;
+
+    public static class InitMaxStreams {
+    }
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/SendFailedNotification.java b/transport-sctp/src/main/java/com/sun/nio/sctp/SendFailedNotification.java
new file mode 100644
index 0000000000..47bbe89ad9
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/SendFailedNotification.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+public abstract class SendFailedNotification implements Notification {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+}
diff --git a/transport-sctp/src/main/java/com/sun/nio/sctp/ShutdownNotification.java b/transport-sctp/src/main/java/com/sun/nio/sctp/ShutdownNotification.java
new file mode 100644
index 0000000000..d0f408c2da
--- /dev/null
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/ShutdownNotification.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package com.sun.nio.sctp;
+
+public abstract class ShutdownNotification implements Notification {
+    static {
+        UnsupportedOperatingSystemException.raise();
+    }
+}
diff --git a/src/main/java/io/netty/container/spring/NettyLoggerConfigurator.java b/transport-sctp/src/main/java/com/sun/nio/sctp/UnsupportedOperatingSystemException.java
similarity index 52%
rename from src/main/java/io/netty/container/spring/NettyLoggerConfigurator.java
rename to transport-sctp/src/main/java/com/sun/nio/sctp/UnsupportedOperatingSystemException.java
index 295048a76e..ad990c757f 100644
--- a/src/main/java/io/netty/container/spring/NettyLoggerConfigurator.java
+++ b/transport-sctp/src/main/java/com/sun/nio/sctp/UnsupportedOperatingSystemException.java
@@ -13,16 +13,26 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.container.spring;
+package com.sun.nio.sctp;
 
-import io.netty.logging.CommonsLoggerFactory;
-import io.netty.logging.InternalLoggerFactory;
+public class UnsupportedOperatingSystemException extends RuntimeException {
+    public static void raise() {
+        throw new UnsupportedOperatingSystemException();
+    }
 
-/**
- * A bean that configures the default {@link InternalLoggerFactory}.
- */
-public class NettyLoggerConfigurator {
-    public NettyLoggerConfigurator() {
-        InternalLoggerFactory.setDefaultFactory(new CommonsLoggerFactory());
+    public UnsupportedOperatingSystemException() {
+        super();
+    }
+
+    public UnsupportedOperatingSystemException(String message) {
+        super(message);
+    }
+
+    public UnsupportedOperatingSystemException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public UnsupportedOperatingSystemException(Throwable cause) {
+        super(cause);
     }
 }
diff --git a/transport-sctp/src/main/java/io/netty/channel/sctp/AbstractWriteRequestQueue.java b/transport-sctp/src/main/java/io/netty/channel/sctp/AbstractWriteRequestQueue.java
new file mode 100644
index 0000000000..b2b6ce436d
--- /dev/null
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/AbstractWriteRequestQueue.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2011 The Netty Project
+ *
+ * The Netty Project licenses this file to you under the Apache License,
+ * version 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at:
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package io.netty.channel.sctp;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import io.netty.channel.MessageEvent;
+import io.netty.util.internal.QueueFactory;
+
+abstract class AbstractWriteRequestQueue implements BlockingQueue<MessageEvent> {
+
+    protected final BlockingQueue<MessageEvent> queue;
+
+    public AbstractWriteRequestQueue() {
+        this.queue = QueueFactory.createQueue(MessageEvent.class);
+    }
+
+    @Override
+    public MessageEvent remove() {
+        return queue.remove();
+    }
+
+    @Override
+    public MessageEvent element() {
+        return queue.element();
+    }
+
+    @Override
+    public MessageEvent peek() {
+        return queue.peek();
+    }
+
+    @Override
+    public int size() {
+        return queue.size();
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return queue.isEmpty();
+    }
+
+    @Override
+    public Iterator<MessageEvent> iterator() {
+        return queue.iterator();
+    }
+
+    @Override
+    public Object[] toArray() {
+        return queue.toArray();
+    }
+
+    @Override
+    public <T> T[] toArray(T[] a) {
+        return queue.toArray(a);
+    }
+
+    @Override
+    public boolean containsAll(Collection<?> c) {
+        return queue.containsAll(c);
+    }
+
+    @Override
+    public boolean addAll(Collection<? extends MessageEvent> c) {
+        return queue.addAll(c);
+    }
+
+    @Override
+    public boolean removeAll(Collection<?> c) {
+        return queue.removeAll(c);
+    }
+
+    @Override
+    public boolean retainAll(Collection<?> c) {
+        return queue.retainAll(c);
+    }
+
+    @Override
+    public void clear() {
+        queue.clear();        
+    }
+
+    @Override
+    public boolean add(MessageEvent e) {
+        return queue.add(e);
+    }
+
+    @Override
+    public void put(MessageEvent e) throws InterruptedException {
+        queue.put(e);
+    }
+
+    @Override
+    public boolean offer(MessageEvent e, long timeout, TimeUnit unit) throws InterruptedException {
+        return queue.offer(e, timeout, unit);
+    }
+
+    @Override
+    public MessageEvent take() throws InterruptedException {
+        return queue.take();
+    }
+
+    @Override
+    public MessageEvent poll(long timeout, TimeUnit unit) throws InterruptedException {
+        return queue.poll(timeout, unit);
+    }
+
+    @Override
+    public int remainingCapacity() {
+        return queue.remainingCapacity();
+    }
+
+    @Override
+    public boolean remove(Object o) {
+        return queue.remove(o);
+    }
+
+    @Override
+    public boolean contains(Object o) {
+        return queue.contains(o);
+    }
+
+    @Override
+    public int drainTo(Collection<? super MessageEvent> c) {
+        return queue.drainTo(c);
+    }
+
+    @Override
+    public int drainTo(Collection<? super MessageEvent> c, int maxElements) {
+        return queue.drainTo(c, maxElements);
+    }
+  
+}
diff --git a/src/main/java/io/netty/channel/socket/sctp/DefaultNioSctpChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultNioSctpChannelConfig.java
similarity index 99%
rename from src/main/java/io/netty/channel/socket/sctp/DefaultNioSctpChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/DefaultNioSctpChannelConfig.java
index 46c83e7155..7fc830413f 100644
--- a/src/main/java/io/netty/channel/socket/sctp/DefaultNioSctpChannelConfig.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultNioSctpChannelConfig.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
 import java.util.Map;
diff --git a/src/main/java/io/netty/channel/socket/sctp/DefaultSctpChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpChannelConfig.java
similarity index 99%
rename from src/main/java/io/netty/channel/socket/sctp/DefaultSctpChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpChannelConfig.java
index a5bff95e82..25d667951d 100644
--- a/src/main/java/io/netty/channel/socket/sctp/DefaultSctpChannelConfig.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpChannelConfig.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
 import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
diff --git a/src/main/java/io/netty/channel/socket/sctp/DefaultSctpServerChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java
similarity index 98%
rename from src/main/java/io/netty/channel/socket/sctp/DefaultSctpServerChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java
index 04e876a2a4..b311b31c0b 100644
--- a/src/main/java/io/netty/channel/socket/sctp/DefaultSctpServerChannelConfig.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
 
diff --git a/src/main/java/io/netty/channel/socket/sctp/NioSctpChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/NioSctpChannelConfig.java
similarity index 95%
rename from src/main/java/io/netty/channel/socket/sctp/NioSctpChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/NioSctpChannelConfig.java
index cab189a377..69f8fe791d 100644
--- a/src/main/java/io/netty/channel/socket/sctp/NioSctpChannelConfig.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/NioSctpChannelConfig.java
@@ -13,19 +13,19 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import io.netty.channel.ReceiveBufferSizePredictor;
 import io.netty.channel.ReceiveBufferSizePredictorFactory;
 import io.netty.channel.socket.SocketChannelConfig;
 
 /**
- * A {@link io.netty.channel.socket.sctp.SctpChannelConfig} for a NIO SCTP/IP {@link io.netty.channel.socket.sctp.SctpChannel}.
+ * A {@link io.netty.channel.sctp.SctpChannelConfig} for a NIO SCTP/IP {@link io.netty.channel.sctp.SctpChannel}.
  *
  * <h3>Available options</h3>
  *
  * 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
+ * {@link io.netty.channel.sctp.SctpChannelConfig}, {@link io.netty.channel.sctp.NioSctpChannelConfig} allows the
  * following options in the option map:
  *
  * <table border="1" cellspacing="0" cellpadding="6">
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpAcceptedChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpAcceptedChannel.java
similarity index 97%
rename from src/main/java/io/netty/channel/socket/sctp/SctpAcceptedChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpAcceptedChannel.java
index 9fc99d9ac8..7996280614 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpAcceptedChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpAcceptedChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
 import io.netty.channel.Channel;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannel.java
similarity index 97%
rename from src/main/java/io/netty/channel/socket/sctp/SctpChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannel.java
index a3f4c2cb28..df0b9392ac 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.Association;
 import io.netty.channel.Channel;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.java
similarity index 95%
rename from src/main/java/io/netty/channel/socket/sctp/SctpChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.java
index c0c994d581..bf67ec3ac2 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpChannelConfig.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.java
@@ -13,18 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
 import io.netty.channel.ChannelConfig;
 
 /**
- * A {@link io.netty.channel.ChannelConfig} for a {@link io.netty.channel.socket.sctp.SctpChannel}.
+ * A {@link io.netty.channel.ChannelConfig} for a {@link io.netty.channel.sctp.SctpChannel}.
  * <p/>
  * <h3>Available options</h3>
  * <p/>
  * 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:
+ * {@link io.netty.channel.sctp.SctpChannelConfig} allows the following options in the option map:
  * <p/>
  * <table border="1" cellspacing="0" cellpadding="6">
  * <tr>
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpChannelImpl.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelImpl.java
similarity index 96%
rename from src/main/java/io/netty/channel/socket/sctp/SctpChannelImpl.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelImpl.java
index b882c02655..c87df7e0a9 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpChannelImpl.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelImpl.java
@@ -13,18 +13,17 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.Association;
 import io.netty.buffer.ChannelBuffer;
 import io.netty.channel.*;
-import io.netty.channel.socket.sctp.SctpSendBufferPool.SendBuffer;
+import io.netty.channel.sctp.SctpSendBufferPool.SendBuffer;
 import io.netty.util.internal.ThreadLocalBoolean;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.util.*;
-import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -230,7 +229,7 @@ class SctpChannelImpl extends AbstractChannel implements SctpChannel {
         }
     }
 
-    private final class WriteRequestQueue extends LinkedTransferQueue<MessageEvent> {
+    private final class WriteRequestQueue extends AbstractWriteRequestQueue {
 
         private static final long serialVersionUID = -246694024103520626L;
 
@@ -242,7 +241,7 @@ class SctpChannelImpl extends AbstractChannel implements SctpChannel {
 
         @Override
         public boolean offer(MessageEvent e) {
-            boolean success = super.offer(e);
+            boolean success = queue.offer(e);
             assert success;
 
             int messageSize = getMessageSize(e);
@@ -264,7 +263,7 @@ class SctpChannelImpl extends AbstractChannel implements SctpChannel {
 
         @Override
         public MessageEvent poll() {
-            MessageEvent e = super.poll();
+            MessageEvent e = queue.poll();
             if (e != null) {
                 int messageSize = getMessageSize(e);
                 int newWriteBufferSize = writeBufferSize.addAndGet(-messageSize);
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpClientChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpClientChannel.java
similarity index 98%
rename from src/main/java/io/netty/channel/socket/sctp/SctpClientChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpClientChannel.java
index e58627c48a..ba4615584f 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpClientChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpClientChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
 import io.netty.channel.*;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpClientPipelineSink.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpClientPipelineSink.java
similarity index 98%
rename from src/main/java/io/netty/channel/socket/sctp/SctpClientPipelineSink.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpClientPipelineSink.java
index a6654c451a..0ac7287ab9 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpClientPipelineSink.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpClientPipelineSink.java
@@ -13,12 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import io.netty.channel.*;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.internal.DeadLockProofWorker;
+import io.netty.util.internal.QueueFactory;
 
 import java.io.IOException;
 import java.net.ConnectException;
@@ -31,7 +32,6 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -156,7 +156,7 @@ class SctpClientPipelineSink extends AbstractChannelSink {
         private boolean started;
         private final AtomicBoolean wakenUp = new AtomicBoolean();
         private final Object startStopLock = new Object();
-        private final Queue<Runnable> registerTaskQueue = new LinkedTransferQueue<Runnable>();
+        private final Queue<Runnable> registerTaskQueue = QueueFactory.createQueue(Runnable.class);
 
         Boss() {
             super();
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpClientSocketChannelFactory.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpClientSocketChannelFactory.java
similarity index 99%
rename from src/main/java/io/netty/channel/socket/sctp/SctpClientSocketChannelFactory.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpClientSocketChannelFactory.java
index 6972931e7a..151e490b64 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpClientSocketChannelFactory.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpClientSocketChannelFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.ChannelPipeline;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpNotificationEvent.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpNotificationEvent.java
similarity index 97%
rename from src/main/java/io/netty/channel/socket/sctp/SctpNotificationEvent.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpNotificationEvent.java
index b5dcae216e..9835dd24c7 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpNotificationEvent.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpNotificationEvent.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.Notification;
 import io.netty.channel.Channel;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpNotificationHandler.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpNotificationHandler.java
similarity index 98%
rename from src/main/java/io/netty/channel/socket/sctp/SctpNotificationHandler.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpNotificationHandler.java
index 56596ae0e2..ed8b22a958 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpNotificationHandler.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpNotificationHandler.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.*;
 import io.netty.channel.Channels;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpPayload.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpPayload.java
similarity index 98%
rename from src/main/java/io/netty/channel/socket/sctp/SctpPayload.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpPayload.java
index 28a6babdaf..e773a34083 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpPayload.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpPayload.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import io.netty.buffer.ChannelBuffer;
 import io.netty.buffer.ChannelBuffers;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpProviderMetadata.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpProviderMetadata.java
similarity index 99%
rename from src/main/java/io/netty/channel/socket/sctp/SctpProviderMetadata.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpProviderMetadata.java
index 91a736f986..db8ce4bb1a 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpProviderMetadata.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpProviderMetadata.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.SctpServerChannel;
 import io.netty.logging.InternalLogger;
@@ -42,7 +42,7 @@ class SctpProviderMetadata {
         InternalLoggerFactory.getInstance(SctpProviderMetadata.class);
 
     private static final String CONSTRAINT_LEVEL_PROPERTY =
-        "io.netty.channel.socket.sctp.constraintLevel";
+        "io.netty.channel.sctp.constraintLevel";
 
     /**
      * 0 - no need to wake up to get / set interestOps (most cases)
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpReceiveBufferPool.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpReceiveBufferPool.java
similarity index 98%
rename from src/main/java/io/netty/channel/socket/sctp/SctpReceiveBufferPool.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpReceiveBufferPool.java
index 6749155e4e..45484cb1f1 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpReceiveBufferPool.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpReceiveBufferPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import java.lang.ref.SoftReference;
 import java.nio.ByteBuffer;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpSendBufferPool.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpSendBufferPool.java
similarity index 99%
rename from src/main/java/io/netty/channel/socket/sctp/SctpSendBufferPool.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpSendBufferPool.java
index 7fdcdebabc..f28babde6b 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpSendBufferPool.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpSendBufferPool.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.MessageInfo;
 import com.sun.nio.sctp.SctpChannel;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpServerChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannel.java
similarity index 97%
rename from src/main/java/io/netty/channel/socket/sctp/SctpServerChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannel.java
index 3e73b49a1f..2fb186cb98 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpServerChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import io.netty.channel.ServerChannel;
 
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpServerChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelConfig.java
similarity index 98%
rename from src/main/java/io/netty/channel/socket/sctp/SctpServerChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelConfig.java
index f4fbc4040a..82732220a5 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpServerChannelConfig.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelConfig.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import static com.sun.nio.sctp.SctpStandardSocketOptions.*;
 
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpServerChannelImpl.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelImpl.java
similarity index 99%
rename from src/main/java/io/netty/channel/socket/sctp/SctpServerChannelImpl.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelImpl.java
index 24719eed73..2bb7ba1484 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpServerChannelImpl.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelImpl.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import io.netty.channel.*;
 import io.netty.logging.InternalLogger;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpServerPipelineSink.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerPipelineSink.java
similarity index 99%
rename from src/main/java/io/netty/channel/socket/sctp/SctpServerPipelineSink.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerPipelineSink.java
index 8283a5b7fb..f89144dfa6 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpServerPipelineSink.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerPipelineSink.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.SctpChannel;
 import io.netty.channel.*;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpServerSocketChannelFactory.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerSocketChannelFactory.java
similarity index 99%
rename from src/main/java/io/netty/channel/socket/sctp/SctpServerSocketChannelFactory.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerSocketChannelFactory.java
index 57e1fcab17..7ac54e1fdc 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpServerSocketChannelFactory.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerSocketChannelFactory.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelSink;
diff --git a/src/main/java/io/netty/channel/socket/sctp/SctpWorker.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpWorker.java
similarity index 98%
rename from src/main/java/io/netty/channel/socket/sctp/SctpWorker.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpWorker.java
index 2e40de6963..a2ebbcbf78 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SctpWorker.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpWorker.java
@@ -13,17 +13,18 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import com.sun.nio.sctp.*;
 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.channel.sctp.SctpSendBufferPool.SendBuffer;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
 import io.netty.util.internal.DeadLockProofWorker;
+import io.netty.util.internal.QueueFactory;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -34,7 +35,6 @@ import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedTransferQueue;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -60,8 +60,8 @@ class SctpWorker implements Runnable {
     private final AtomicBoolean wakenUp = new AtomicBoolean();
     private final ReadWriteLock selectorGuard = new ReentrantReadWriteLock();
     private final Object startStopLock = new Object();
-    private final Queue<Runnable> registerTaskQueue = new LinkedTransferQueue<Runnable>();
-    private final Queue<Runnable> writeTaskQueue = new LinkedTransferQueue<Runnable>();
+    private final Queue<Runnable> registerTaskQueue = QueueFactory.createQueue(Runnable.class);
+    private final Queue<Runnable> writeTaskQueue = QueueFactory.createQueue(Runnable.class);
     private volatile int cancelledKeys; // should use AtomicInteger but we just need approximation
 
     private final SctpReceiveBufferPool recvBufferPool = new SctpReceiveBufferPool();
diff --git a/src/main/java/io/netty/channel/socket/sctp/SelectorUtil.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SelectorUtil.java
similarity index 97%
rename from src/main/java/io/netty/channel/socket/sctp/SelectorUtil.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SelectorUtil.java
index 8a4bc5af29..e027247d5d 100644
--- a/src/main/java/io/netty/channel/socket/sctp/SelectorUtil.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SelectorUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
 
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
diff --git a/src/main/java/io/netty/channel/socket/sctp/package-info.java b/transport-sctp/src/main/java/io/netty/channel/sctp/package-info.java
similarity index 95%
rename from src/main/java/io/netty/channel/socket/sctp/package-info.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/package-info.java
index 95e64a58eb..d99e070321 100644
--- a/src/main/java/io/netty/channel/socket/sctp/package-info.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/package-info.java
@@ -18,4 +18,4 @@
  * <a href="http://en.wikipedia.org/wiki/New_I/O">NIO</a>-based socket channel
  * API implementation - recommended for a large number of connections (&gt;= 1000).
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
diff --git a/transport/pom.xml b/transport/pom.xml
new file mode 100644
index 0000000000..01f293a234
--- /dev/null
+++ b/transport/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2011 The Netty Project
+  ~
+  ~ The Netty Project licenses this file to you under the Apache License,
+  ~ version 2.0 (the "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>4.0.0.Alpha1-SNAPSHOT</version>
+  </parent>
+
+  <groupId>io.netty</groupId>
+  <artifactId>netty-transport</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Transport</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/src/main/java/io/netty/bootstrap/Bootstrap.java b/transport/src/main/java/io/netty/bootstrap/Bootstrap.java
similarity index 100%
rename from src/main/java/io/netty/bootstrap/Bootstrap.java
rename to transport/src/main/java/io/netty/bootstrap/Bootstrap.java
diff --git a/src/main/java/io/netty/bootstrap/ClientBootstrap.java b/transport/src/main/java/io/netty/bootstrap/ClientBootstrap.java
similarity index 100%
rename from src/main/java/io/netty/bootstrap/ClientBootstrap.java
rename to transport/src/main/java/io/netty/bootstrap/ClientBootstrap.java
diff --git a/src/main/java/io/netty/bootstrap/ConnectionlessBootstrap.java b/transport/src/main/java/io/netty/bootstrap/ConnectionlessBootstrap.java
similarity index 100%
rename from src/main/java/io/netty/bootstrap/ConnectionlessBootstrap.java
rename to transport/src/main/java/io/netty/bootstrap/ConnectionlessBootstrap.java
diff --git a/src/main/java/io/netty/bootstrap/ServerBootstrap.java b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
similarity index 100%
rename from src/main/java/io/netty/bootstrap/ServerBootstrap.java
rename to transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
diff --git a/src/main/java/io/netty/bootstrap/package-info.java b/transport/src/main/java/io/netty/bootstrap/package-info.java
similarity index 100%
rename from src/main/java/io/netty/bootstrap/package-info.java
rename to transport/src/main/java/io/netty/bootstrap/package-info.java
diff --git a/src/main/java/io/netty/channel/AbstractChannel.java b/transport/src/main/java/io/netty/channel/AbstractChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/AbstractChannel.java
rename to transport/src/main/java/io/netty/channel/AbstractChannel.java
diff --git a/src/main/java/io/netty/channel/AbstractChannelSink.java b/transport/src/main/java/io/netty/channel/AbstractChannelSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/AbstractChannelSink.java
rename to transport/src/main/java/io/netty/channel/AbstractChannelSink.java
diff --git a/src/main/java/io/netty/channel/AbstractServerChannel.java b/transport/src/main/java/io/netty/channel/AbstractServerChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/AbstractServerChannel.java
rename to transport/src/main/java/io/netty/channel/AbstractServerChannel.java
diff --git a/src/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictor.java b/transport/src/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictor.java
similarity index 100%
rename from src/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictor.java
rename to transport/src/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictor.java
diff --git a/src/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java b/transport/src/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
rename to transport/src/main/java/io/netty/channel/AdaptiveReceiveBufferSizePredictorFactory.java
diff --git a/src/main/java/io/netty/channel/Channel.java b/transport/src/main/java/io/netty/channel/Channel.java
similarity index 100%
rename from src/main/java/io/netty/channel/Channel.java
rename to transport/src/main/java/io/netty/channel/Channel.java
diff --git a/src/main/java/io/netty/channel/ChannelConfig.java b/transport/src/main/java/io/netty/channel/ChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelConfig.java
rename to transport/src/main/java/io/netty/channel/ChannelConfig.java
diff --git a/src/main/java/io/netty/channel/ChannelDownstreamHandler.java b/transport/src/main/java/io/netty/channel/ChannelDownstreamHandler.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelDownstreamHandler.java
rename to transport/src/main/java/io/netty/channel/ChannelDownstreamHandler.java
diff --git a/src/main/java/io/netty/channel/ChannelEvent.java b/transport/src/main/java/io/netty/channel/ChannelEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelEvent.java
rename to transport/src/main/java/io/netty/channel/ChannelEvent.java
diff --git a/src/main/java/io/netty/channel/ChannelException.java b/transport/src/main/java/io/netty/channel/ChannelException.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelException.java
rename to transport/src/main/java/io/netty/channel/ChannelException.java
diff --git a/src/main/java/io/netty/channel/ChannelFactory.java b/transport/src/main/java/io/netty/channel/ChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelFactory.java
rename to transport/src/main/java/io/netty/channel/ChannelFactory.java
diff --git a/src/main/java/io/netty/channel/ChannelFuture.java b/transport/src/main/java/io/netty/channel/ChannelFuture.java
similarity index 97%
rename from src/main/java/io/netty/channel/ChannelFuture.java
rename to transport/src/main/java/io/netty/channel/ChannelFuture.java
index 48baa7b1ff..0938c2963a 100644
--- a/src/main/java/io/netty/channel/ChannelFuture.java
+++ b/transport/src/main/java/io/netty/channel/ChannelFuture.java
@@ -18,7 +18,6 @@ package io.netty.channel;
 import java.util.concurrent.TimeUnit;
 
 import io.netty.bootstrap.ClientBootstrap;
-import io.netty.handler.execution.ExecutionHandler;
 
 /**
  * The result of an asynchronous {@link Channel} I/O operation.
@@ -84,9 +83,8 @@ import io.netty.handler.execution.ExecutionHandler;
  *
  * <h3>Do not call {@link #await()} inside {@link ChannelHandler}</h3>
  * <p>
- * The event handler methods in {@link ChannelHandler} is often called by
- * an I/O thread unless an {@link ExecutionHandler} is in the
- * {@link ChannelPipeline}.  If {@link #await()} is called by an event handler
+ * The event handler methods in {@link ChannelHandler} is usually called by
+ * an I/O thread.  If {@link #await()} is called by an event handler
  * method, which is called by the I/O thread, the I/O operation it is waiting
  * for might never be complete because {@link #await()} can block the I/O
  * operation it is waiting for, which is a dead lock.
diff --git a/src/main/java/io/netty/channel/ChannelFutureAggregator.java b/transport/src/main/java/io/netty/channel/ChannelFutureAggregator.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelFutureAggregator.java
rename to transport/src/main/java/io/netty/channel/ChannelFutureAggregator.java
diff --git a/src/main/java/io/netty/channel/ChannelFutureListener.java b/transport/src/main/java/io/netty/channel/ChannelFutureListener.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelFutureListener.java
rename to transport/src/main/java/io/netty/channel/ChannelFutureListener.java
diff --git a/src/main/java/io/netty/channel/ChannelFutureProgressListener.java b/transport/src/main/java/io/netty/channel/ChannelFutureProgressListener.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelFutureProgressListener.java
rename to transport/src/main/java/io/netty/channel/ChannelFutureProgressListener.java
diff --git a/src/main/java/io/netty/channel/ChannelHandler.java b/transport/src/main/java/io/netty/channel/ChannelHandler.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelHandler.java
rename to transport/src/main/java/io/netty/channel/ChannelHandler.java
diff --git a/src/main/java/io/netty/channel/ChannelHandlerContext.java b/transport/src/main/java/io/netty/channel/ChannelHandlerContext.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelHandlerContext.java
rename to transport/src/main/java/io/netty/channel/ChannelHandlerContext.java
diff --git a/src/main/java/io/netty/channel/ChannelHandlerLifeCycleException.java b/transport/src/main/java/io/netty/channel/ChannelHandlerLifeCycleException.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelHandlerLifeCycleException.java
rename to transport/src/main/java/io/netty/channel/ChannelHandlerLifeCycleException.java
diff --git a/src/main/java/io/netty/channel/ChannelLocal.java b/transport/src/main/java/io/netty/channel/ChannelLocal.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelLocal.java
rename to transport/src/main/java/io/netty/channel/ChannelLocal.java
diff --git a/src/main/java/io/netty/channel/ChannelPipeline.java b/transport/src/main/java/io/netty/channel/ChannelPipeline.java
similarity index 97%
rename from src/main/java/io/netty/channel/ChannelPipeline.java
rename to transport/src/main/java/io/netty/channel/ChannelPipeline.java
index 6a222a7a10..f2162d7565 100644
--- a/src/main/java/io/netty/channel/ChannelPipeline.java
+++ b/transport/src/main/java/io/netty/channel/ChannelPipeline.java
@@ -22,9 +22,6 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 
 import io.netty.buffer.ChannelBuffer;
-import io.netty.handler.execution.ExecutionHandler;
-import io.netty.handler.execution.OrderedMemoryAwareThreadPoolExecutor;
-import io.netty.handler.ssl.SslHandler;
 
 
 /**
@@ -157,7 +154,7 @@ import io.netty.handler.ssl.SslHandler;
  * <li>Protocol Decoder - translates binary data (e.g. {@link ChannelBuffer})
  *                        into a Java object.</li>
  * <li>Protocol Encoder - translates a Java object into binary data.</li>
- * <li>{@link ExecutionHandler} - applies a thread model.</li>
+ * <li><tt>ExecutionHandler</tt> - applies a thread model.</li>
  * <li>Business Logic Handler - performs the actual business logic
  *                              (e.g. database access).</li>
  * </ol>
@@ -168,15 +165,15 @@ import io.netty.handler.ssl.SslHandler;
  * {@link ChannelPipeline} pipeline = {@link Channels#pipeline() Channels.pipeline()};
  * pipeline.addLast("decoder", new MyProtocolDecoder());
  * pipeline.addLast("encoder", new MyProtocolEncoder());
- * pipeline.addLast("executor", new {@link ExecutionHandler}(new {@link OrderedMemoryAwareThreadPoolExecutor}(16, 1048576, 1048576)));
+ * pipeline.addLast("executor", new ExecutionHandler(...));
  * pipeline.addLast("handler", new MyBusinessLogicHandler());
  * </pre>
  *
  * <h3>Thread safety</h3>
  * <p>
  * A {@link ChannelHandler} can be added or removed at any time because a
- * {@link ChannelPipeline} is thread safe.  For example, you can insert a
- * {@link SslHandler} when sensitive information is about to be exchanged,
+ * {@link ChannelPipeline} is thread safe.  For example, you can insert an
+ * encryption handler when sensitive information is about to be exchanged,
  * and remove it after the exchange.
  *
  * <h3>Pitfall</h3>
diff --git a/src/main/java/io/netty/channel/ChannelPipelineException.java b/transport/src/main/java/io/netty/channel/ChannelPipelineException.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelPipelineException.java
rename to transport/src/main/java/io/netty/channel/ChannelPipelineException.java
diff --git a/src/main/java/io/netty/channel/ChannelPipelineFactory.java b/transport/src/main/java/io/netty/channel/ChannelPipelineFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelPipelineFactory.java
rename to transport/src/main/java/io/netty/channel/ChannelPipelineFactory.java
diff --git a/src/main/java/io/netty/channel/ChannelSink.java b/transport/src/main/java/io/netty/channel/ChannelSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelSink.java
rename to transport/src/main/java/io/netty/channel/ChannelSink.java
diff --git a/src/main/java/io/netty/channel/ChannelState.java b/transport/src/main/java/io/netty/channel/ChannelState.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelState.java
rename to transport/src/main/java/io/netty/channel/ChannelState.java
diff --git a/src/main/java/io/netty/channel/ChannelStateEvent.java b/transport/src/main/java/io/netty/channel/ChannelStateEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChannelStateEvent.java
rename to transport/src/main/java/io/netty/channel/ChannelStateEvent.java
diff --git a/src/main/java/io/netty/channel/ChannelUpstreamHandler.java b/transport/src/main/java/io/netty/channel/ChannelUpstreamHandler.java
similarity index 90%
rename from src/main/java/io/netty/channel/ChannelUpstreamHandler.java
rename to transport/src/main/java/io/netty/channel/ChannelUpstreamHandler.java
index a17fe80be7..5203e44b19 100644
--- a/src/main/java/io/netty/channel/ChannelUpstreamHandler.java
+++ b/transport/src/main/java/io/netty/channel/ChannelUpstreamHandler.java
@@ -15,11 +15,6 @@
  */
 package io.netty.channel;
 
-import java.util.concurrent.Executor;
-
-import io.netty.handler.execution.ExecutionHandler;
-
-
 /**
  * Handles or intercepts an upstream {@link ChannelEvent}, and sends a
  * {@link ChannelEvent} to the next handler in a {@link ChannelPipeline}.
@@ -78,11 +73,7 @@ import io.netty.handler.execution.ExecutionHandler;
  * {@link Channel}; the I/O thread of some transport can serve more than one
  * {@link Channel} (e.g. NIO transport), while the I/O thread of other
  * transports can serve only one (e.g. OIO transport).
- * <p>
- * However, if you add an {@link ExecutionHandler} to a {@link ChannelPipeline},
- * this behavior changes depending on what {@link Executor} was employed to
- * dispatch the events.  Please refer to {@link ExecutionHandler} for more
- * information.
+ *
  * @apiviz.exclude ^io\.netty\.handler\..*$
  */
 public interface ChannelUpstreamHandler extends ChannelHandler {
diff --git a/src/main/java/io/netty/channel/Channels.java b/transport/src/main/java/io/netty/channel/Channels.java
similarity index 100%
rename from src/main/java/io/netty/channel/Channels.java
rename to transport/src/main/java/io/netty/channel/Channels.java
diff --git a/src/main/java/io/netty/channel/ChildChannelStateEvent.java b/transport/src/main/java/io/netty/channel/ChildChannelStateEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/ChildChannelStateEvent.java
rename to transport/src/main/java/io/netty/channel/ChildChannelStateEvent.java
diff --git a/src/main/java/io/netty/channel/CompleteChannelFuture.java b/transport/src/main/java/io/netty/channel/CompleteChannelFuture.java
similarity index 100%
rename from src/main/java/io/netty/channel/CompleteChannelFuture.java
rename to transport/src/main/java/io/netty/channel/CompleteChannelFuture.java
diff --git a/src/main/java/io/netty/channel/DefaultChannelConfig.java b/transport/src/main/java/io/netty/channel/DefaultChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/DefaultChannelConfig.java
rename to transport/src/main/java/io/netty/channel/DefaultChannelConfig.java
diff --git a/src/main/java/io/netty/channel/DefaultChannelFuture.java b/transport/src/main/java/io/netty/channel/DefaultChannelFuture.java
similarity index 100%
rename from src/main/java/io/netty/channel/DefaultChannelFuture.java
rename to transport/src/main/java/io/netty/channel/DefaultChannelFuture.java
diff --git a/src/main/java/io/netty/channel/DefaultChannelPipeline.java b/transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
similarity index 100%
rename from src/main/java/io/netty/channel/DefaultChannelPipeline.java
rename to transport/src/main/java/io/netty/channel/DefaultChannelPipeline.java
diff --git a/src/main/java/io/netty/channel/DefaultChildChannelStateEvent.java b/transport/src/main/java/io/netty/channel/DefaultChildChannelStateEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/DefaultChildChannelStateEvent.java
rename to transport/src/main/java/io/netty/channel/DefaultChildChannelStateEvent.java
diff --git a/src/main/java/io/netty/channel/DefaultExceptionEvent.java b/transport/src/main/java/io/netty/channel/DefaultExceptionEvent.java
similarity index 94%
rename from src/main/java/io/netty/channel/DefaultExceptionEvent.java
rename to transport/src/main/java/io/netty/channel/DefaultExceptionEvent.java
index d18383b14a..d77abab7c7 100644
--- a/src/main/java/io/netty/channel/DefaultExceptionEvent.java
+++ b/transport/src/main/java/io/netty/channel/DefaultExceptionEvent.java
@@ -17,8 +17,6 @@ package io.netty.channel;
 
 import static io.netty.channel.Channels.*;
 
-import io.netty.util.internal.StackTraceSimplifier;
-
 /**
  * The default {@link ExceptionEvent} implementation.
  */
@@ -39,7 +37,6 @@ public class DefaultExceptionEvent implements ExceptionEvent {
         }
         this.channel = channel;
         this.cause = cause;
-        StackTraceSimplifier.simplify(cause);
     }
 
     @Override
diff --git a/src/main/java/io/netty/channel/DefaultFileRegion.java b/transport/src/main/java/io/netty/channel/DefaultFileRegion.java
similarity index 100%
rename from src/main/java/io/netty/channel/DefaultFileRegion.java
rename to transport/src/main/java/io/netty/channel/DefaultFileRegion.java
diff --git a/src/main/java/io/netty/channel/DefaultServerChannelConfig.java b/transport/src/main/java/io/netty/channel/DefaultServerChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/DefaultServerChannelConfig.java
rename to transport/src/main/java/io/netty/channel/DefaultServerChannelConfig.java
diff --git a/src/main/java/io/netty/channel/DefaultWriteCompletionEvent.java b/transport/src/main/java/io/netty/channel/DefaultWriteCompletionEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/DefaultWriteCompletionEvent.java
rename to transport/src/main/java/io/netty/channel/DefaultWriteCompletionEvent.java
diff --git a/src/main/java/io/netty/channel/DownstreamChannelStateEvent.java b/transport/src/main/java/io/netty/channel/DownstreamChannelStateEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/DownstreamChannelStateEvent.java
rename to transport/src/main/java/io/netty/channel/DownstreamChannelStateEvent.java
diff --git a/src/main/java/io/netty/channel/DownstreamMessageEvent.java b/transport/src/main/java/io/netty/channel/DownstreamMessageEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/DownstreamMessageEvent.java
rename to transport/src/main/java/io/netty/channel/DownstreamMessageEvent.java
diff --git a/src/main/java/io/netty/channel/ExceptionEvent.java b/transport/src/main/java/io/netty/channel/ExceptionEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/ExceptionEvent.java
rename to transport/src/main/java/io/netty/channel/ExceptionEvent.java
diff --git a/src/main/java/io/netty/channel/FailedChannelFuture.java b/transport/src/main/java/io/netty/channel/FailedChannelFuture.java
similarity index 100%
rename from src/main/java/io/netty/channel/FailedChannelFuture.java
rename to transport/src/main/java/io/netty/channel/FailedChannelFuture.java
diff --git a/src/main/java/io/netty/channel/FileRegion.java b/transport/src/main/java/io/netty/channel/FileRegion.java
similarity index 100%
rename from src/main/java/io/netty/channel/FileRegion.java
rename to transport/src/main/java/io/netty/channel/FileRegion.java
diff --git a/src/main/java/io/netty/channel/FixedReceiveBufferSizePredictor.java b/transport/src/main/java/io/netty/channel/FixedReceiveBufferSizePredictor.java
similarity index 100%
rename from src/main/java/io/netty/channel/FixedReceiveBufferSizePredictor.java
rename to transport/src/main/java/io/netty/channel/FixedReceiveBufferSizePredictor.java
diff --git a/src/main/java/io/netty/channel/FixedReceiveBufferSizePredictorFactory.java b/transport/src/main/java/io/netty/channel/FixedReceiveBufferSizePredictorFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/FixedReceiveBufferSizePredictorFactory.java
rename to transport/src/main/java/io/netty/channel/FixedReceiveBufferSizePredictorFactory.java
diff --git a/src/main/java/io/netty/channel/LifeCycleAwareChannelHandler.java b/transport/src/main/java/io/netty/channel/LifeCycleAwareChannelHandler.java
similarity index 100%
rename from src/main/java/io/netty/channel/LifeCycleAwareChannelHandler.java
rename to transport/src/main/java/io/netty/channel/LifeCycleAwareChannelHandler.java
diff --git a/src/main/java/io/netty/channel/MessageEvent.java b/transport/src/main/java/io/netty/channel/MessageEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/MessageEvent.java
rename to transport/src/main/java/io/netty/channel/MessageEvent.java
diff --git a/src/main/java/io/netty/channel/ReceiveBufferSizePredictor.java b/transport/src/main/java/io/netty/channel/ReceiveBufferSizePredictor.java
similarity index 100%
rename from src/main/java/io/netty/channel/ReceiveBufferSizePredictor.java
rename to transport/src/main/java/io/netty/channel/ReceiveBufferSizePredictor.java
diff --git a/src/main/java/io/netty/channel/ReceiveBufferSizePredictorFactory.java b/transport/src/main/java/io/netty/channel/ReceiveBufferSizePredictorFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/ReceiveBufferSizePredictorFactory.java
rename to transport/src/main/java/io/netty/channel/ReceiveBufferSizePredictorFactory.java
diff --git a/src/main/java/io/netty/channel/ServerChannel.java b/transport/src/main/java/io/netty/channel/ServerChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/ServerChannel.java
rename to transport/src/main/java/io/netty/channel/ServerChannel.java
diff --git a/src/main/java/io/netty/channel/ServerChannelFactory.java b/transport/src/main/java/io/netty/channel/ServerChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/ServerChannelFactory.java
rename to transport/src/main/java/io/netty/channel/ServerChannelFactory.java
diff --git a/src/main/java/io/netty/channel/SimpleChannelDownstreamHandler.java b/transport/src/main/java/io/netty/channel/SimpleChannelDownstreamHandler.java
similarity index 100%
rename from src/main/java/io/netty/channel/SimpleChannelDownstreamHandler.java
rename to transport/src/main/java/io/netty/channel/SimpleChannelDownstreamHandler.java
diff --git a/src/main/java/io/netty/channel/SimpleChannelHandler.java b/transport/src/main/java/io/netty/channel/SimpleChannelHandler.java
similarity index 100%
rename from src/main/java/io/netty/channel/SimpleChannelHandler.java
rename to transport/src/main/java/io/netty/channel/SimpleChannelHandler.java
diff --git a/src/main/java/io/netty/channel/SimpleChannelUpstreamHandler.java b/transport/src/main/java/io/netty/channel/SimpleChannelUpstreamHandler.java
similarity index 100%
rename from src/main/java/io/netty/channel/SimpleChannelUpstreamHandler.java
rename to transport/src/main/java/io/netty/channel/SimpleChannelUpstreamHandler.java
diff --git a/src/main/java/io/netty/channel/StaticChannelPipeline.java b/transport/src/main/java/io/netty/channel/StaticChannelPipeline.java
similarity index 100%
rename from src/main/java/io/netty/channel/StaticChannelPipeline.java
rename to transport/src/main/java/io/netty/channel/StaticChannelPipeline.java
diff --git a/src/main/java/io/netty/channel/SucceededChannelFuture.java b/transport/src/main/java/io/netty/channel/SucceededChannelFuture.java
similarity index 100%
rename from src/main/java/io/netty/channel/SucceededChannelFuture.java
rename to transport/src/main/java/io/netty/channel/SucceededChannelFuture.java
diff --git a/src/main/java/io/netty/channel/UpstreamChannelStateEvent.java b/transport/src/main/java/io/netty/channel/UpstreamChannelStateEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/UpstreamChannelStateEvent.java
rename to transport/src/main/java/io/netty/channel/UpstreamChannelStateEvent.java
diff --git a/src/main/java/io/netty/channel/UpstreamMessageEvent.java b/transport/src/main/java/io/netty/channel/UpstreamMessageEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/UpstreamMessageEvent.java
rename to transport/src/main/java/io/netty/channel/UpstreamMessageEvent.java
diff --git a/src/main/java/io/netty/channel/WriteCompletionEvent.java b/transport/src/main/java/io/netty/channel/WriteCompletionEvent.java
similarity index 100%
rename from src/main/java/io/netty/channel/WriteCompletionEvent.java
rename to transport/src/main/java/io/netty/channel/WriteCompletionEvent.java
diff --git a/src/main/java/io/netty/channel/group/ChannelGroup.java b/transport/src/main/java/io/netty/channel/group/ChannelGroup.java
similarity index 100%
rename from src/main/java/io/netty/channel/group/ChannelGroup.java
rename to transport/src/main/java/io/netty/channel/group/ChannelGroup.java
diff --git a/src/main/java/io/netty/channel/group/ChannelGroupFuture.java b/transport/src/main/java/io/netty/channel/group/ChannelGroupFuture.java
similarity index 98%
rename from src/main/java/io/netty/channel/group/ChannelGroupFuture.java
rename to transport/src/main/java/io/netty/channel/group/ChannelGroupFuture.java
index c6c8480b96..dae55eaa05 100644
--- a/src/main/java/io/netty/channel/group/ChannelGroupFuture.java
+++ b/transport/src/main/java/io/netty/channel/group/ChannelGroupFuture.java
@@ -24,7 +24,6 @@ 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.
@@ -69,8 +68,7 @@ import io.netty.handler.execution.ExecutionHandler;
  * <h3>Do not call {@link #await()} inside {@link ChannelHandler}</h3>
  * <p>
  * The event handler methods in {@link ChannelHandler} is often called by
- * an I/O thread unless an {@link ExecutionHandler} is in the
- * {@link ChannelPipeline}.  If {@link #await()} is called by an event handler
+ * an I/O thread.  If {@link #await()} is called by an event handler
  * method, which is called by the I/O thread, the I/O operation it is waiting
  * for might never be complete because {@link #await()} can block the I/O
  * operation it is waiting for, which is a dead lock.
@@ -107,6 +105,7 @@ import io.netty.handler.execution.ExecutionHandler;
  * where it is more convenient to call {@link #await()}. In such a case, please
  * make sure you do not call {@link #await()} in an I/O thread.  Otherwise,
  * {@link IllegalStateException} will be raised to prevent a dead lock.
+ *
  * @apiviz.owns io.netty.channel.group.ChannelGroupFutureListener - - notifies
  */
 public interface ChannelGroupFuture extends Iterable<ChannelFuture> {
diff --git a/src/main/java/io/netty/channel/group/ChannelGroupFutureListener.java b/transport/src/main/java/io/netty/channel/group/ChannelGroupFutureListener.java
similarity index 100%
rename from src/main/java/io/netty/channel/group/ChannelGroupFutureListener.java
rename to transport/src/main/java/io/netty/channel/group/ChannelGroupFutureListener.java
diff --git a/src/main/java/io/netty/channel/group/CombinedIterator.java b/transport/src/main/java/io/netty/channel/group/CombinedIterator.java
similarity index 100%
rename from src/main/java/io/netty/channel/group/CombinedIterator.java
rename to transport/src/main/java/io/netty/channel/group/CombinedIterator.java
diff --git a/src/main/java/io/netty/channel/group/DefaultChannelGroup.java b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java
similarity index 100%
rename from src/main/java/io/netty/channel/group/DefaultChannelGroup.java
rename to transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java
diff --git a/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java
similarity index 100%
rename from src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java
rename to transport/src/main/java/io/netty/channel/group/DefaultChannelGroupFuture.java
diff --git a/src/main/java/io/netty/channel/group/package-info.java b/transport/src/main/java/io/netty/channel/group/package-info.java
similarity index 100%
rename from src/main/java/io/netty/channel/group/package-info.java
rename to transport/src/main/java/io/netty/channel/group/package-info.java
diff --git a/src/main/java/io/netty/channel/iostream/IOStreamAddress.java b/transport/src/main/java/io/netty/channel/iostream/IOStreamAddress.java
similarity index 100%
rename from src/main/java/io/netty/channel/iostream/IOStreamAddress.java
rename to transport/src/main/java/io/netty/channel/iostream/IOStreamAddress.java
diff --git a/src/main/java/io/netty/channel/iostream/IOStreamChannel.java b/transport/src/main/java/io/netty/channel/iostream/IOStreamChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/iostream/IOStreamChannel.java
rename to transport/src/main/java/io/netty/channel/iostream/IOStreamChannel.java
diff --git a/src/main/java/io/netty/channel/iostream/IOStreamChannelFactory.java b/transport/src/main/java/io/netty/channel/iostream/IOStreamChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/iostream/IOStreamChannelFactory.java
rename to transport/src/main/java/io/netty/channel/iostream/IOStreamChannelFactory.java
diff --git a/src/main/java/io/netty/channel/iostream/IOStreamChannelSink.java b/transport/src/main/java/io/netty/channel/iostream/IOStreamChannelSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/iostream/IOStreamChannelSink.java
rename to transport/src/main/java/io/netty/channel/iostream/IOStreamChannelSink.java
diff --git a/src/main/java/io/netty/channel/local/DefaultLocalChannel.java b/transport/src/main/java/io/netty/channel/local/DefaultLocalChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/DefaultLocalChannel.java
rename to transport/src/main/java/io/netty/channel/local/DefaultLocalChannel.java
diff --git a/src/main/java/io/netty/channel/local/DefaultLocalClientChannelFactory.java b/transport/src/main/java/io/netty/channel/local/DefaultLocalClientChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/DefaultLocalClientChannelFactory.java
rename to transport/src/main/java/io/netty/channel/local/DefaultLocalClientChannelFactory.java
diff --git a/src/main/java/io/netty/channel/local/DefaultLocalServerChannel.java b/transport/src/main/java/io/netty/channel/local/DefaultLocalServerChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/DefaultLocalServerChannel.java
rename to transport/src/main/java/io/netty/channel/local/DefaultLocalServerChannel.java
diff --git a/src/main/java/io/netty/channel/local/DefaultLocalServerChannelFactory.java b/transport/src/main/java/io/netty/channel/local/DefaultLocalServerChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/DefaultLocalServerChannelFactory.java
rename to transport/src/main/java/io/netty/channel/local/DefaultLocalServerChannelFactory.java
diff --git a/src/main/java/io/netty/channel/local/LocalAddress.java b/transport/src/main/java/io/netty/channel/local/LocalAddress.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/LocalAddress.java
rename to transport/src/main/java/io/netty/channel/local/LocalAddress.java
diff --git a/src/main/java/io/netty/channel/local/LocalChannel.java b/transport/src/main/java/io/netty/channel/local/LocalChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/LocalChannel.java
rename to transport/src/main/java/io/netty/channel/local/LocalChannel.java
diff --git a/src/main/java/io/netty/channel/local/LocalChannelRegistry.java b/transport/src/main/java/io/netty/channel/local/LocalChannelRegistry.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/LocalChannelRegistry.java
rename to transport/src/main/java/io/netty/channel/local/LocalChannelRegistry.java
diff --git a/src/main/java/io/netty/channel/local/LocalClientChannelFactory.java b/transport/src/main/java/io/netty/channel/local/LocalClientChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/LocalClientChannelFactory.java
rename to transport/src/main/java/io/netty/channel/local/LocalClientChannelFactory.java
diff --git a/src/main/java/io/netty/channel/local/LocalClientChannelSink.java b/transport/src/main/java/io/netty/channel/local/LocalClientChannelSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/LocalClientChannelSink.java
rename to transport/src/main/java/io/netty/channel/local/LocalClientChannelSink.java
diff --git a/src/main/java/io/netty/channel/local/LocalServerChannel.java b/transport/src/main/java/io/netty/channel/local/LocalServerChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/LocalServerChannel.java
rename to transport/src/main/java/io/netty/channel/local/LocalServerChannel.java
diff --git a/src/main/java/io/netty/channel/local/LocalServerChannelFactory.java b/transport/src/main/java/io/netty/channel/local/LocalServerChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/LocalServerChannelFactory.java
rename to transport/src/main/java/io/netty/channel/local/LocalServerChannelFactory.java
diff --git a/src/main/java/io/netty/channel/local/LocalServerChannelSink.java b/transport/src/main/java/io/netty/channel/local/LocalServerChannelSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/LocalServerChannelSink.java
rename to transport/src/main/java/io/netty/channel/local/LocalServerChannelSink.java
diff --git a/src/main/java/io/netty/channel/local/package-info.java b/transport/src/main/java/io/netty/channel/local/package-info.java
similarity index 100%
rename from src/main/java/io/netty/channel/local/package-info.java
rename to transport/src/main/java/io/netty/channel/local/package-info.java
diff --git a/src/main/java/io/netty/channel/package-info.java b/transport/src/main/java/io/netty/channel/package-info.java
similarity index 100%
rename from src/main/java/io/netty/channel/package-info.java
rename to transport/src/main/java/io/netty/channel/package-info.java
diff --git a/src/main/java/io/netty/channel/socket/ClientSocketChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/ClientSocketChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/ClientSocketChannelFactory.java
rename to transport/src/main/java/io/netty/channel/socket/ClientSocketChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/DatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/DatagramChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/DatagramChannel.java
rename to transport/src/main/java/io/netty/channel/socket/DatagramChannel.java
diff --git a/src/main/java/io/netty/channel/socket/DatagramChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/DatagramChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/DatagramChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/DatagramChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/DatagramChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/DatagramChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/DatagramChannelFactory.java
rename to transport/src/main/java/io/netty/channel/socket/DatagramChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/DefaultDatagramChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/DefaultServerSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/DefaultServerSocketChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/DefaultServerSocketChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/DefaultServerSocketChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/DefaultSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/DefaultSocketChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/DefaultSocketChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/DefaultSocketChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/ServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/ServerSocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/ServerSocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/ServerSocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/ServerSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/ServerSocketChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/ServerSocketChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/ServerSocketChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/ServerSocketChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/ServerSocketChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/ServerSocketChannelFactory.java
rename to transport/src/main/java/io/netty/channel/socket/ServerSocketChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/SocketChannel.java b/transport/src/main/java/io/netty/channel/socket/SocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/SocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/SocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/SocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/SocketChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/SocketChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/SocketChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/nio/AbstractWriteRequestQueue.java b/transport/src/main/java/io/netty/channel/socket/nio/AbstractWriteRequestQueue.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/AbstractWriteRequestQueue.java
rename to transport/src/main/java/io/netty/channel/socket/nio/AbstractWriteRequestQueue.java
diff --git a/src/main/java/io/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/nio/DefaultNioDatagramChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioAcceptedSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioAcceptedSocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioAcceptedSocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioAcceptedSocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioClientSocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioClientSocketChannelFactory.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioClientSocketPipelineSink.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioDatagramChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioDatagramChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioDatagramChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioDatagramChannelFactory.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioDatagramPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramPipelineSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioDatagramPipelineSink.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioDatagramPipelineSink.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java b/transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioProviderMetadata.java b/transport/src/main/java/io/netty/channel/socket/nio/NioProviderMetadata.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioProviderMetadata.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioProviderMetadata.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioServerSocketChannelFactory.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannelConfig.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioSocketChannelConfig.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioSocketChannelConfig.java
diff --git a/src/main/java/io/netty/channel/socket/nio/NioWorker.java b/transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/NioWorker.java
rename to transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
diff --git a/src/main/java/io/netty/channel/socket/nio/SelectorUtil.java b/transport/src/main/java/io/netty/channel/socket/nio/SelectorUtil.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/SelectorUtil.java
rename to transport/src/main/java/io/netty/channel/socket/nio/SelectorUtil.java
diff --git a/src/main/java/io/netty/channel/socket/nio/SocketReceiveBufferPool.java b/transport/src/main/java/io/netty/channel/socket/nio/SocketReceiveBufferPool.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/SocketReceiveBufferPool.java
rename to transport/src/main/java/io/netty/channel/socket/nio/SocketReceiveBufferPool.java
diff --git a/src/main/java/io/netty/channel/socket/nio/SocketSendBufferPool.java b/transport/src/main/java/io/netty/channel/socket/nio/SocketSendBufferPool.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/SocketSendBufferPool.java
rename to transport/src/main/java/io/netty/channel/socket/nio/SocketSendBufferPool.java
diff --git a/src/main/java/io/netty/channel/socket/nio/package-info.java b/transport/src/main/java/io/netty/channel/socket/nio/package-info.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/nio/package-info.java
rename to transport/src/main/java/io/netty/channel/socket/nio/package-info.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioAcceptedSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioAcceptedSocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioAcceptedSocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioAcceptedSocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioClientSocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioClientSocketChannelFactory.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioClientSocketPipelineSink.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannel.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioDatagramChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioDatagramChannelFactory.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioDatagramChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioDatagramPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramPipelineSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioDatagramPipelineSink.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioDatagramPipelineSink.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioDatagramWorker.java b/transport/src/main/java/io/netty/channel/socket/oio/OioDatagramWorker.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioDatagramWorker.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioDatagramWorker.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannelFactory.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioServerSocketChannelFactory.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketChannelFactory.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioServerSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketPipelineSink.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioServerSocketPipelineSink.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioServerSocketPipelineSink.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioSocketChannel.java
diff --git a/src/main/java/io/netty/channel/socket/oio/OioWorker.java b/transport/src/main/java/io/netty/channel/socket/oio/OioWorker.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/OioWorker.java
rename to transport/src/main/java/io/netty/channel/socket/oio/OioWorker.java
diff --git a/src/main/java/io/netty/channel/socket/oio/package-info.java b/transport/src/main/java/io/netty/channel/socket/oio/package-info.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/oio/package-info.java
rename to transport/src/main/java/io/netty/channel/socket/oio/package-info.java
diff --git a/src/main/java/io/netty/channel/socket/package-info.java b/transport/src/main/java/io/netty/channel/socket/package-info.java
similarity index 100%
rename from src/main/java/io/netty/channel/socket/package-info.java
rename to transport/src/main/java/io/netty/channel/socket/package-info.java
diff --git a/src/test/java/io/netty/bootstrap/BootstrapOrderedMapTest.java b/transport/src/test/java/io/netty/bootstrap/BootstrapOrderedMapTest.java
similarity index 100%
rename from src/test/java/io/netty/bootstrap/BootstrapOrderedMapTest.java
rename to transport/src/test/java/io/netty/bootstrap/BootstrapOrderedMapTest.java
diff --git a/src/test/java/io/netty/bootstrap/BootstrapTest.java b/transport/src/test/java/io/netty/bootstrap/BootstrapTest.java
similarity index 94%
rename from src/test/java/io/netty/bootstrap/BootstrapTest.java
rename to transport/src/test/java/io/netty/bootstrap/BootstrapTest.java
index 5255be1ddf..fdf24488c7 100644
--- a/src/test/java/io/netty/bootstrap/BootstrapTest.java
+++ b/transport/src/test/java/io/netty/bootstrap/BootstrapTest.java
@@ -25,11 +25,15 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Map.Entry;
 
+import io.netty.channel.ChannelDownstreamHandler;
+import io.netty.channel.ChannelEvent;
 import io.netty.channel.ChannelFactory;
 import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.ChannelPipelineFactory;
-import io.netty.util.DummyHandler;
+import io.netty.channel.ChannelUpstreamHandler;
+
 import org.junit.Test;
 
 
@@ -338,4 +342,18 @@ public class BootstrapTest {
     public void shouldNotAllowNullOptionMap() {
         new Bootstrap().setOptions(null);
     }
+
+    private class DummyHandler implements ChannelUpstreamHandler, ChannelDownstreamHandler {
+
+        public void handleUpstream(ChannelHandlerContext ctx, ChannelEvent e)
+                throws Exception {
+            ctx.sendUpstream(e);
+        }
+
+        public void handleDownstream(ChannelHandlerContext ctx, ChannelEvent e)
+                throws Exception {
+            ctx.sendDownstream(e);
+        }
+    }
+
 }
diff --git a/src/test/java/io/netty/channel/CompleteChannelFutureTest.java b/transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/CompleteChannelFutureTest.java
rename to transport/src/test/java/io/netty/channel/CompleteChannelFutureTest.java
diff --git a/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java b/transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
rename to transport/src/test/java/io/netty/channel/DefaultChannelPipelineTest.java
diff --git a/src/test/java/io/netty/channel/FailedChannelFutureTest.java b/transport/src/test/java/io/netty/channel/FailedChannelFutureTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/FailedChannelFutureTest.java
rename to transport/src/test/java/io/netty/channel/FailedChannelFutureTest.java
diff --git a/src/test/java/io/netty/channel/StaticChannelPipelineTest.java b/transport/src/test/java/io/netty/channel/StaticChannelPipelineTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/StaticChannelPipelineTest.java
rename to transport/src/test/java/io/netty/channel/StaticChannelPipelineTest.java
diff --git a/src/test/java/io/netty/channel/SucceededChannelFutureTest.java b/transport/src/test/java/io/netty/channel/SucceededChannelFutureTest.java
similarity index 100%
rename from src/test/java/io/netty/channel/SucceededChannelFutureTest.java
rename to transport/src/test/java/io/netty/channel/SucceededChannelFutureTest.java