diff --git a/example/src/main/java/io/netty/example/sctp/NioSctpEchoClient.java b/example/src/main/java/io/netty/example/sctp/NioSctpEchoClient.java
index 1de459711e..c94005953f 100644
--- a/example/src/main/java/io/netty/example/sctp/NioSctpEchoClient.java
+++ b/example/src/main/java/io/netty/example/sctp/NioSctpEchoClient.java
@@ -19,9 +19,9 @@ import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
-import io.netty.channel.socket.sctp.SctpChannel;
+import io.netty.channel.sctp.SctpChannel;
 import io.netty.channel.socket.nio.NioEventLoopGroup;
-import io.netty.channel.socket.sctp.nio.NioSctpChannel;
+import io.netty.channel.sctp.nio.NioSctpChannel;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 
diff --git a/example/src/main/java/io/netty/example/sctp/NioSctpEchoServer.java b/example/src/main/java/io/netty/example/sctp/NioSctpEchoServer.java
index 9629d7810d..93a68076af 100644
--- a/example/src/main/java/io/netty/example/sctp/NioSctpEchoServer.java
+++ b/example/src/main/java/io/netty/example/sctp/NioSctpEchoServer.java
@@ -19,9 +19,9 @@ import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
-import io.netty.channel.socket.sctp.SctpChannel;
+import io.netty.channel.sctp.SctpChannel;
 import io.netty.channel.socket.nio.NioEventLoopGroup;
-import io.netty.channel.socket.sctp.nio.NioSctpServerChannel;
+import io.netty.channel.sctp.nio.NioSctpServerChannel;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 
diff --git a/example/src/main/java/io/netty/example/sctp/OioSctpEchoClient.java b/example/src/main/java/io/netty/example/sctp/OioSctpEchoClient.java
index 83889c312a..5c0b7f01b4 100644
--- a/example/src/main/java/io/netty/example/sctp/OioSctpEchoClient.java
+++ b/example/src/main/java/io/netty/example/sctp/OioSctpEchoClient.java
@@ -19,9 +19,9 @@ import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
-import io.netty.channel.socket.sctp.SctpChannel;
+import io.netty.channel.sctp.SctpChannel;
 import io.netty.channel.socket.oio.OioEventLoopGroup;
-import io.netty.channel.socket.sctp.oio.OioSctpChannel;
+import io.netty.channel.sctp.oio.OioSctpChannel;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 
diff --git a/example/src/main/java/io/netty/example/sctp/OioSctpEchoServer.java b/example/src/main/java/io/netty/example/sctp/OioSctpEchoServer.java
index 69f47a44c7..d52e948615 100644
--- a/example/src/main/java/io/netty/example/sctp/OioSctpEchoServer.java
+++ b/example/src/main/java/io/netty/example/sctp/OioSctpEchoServer.java
@@ -19,9 +19,9 @@ import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
-import io.netty.channel.socket.sctp.SctpChannel;
+import io.netty.channel.sctp.SctpChannel;
 import io.netty.channel.socket.oio.OioEventLoopGroup;
-import io.netty.channel.socket.sctp.oio.OioSctpServerChannel;
+import io.netty.channel.sctp.oio.OioSctpServerChannel;
 import io.netty.handler.logging.LogLevel;
 import io.netty.handler.logging.LoggingHandler;
 
diff --git a/example/src/main/java/io/netty/example/sctp/SctpEchoClientHandler.java b/example/src/main/java/io/netty/example/sctp/SctpEchoClientHandler.java
index a9100db000..341cfa921d 100644
--- a/example/src/main/java/io/netty/example/sctp/SctpEchoClientHandler.java
+++ b/example/src/main/java/io/netty/example/sctp/SctpEchoClientHandler.java
@@ -20,7 +20,7 @@ import io.netty.buffer.MessageBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
-import io.netty.channel.socket.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpMessage;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/example/src/main/java/io/netty/example/sctp/SctpEchoServerHandler.java b/example/src/main/java/io/netty/example/sctp/SctpEchoServerHandler.java
index cea2616fdf..3b853c739f 100644
--- a/example/src/main/java/io/netty/example/sctp/SctpEchoServerHandler.java
+++ b/example/src/main/java/io/netty/example/sctp/SctpEchoServerHandler.java
@@ -19,7 +19,7 @@ import io.netty.buffer.MessageBuf;
 import io.netty.channel.ChannelHandler.Sharable;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
-import io.netty.channel.socket.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpMessage;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSctpTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
similarity index 92%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSctpTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
index 109eb62d23..ba46477ca1 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/AbstractSctpTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/AbstractSctpTest.java
@@ -13,13 +13,14 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.testsuite.transport.socket;
+package io.netty.testsuite.transport.sctp;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
-import io.netty.testsuite.transport.socket.SocketTestPermutation.Factory;
+import io.netty.testsuite.transport.sctp.SctpTestPermutation;
+import io.netty.testsuite.transport.sctp.SctpTestPermutation.Factory;
 import io.netty.testsuite.util.TestUtils;
 import io.netty.util.NetUtil;
 import org.junit.Rule;
@@ -34,7 +35,7 @@ import java.util.Map.Entry;
 public abstract class AbstractSctpTest {
 
     private static final List<Entry<Factory<ServerBootstrap>, Factory<Bootstrap>>> COMBO =
-            SocketTestPermutation.sctpChannel();
+            SctpTestPermutation.sctpChannel();
 
     @Rule
     public final TestName testName = new TestName();
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SctpEchoTest.java b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
similarity index 98%
rename from testsuite/src/test/java/io/netty/testsuite/transport/socket/SctpEchoTest.java
rename to testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
index f268dfd3c0..4b8df0f418 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SctpEchoTest.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpEchoTest.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.testsuite.transport.socket;
+package io.netty.testsuite.transport.sctp;
 
 import io.netty.bootstrap.Bootstrap;
 import io.netty.bootstrap.ServerBootstrap;
@@ -23,7 +23,7 @@ import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundByteHandlerAdapter;
 import io.netty.channel.ChannelInitializer;
-import io.netty.channel.socket.sctp.SctpChannel;
+import io.netty.channel.sctp.SctpChannel;
 import io.netty.handler.codec.sctp.SctpInboundByteStreamHandler;
 import io.netty.handler.codec.sctp.SctpMessageCompletionHandler;
 import io.netty.handler.codec.sctp.SctpOutboundByteStreamHandler;
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
new file mode 100644
index 0000000000..ca6b28f3ff
--- /dev/null
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/sctp/SctpTestPermutation.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2012 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.sctp;
+
+import io.netty.bootstrap.Bootstrap;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.sctp.nio.NioSctpChannel;
+import io.netty.channel.sctp.nio.NioSctpServerChannel;
+import io.netty.channel.sctp.oio.OioSctpChannel;
+import io.netty.channel.sctp.oio.OioSctpServerChannel;
+import io.netty.channel.socket.nio.NioEventLoopGroup;
+import io.netty.channel.socket.oio.OioEventLoopGroup;
+import io.netty.testsuite.util.TestUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class SctpTestPermutation {
+
+
+    static List<Factory<ServerBootstrap>> sctpServerChannel() {
+        if (!TestUtils.isSctpSupported()) {
+            return Collections.emptyList();
+        }
+
+        List<Factory<ServerBootstrap>> list = new ArrayList<Factory<ServerBootstrap>>();
+        // Make the list of ServerBootstrap factories.
+        list.add(new Factory<ServerBootstrap>() {
+            @Override
+            public ServerBootstrap newInstance() {
+                return new ServerBootstrap().
+                        group(new NioEventLoopGroup(), new NioEventLoopGroup()).
+                        channel(NioSctpServerChannel.class);
+            }
+        });
+        list.add(new Factory<ServerBootstrap>() {
+            @Override
+            public ServerBootstrap newInstance() {
+                return new ServerBootstrap().
+                        group(new OioEventLoopGroup(), new OioEventLoopGroup()).
+                        channel(OioSctpServerChannel.class);
+            }
+        });
+
+        return list;
+    }
+
+    static List<Factory<Bootstrap>> sctpClientChannel() {
+        if (!TestUtils.isSctpSupported()) {
+            return Collections.emptyList();
+        }
+
+        List<Factory<Bootstrap>> list = new ArrayList<Factory<Bootstrap>>();
+        list.add(new Factory<Bootstrap>() {
+            @Override
+            public Bootstrap newInstance() {
+                return new Bootstrap().group(new NioEventLoopGroup()).channel(NioSctpChannel.class);
+            }
+        });
+        list.add(new Factory<Bootstrap>() {
+            @Override
+            public Bootstrap newInstance() {
+                return new Bootstrap().group(new OioEventLoopGroup()).channel(OioSctpChannel.class);
+            }
+        });
+        return list;
+    }
+
+    static List<Map.Entry<Factory<ServerBootstrap>, Factory<Bootstrap>>> sctpChannel() {
+        List<Map.Entry<Factory<ServerBootstrap>, Factory<Bootstrap>>> list =
+                new ArrayList<Map.Entry<Factory<ServerBootstrap>, Factory<Bootstrap>>>();
+
+        // Make the list of SCTP ServerBootstrap factories.
+        List<Factory<ServerBootstrap>> sbfs = sctpServerChannel();
+
+        // Make the list of SCTP Bootstrap factories.
+        List<Factory<Bootstrap>> cbfs = sctpClientChannel();
+
+        // Populate the combinations
+        for (Factory<ServerBootstrap> sbf: sbfs) {
+            for (Factory<Bootstrap> cbf: cbfs) {
+                final Factory<ServerBootstrap> sbf0 = sbf;
+                final Factory<Bootstrap> cbf0 = cbf;
+                list.add(new Map.Entry<Factory<ServerBootstrap>, Factory<Bootstrap>>() {
+                    @Override
+                    public Factory<ServerBootstrap> getKey() {
+                        return sbf0;
+                    }
+
+                    @Override
+                    public Factory<Bootstrap> getValue() {
+                        return cbf0;
+                    }
+
+                    @Override
+                    public Factory<Bootstrap> setValue(Factory<Bootstrap> value) {
+                        throw new UnsupportedOperationException();
+                    }
+                });
+            }
+        }
+
+        return list;
+    }
+
+
+    private SctpTestPermutation() {}
+
+    interface Factory<T> {
+        T newInstance();
+    }
+}
diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
index 623e9a3572..823c29cde5 100644
--- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
+++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java
@@ -25,20 +25,14 @@ import io.netty.channel.socket.aio.AioServerSocketChannel;
 import io.netty.channel.socket.aio.AioSocketChannel;
 import io.netty.channel.socket.nio.NioDatagramChannel;
 import io.netty.channel.socket.nio.NioEventLoopGroup;
-import io.netty.channel.socket.sctp.nio.NioSctpChannel;
-import io.netty.channel.socket.sctp.nio.NioSctpServerChannel;
 import io.netty.channel.socket.nio.NioServerSocketChannel;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.channel.socket.oio.OioDatagramChannel;
 import io.netty.channel.socket.oio.OioEventLoopGroup;
-import io.netty.channel.socket.sctp.oio.OioSctpChannel;
-import io.netty.channel.socket.sctp.oio.OioSctpServerChannel;
 import io.netty.channel.socket.oio.OioServerSocketChannel;
 import io.netty.channel.socket.oio.OioSocketChannel;
-import io.netty.testsuite.util.TestUtils;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -141,43 +135,6 @@ final class SocketTestPermutation {
         return list;
     }
 
-    static List<Entry<Factory<ServerBootstrap>, Factory<Bootstrap>>> sctpChannel() {
-        List<Entry<Factory<ServerBootstrap>, Factory<Bootstrap>>> list =
-                new ArrayList<Entry<Factory<ServerBootstrap>, Factory<Bootstrap>>>();
-
-        // Make the list of SCTP ServerBootstrap factories.
-        List<Factory<ServerBootstrap>> sbfs = sctpServerChannel();
-
-        // Make the list of SCTP Bootstrap factories.
-        List<Factory<Bootstrap>> cbfs = sctpClientChannel();
-
-        // Populate the combinations
-        for (Factory<ServerBootstrap> sbf: sbfs) {
-            for (Factory<Bootstrap> cbf: cbfs) {
-                final Factory<ServerBootstrap> sbf0 = sbf;
-                final Factory<Bootstrap> cbf0 = cbf;
-                list.add(new Entry<Factory<ServerBootstrap>, Factory<Bootstrap>>() {
-                    @Override
-                    public Factory<ServerBootstrap> getKey() {
-                        return sbf0;
-                    }
-
-                    @Override
-                    public Factory<Bootstrap> getValue() {
-                        return cbf0;
-                    }
-
-                    @Override
-                    public Factory<Bootstrap> setValue(Factory<Bootstrap> value) {
-                        throw new UnsupportedOperationException();
-                    }
-                });
-            }
-        }
-
-        return list;
-    }
-
     static List<Factory<ServerBootstrap>> serverSocket() {
         List<Factory<ServerBootstrap>> list = new ArrayList<Factory<ServerBootstrap>>();
 
@@ -234,54 +191,6 @@ final class SocketTestPermutation {
         return list;
     }
 
-    static List<Factory<ServerBootstrap>> sctpServerChannel() {
-        if (!TestUtils.isSctpSupported()) {
-            return Collections.emptyList();
-        }
-
-        List<Factory<ServerBootstrap>> list = new ArrayList<Factory<ServerBootstrap>>();
-        // Make the list of ServerBootstrap factories.
-        list.add(new Factory<ServerBootstrap>() {
-            @Override
-            public ServerBootstrap newInstance() {
-                return new ServerBootstrap().
-                        group(new NioEventLoopGroup(), new NioEventLoopGroup()).
-                        channel(NioSctpServerChannel.class);
-            }
-        });
-        list.add(new Factory<ServerBootstrap>() {
-            @Override
-            public ServerBootstrap newInstance() {
-                return new ServerBootstrap().
-                        group(new OioEventLoopGroup(), new OioEventLoopGroup()).
-                        channel(OioSctpServerChannel.class);
-            }
-        });
-
-        return list;
-    }
-
-    static List<Factory<Bootstrap>> sctpClientChannel() {
-        if (!TestUtils.isSctpSupported()) {
-            return Collections.emptyList();
-        }
-
-        List<Factory<Bootstrap>> list = new ArrayList<Factory<Bootstrap>>();
-        list.add(new Factory<Bootstrap>() {
-            @Override
-            public Bootstrap newInstance() {
-                return new Bootstrap().group(new NioEventLoopGroup()).channel(NioSctpChannel.class);
-            }
-        });
-        list.add(new Factory<Bootstrap>() {
-            @Override
-            public Bootstrap newInstance() {
-                return new Bootstrap().group(new OioEventLoopGroup()).channel(OioSctpChannel.class);
-            }
-        });
-        return list;
-    }
-
     private SocketTestPermutation() {}
 
     interface Factory<T> {
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/DefaultSctpChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpChannelConfig.java
similarity index 97%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/DefaultSctpChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpChannelConfig.java
index 65f15efbf5..e96bd2ac9c 100644
--- a/transport-sctp/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 com.sun.nio.sctp.SctpStandardSocketOptions;
@@ -34,7 +34,7 @@ public class DefaultSctpChannelConfig extends DefaultChannelConfig implements Sc
 
     private final SctpChannel javaChannel;
 
-    public DefaultSctpChannelConfig(io.netty.channel.socket.sctp.SctpChannel channel, SctpChannel javaChannel) {
+    public DefaultSctpChannelConfig(io.netty.channel.sctp.SctpChannel channel, SctpChannel javaChannel) {
         super(channel);
         if (javaChannel == null) {
             throw new NullPointerException("javaChannel");
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/DefaultSctpServerChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java
similarity index 97%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/DefaultSctpServerChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/DefaultSctpServerChannelConfig.java
index fad562cdf4..2cb3e2c897 100644
--- a/transport-sctp/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 com.sun.nio.sctp.SctpServerChannel;
 import io.netty.buffer.ByteBufAllocator;
@@ -39,7 +39,7 @@ public class DefaultSctpServerChannelConfig extends DefaultChannelConfig impleme
      * Creates a new instance.
      */
     public DefaultSctpServerChannelConfig(
-            io.netty.channel.socket.sctp.SctpServerChannel channel, SctpServerChannel javaChannel) {
+            io.netty.channel.sctp.SctpServerChannel channel, SctpServerChannel javaChannel) {
         super(channel);
         if (javaChannel == null) {
             throw new NullPointerException("javaChannel");
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannel.java
similarity index 99%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannel.java
index 09b1d2939c..cbd1c80b6b 100644
--- a/transport-sctp/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/transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpChannelConfig.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.java
similarity index 99%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.java
index 72394b4a47..0db0e8e606 100644
--- a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpChannelConfig.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpChannelConfig.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.ByteBufAllocator;
 import io.netty.channel.ChannelConfig;
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpMessage.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpMessage.java
similarity index 99%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpMessage.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpMessage.java
index 9607129e37..bd2a568da7 100644
--- a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpMessage.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpMessage.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 io.netty.buffer.ByteBuf;
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpNotificationEvent.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpNotificationEvent.java
similarity index 98%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpNotificationEvent.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpNotificationEvent.java
index 9e0c9e673b..75529debdb 100644
--- a/transport-sctp/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.ChannelHandler;
diff --git a/transport-sctp/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 transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpNotificationHandler.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpNotificationHandler.java
index ff74f25a79..e88d37c8bc 100644
--- a/transport-sctp/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.AbstractNotificationHandler;
 import com.sun.nio.sctp.AssociationChangeNotification;
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpServerChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannel.java
similarity index 98%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpServerChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannel.java
index bff1accb19..d6bb6ce4f5 100644
--- a/transport-sctp/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.ChannelFuture;
 import io.netty.channel.ChannelPromise;
diff --git a/transport-sctp/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 transport-sctp/src/main/java/io/netty/channel/socket/sctp/SctpServerChannelConfig.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/SctpServerChannelConfig.java
index 506cac2d20..1c8f67a4f9 100644
--- a/transport-sctp/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 io.netty.buffer.ByteBufAllocator;
 import io.netty.channel.ChannelConfig;
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/nio/NioSctpChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java
similarity index 96%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/nio/NioSctpChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java
index d46ab3a99c..c50d617853 100644
--- a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/nio/NioSctpChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp.nio;
+package io.netty.channel.sctp.nio;
 
 import com.sun.nio.sctp.Association;
 import com.sun.nio.sctp.MessageInfo;
@@ -27,12 +27,12 @@ import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelMetadata;
 import io.netty.channel.ChannelPromise;
+import io.netty.channel.sctp.SctpServerChannel;
 import io.netty.channel.socket.nio.AbstractNioMessageChannel;
-import io.netty.channel.socket.sctp.DefaultSctpChannelConfig;
-import io.netty.channel.socket.sctp.SctpChannelConfig;
-import io.netty.channel.socket.sctp.SctpMessage;
-import io.netty.channel.socket.sctp.SctpNotificationHandler;
-import io.netty.channel.socket.sctp.SctpServerChannel;
+import io.netty.channel.sctp.DefaultSctpChannelConfig;
+import io.netty.channel.sctp.SctpChannelConfig;
+import io.netty.channel.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpNotificationHandler;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
 
@@ -49,13 +49,13 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 /**
- * {@link io.netty.channel.socket.sctp.SctpChannel} implementation which use non-blocking mode and allows to read /
+ * {@link io.netty.channel.sctp.SctpChannel} implementation which use non-blocking mode and allows to read /
  * write {@link SctpMessage}s to the underlying {@link SctpChannel}.
  *
  * Be aware that not all operations systems support SCTP. Please refer to the documentation of your operation system,
  * to understand what you need to do to use it. Also this feature is only supported on Java 7+.
  */
-public class NioSctpChannel extends AbstractNioMessageChannel implements io.netty.channel.socket.sctp.SctpChannel {
+public class NioSctpChannel extends AbstractNioMessageChannel implements io.netty.channel.sctp.SctpChannel {
     private static final ChannelMetadata METADATA = new ChannelMetadata(BufType.MESSAGE, false);
 
     private static final InternalLogger logger = InternalLoggerFactory.getInstance(NioSctpChannel.class);
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/nio/NioSctpServerChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpServerChannel.java
similarity index 94%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/nio/NioSctpServerChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpServerChannel.java
index f466249134..66d6a6fdc2 100644
--- a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/nio/NioSctpServerChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/NioSctpServerChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp.nio;
+package io.netty.channel.sctp.nio;
 
 import com.sun.nio.sctp.SctpChannel;
 import com.sun.nio.sctp.SctpServerChannel;
@@ -24,8 +24,8 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelMetadata;
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.socket.nio.AbstractNioMessageChannel;
-import io.netty.channel.socket.sctp.DefaultSctpServerChannelConfig;
-import io.netty.channel.socket.sctp.SctpServerChannelConfig;
+import io.netty.channel.sctp.DefaultSctpServerChannelConfig;
+import io.netty.channel.sctp.SctpServerChannelConfig;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -38,14 +38,14 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 /**
- * {@link io.netty.channel.socket.sctp.SctpServerChannel} implementation which use non-blocking mode to accept new
+ * {@link io.netty.channel.sctp.SctpServerChannel} implementation which use non-blocking mode to accept new
  * connections and create the {@link NioSctpChannel} for them.
  *
  * Be aware that not all operations systems support SCTP. Please refer to the documentation of your operation system,
  * to understand what you need to do to use it. Also this feature is only supported on Java 7+.
  */
 public class NioSctpServerChannel extends AbstractNioMessageChannel
-        implements io.netty.channel.socket.sctp.SctpServerChannel {
+        implements io.netty.channel.sctp.SctpServerChannel {
     private static final ChannelMetadata METADATA = new ChannelMetadata(BufType.MESSAGE, false);
 
     private static SctpServerChannel newSocket() {
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/nio/package-info.java b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/package-info.java
similarity index 95%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/nio/package-info.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/nio/package-info.java
index dfc4e6437a..74e28e2672 100644
--- a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/nio/package-info.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/nio/package-info.java
@@ -18,4 +18,4 @@
  * <a href="http://en.wikipedia.org/wiki/New_I/O">NIO</a>-based SCTP Channel
  * API implementation - recommended for a large number of connections (&gt;= 1000).
  */
-package io.netty.channel.socket.sctp.nio;
+package io.netty.channel.sctp.nio;
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/oio/OioSctpChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpChannel.java
similarity index 96%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/oio/OioSctpChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpChannel.java
index acde92158c..b12a36e5b2 100755
--- a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/oio/OioSctpChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp.oio;
+package io.netty.channel.sctp.oio;
 
 import com.sun.nio.sctp.Association;
 import com.sun.nio.sctp.MessageInfo;
@@ -27,12 +27,12 @@ import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelMetadata;
 import io.netty.channel.ChannelPromise;
+import io.netty.channel.sctp.SctpServerChannel;
 import io.netty.channel.socket.oio.AbstractOioMessageChannel;
-import io.netty.channel.socket.sctp.DefaultSctpChannelConfig;
-import io.netty.channel.socket.sctp.SctpChannelConfig;
-import io.netty.channel.socket.sctp.SctpMessage;
-import io.netty.channel.socket.sctp.SctpNotificationHandler;
-import io.netty.channel.socket.sctp.SctpServerChannel;
+import io.netty.channel.sctp.DefaultSctpChannelConfig;
+import io.netty.channel.sctp.SctpChannelConfig;
+import io.netty.channel.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpNotificationHandler;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
 
@@ -49,14 +49,14 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 /**
- * {@link io.netty.channel.socket.sctp.SctpChannel} implementation which use blocking mode and allows to read / write
+ * {@link io.netty.channel.sctp.SctpChannel} implementation which use blocking mode and allows to read / write
  * {@link SctpMessage}s to the underlying {@link SctpChannel}.
  *
  * Be aware that not all operations systems support SCTP. Please refer to the documentation of your operation system,
  * to understand what you need to do to use it. Also this feature is only supported on Java 7+.
  */
 public class OioSctpChannel extends AbstractOioMessageChannel
-        implements io.netty.channel.socket.sctp.SctpChannel {
+        implements io.netty.channel.sctp.SctpChannel {
 
     private static final InternalLogger logger =
             InternalLoggerFactory.getInstance(OioSctpChannel.class);
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/oio/OioSctpServerChannel.java b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpServerChannel.java
similarity index 96%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/oio/OioSctpServerChannel.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpServerChannel.java
index b6922095ec..5624cff556 100755
--- a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/oio/OioSctpServerChannel.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/OioSctpServerChannel.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.netty.channel.socket.sctp.oio;
+package io.netty.channel.sctp.oio;
 
 import com.sun.nio.sctp.SctpChannel;
 import com.sun.nio.sctp.SctpServerChannel;
@@ -23,9 +23,9 @@ import io.netty.channel.ChannelException;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelMetadata;
 import io.netty.channel.ChannelPromise;
+import io.netty.channel.sctp.DefaultSctpServerChannelConfig;
+import io.netty.channel.sctp.SctpServerChannelConfig;
 import io.netty.channel.socket.oio.AbstractOioMessageChannel;
-import io.netty.channel.socket.sctp.DefaultSctpServerChannelConfig;
-import io.netty.channel.socket.sctp.SctpServerChannelConfig;
 import io.netty.logging.InternalLogger;
 import io.netty.logging.InternalLoggerFactory;
 
@@ -41,14 +41,14 @@ import java.util.LinkedHashSet;
 import java.util.Set;
 
 /**
- * {@link io.netty.channel.socket.sctp.SctpServerChannel} implementation which use blocking mode to accept new
+ * {@link io.netty.channel.sctp.SctpServerChannel} implementation which use blocking mode to accept new
  * connections and create the {@link OioSctpChannel} for them.
  *
  * Be aware that not all operations systems support SCTP. Please refer to the documentation of your operation system,
  * to understand what you need to do to use it. Also this feature is only supported on Java 7+.
  */
 public class OioSctpServerChannel extends AbstractOioMessageChannel
-        implements io.netty.channel.socket.sctp.SctpServerChannel {
+        implements io.netty.channel.sctp.SctpServerChannel {
 
     private static final InternalLogger logger =
             InternalLoggerFactory.getInstance(OioSctpServerChannel.class);
diff --git a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/oio/package-info.java b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/package-info.java
similarity index 94%
rename from transport-sctp/src/main/java/io/netty/channel/socket/sctp/oio/package-info.java
rename to transport-sctp/src/main/java/io/netty/channel/sctp/oio/package-info.java
index 191fd4d8f7..a5e4de0d47 100644
--- a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/oio/package-info.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/oio/package-info.java
@@ -18,4 +18,4 @@
  * Old blocking I/O based SCTP channel API implementation - recommended for
  * a small number of connections (&lt; 1000).
  */
-package io.netty.channel.socket.sctp.oio;
+package io.netty.channel.sctp.oio;
diff --git a/transport-sctp/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 transport-sctp/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 0ca6d099bd..0b086e921e 100644
--- a/transport-sctp/src/main/java/io/netty/channel/socket/sctp/package-info.java
+++ b/transport-sctp/src/main/java/io/netty/channel/sctp/package-info.java
@@ -21,4 +21,4 @@
  * @apiviz.exclude \.socket\.[a-z]+\.
  * @apiviz.exclude \.channel\.[A-Z]
  */
-package io.netty.channel.socket.sctp;
+package io.netty.channel.sctp;
diff --git a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpInboundByteStreamHandler.java b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpInboundByteStreamHandler.java
index e858345fa3..951fa4bcf4 100644
--- a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpInboundByteStreamHandler.java
+++ b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpInboundByteStreamHandler.java
@@ -19,7 +19,7 @@ package io.netty.handler.codec.sctp;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
-import io.netty.channel.socket.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpMessage;
 import io.netty.handler.codec.CodecException;
 
 /**
diff --git a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java
index d3f3e419c0..0e618569e0 100644
--- a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java
+++ b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageCompletionHandler.java
@@ -21,7 +21,7 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundMessageHandler;
 import io.netty.channel.ChannelInboundMessageHandlerAdapter;
-import io.netty.channel.socket.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpMessage;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageToMessageDecoder.java b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageToMessageDecoder.java
index 226e82539d..43689374e9 100644
--- a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageToMessageDecoder.java
+++ b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpMessageToMessageDecoder.java
@@ -16,7 +16,7 @@
 
 package io.netty.handler.codec.sctp;
 
-import io.netty.channel.socket.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpMessage;
 import io.netty.handler.codec.CodecException;
 import io.netty.handler.codec.MessageToMessageDecoder;
 
diff --git a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpOutboundByteStreamHandler.java b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpOutboundByteStreamHandler.java
index ea26e713ef..1510025c16 100644
--- a/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpOutboundByteStreamHandler.java
+++ b/transport-sctp/src/main/java/io/netty/handler/codec/sctp/SctpOutboundByteStreamHandler.java
@@ -21,7 +21,7 @@ import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelOutboundByteHandlerAdapter;
 import io.netty.channel.ChannelPromise;
-import io.netty.channel.socket.sctp.SctpMessage;
+import io.netty.channel.sctp.SctpMessage;
 import io.netty.handler.codec.EncoderException;
 
 /**