diff --git a/src/main/java/net/gleamynode/netty/bootstrap/Bootstrap.java b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java
similarity index 94%
rename from src/main/java/net/gleamynode/netty/bootstrap/Bootstrap.java
rename to src/main/java/org/jboss/netty/bootstrap/Bootstrap.java
index 52b4ea577c..5f2f852914 100644
--- a/src/main/java/net/gleamynode/netty/bootstrap/Bootstrap.java
+++ b/src/main/java/org/jboss/netty/bootstrap/Bootstrap.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.bootstrap;
+package org.jboss.netty.bootstrap;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -33,12 +33,12 @@ import java.util.Map;
 import java.util.Random;
 import java.util.TreeMap;
 
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelHandler;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelPipelineFactory;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
-import net.gleamynode.netty.logging.Logger;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.logging.Logger;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
@@ -46,7 +46,7 @@ import net.gleamynode.netty.logging.Logger;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.uses net.gleamynode.netty.channel.ChannelFactory
+ * @apiviz.uses org.jboss.netty.channel.ChannelFactory
  */
 public class Bootstrap {
 
diff --git a/src/main/java/net/gleamynode/netty/bootstrap/ClientBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java
similarity index 89%
rename from src/main/java/net/gleamynode/netty/bootstrap/ClientBootstrap.java
rename to src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java
index b6999eab4f..07b92ace66 100644
--- a/src/main/java/net/gleamynode/netty/bootstrap/ClientBootstrap.java
+++ b/src/main/java/org/jboss/netty/bootstrap/ClientBootstrap.java
@@ -20,24 +20,24 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.bootstrap;
+package org.jboss.netty.bootstrap;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.net.SocketAddress;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelPipelineException;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelPipelineException;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/bootstrap/ServerBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java
similarity index 87%
rename from src/main/java/net/gleamynode/netty/bootstrap/ServerBootstrap.java
rename to src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java
index 74f2c8c7b6..cbfdfc83c0 100644
--- a/src/main/java/net/gleamynode/netty/bootstrap/ServerBootstrap.java
+++ b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.bootstrap;
+package org.jboss.netty.bootstrap;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.net.SocketAddress;
 import java.util.HashMap;
@@ -32,18 +32,18 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelHandler;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ChildChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ChildChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/bootstrap/package-info.java b/src/main/java/org/jboss/netty/bootstrap/package-info.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/bootstrap/package-info.java
rename to src/main/java/org/jboss/netty/bootstrap/package-info.java
index 2d2e9ac0e4..2c4319540a 100644
--- a/src/main/java/net/gleamynode/netty/bootstrap/package-info.java
+++ b/src/main/java/org/jboss/netty/bootstrap/package-info.java
@@ -27,4 +27,4 @@
  *
  * @apiviz.landmark
  */
-package net.gleamynode.netty.bootstrap;
+package org.jboss.netty.bootstrap;
diff --git a/src/main/java/net/gleamynode/netty/buffer/AbstractChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/AbstractChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/AbstractChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/AbstractChannelBuffer.java
index 7093f2a178..1abf963849 100644
--- a/src/main/java/net/gleamynode/netty/buffer/AbstractChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/AbstractChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/buffer/BigEndianHeapChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/BigEndianHeapChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/BigEndianHeapChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/BigEndianHeapChannelBuffer.java
index 8b2c8e7819..f5635b1f26 100644
--- a/src/main/java/net/gleamynode/netty/buffer/BigEndianHeapChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/BigEndianHeapChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.nio.ByteOrder;
 
diff --git a/src/main/java/net/gleamynode/netty/buffer/ByteBufferBackedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/ByteBufferBackedChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/ByteBufferBackedChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/ByteBufferBackedChannelBuffer.java
index 6277fc33a3..cbc9060ae9 100644
--- a/src/main/java/net/gleamynode/netty/buffer/ByteBufferBackedChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/ByteBufferBackedChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/main/java/net/gleamynode/netty/buffer/ChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/ChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/ChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/ChannelBuffer.java
index 51aff6223d..21ceba5d9e 100644
--- a/src/main/java/net/gleamynode/netty/buffer/ChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/ChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/buffer/ChannelBufferIndexFinder.java b/src/main/java/org/jboss/netty/buffer/ChannelBufferIndexFinder.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/buffer/ChannelBufferIndexFinder.java
rename to src/main/java/org/jboss/netty/buffer/ChannelBufferIndexFinder.java
index 25ee70a002..029e44b4d5 100644
--- a/src/main/java/net/gleamynode/netty/buffer/ChannelBufferIndexFinder.java
+++ b/src/main/java/org/jboss/netty/buffer/ChannelBufferIndexFinder.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 
 /**
@@ -29,7 +29,7 @@ package net.gleamynode.netty.buffer;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.uses net.gleamynode.netty.buffer.ChannelBuffer
+ * @apiviz.uses org.jboss.netty.buffer.ChannelBuffer
  */
 public interface ChannelBufferIndexFinder {
 
diff --git a/src/main/java/net/gleamynode/netty/buffer/ChannelBufferInputStream.java b/src/main/java/org/jboss/netty/buffer/ChannelBufferInputStream.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/buffer/ChannelBufferInputStream.java
rename to src/main/java/org/jboss/netty/buffer/ChannelBufferInputStream.java
index a41263c710..4d585892bf 100644
--- a/src/main/java/net/gleamynode/netty/buffer/ChannelBufferInputStream.java
+++ b/src/main/java/org/jboss/netty/buffer/ChannelBufferInputStream.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.DataInput;
 import java.io.DataInputStream;
@@ -36,7 +36,7 @@ import java.io.InputStream;
  * @version $Rev$, $Date$
  *
  * @see ChannelBufferOutputStream
- * @apiviz.uses net.gleamynode.netty.buffer.ChannelBuffer
+ * @apiviz.uses org.jboss.netty.buffer.ChannelBuffer
  */
 public class ChannelBufferInputStream extends InputStream implements DataInput {
 
diff --git a/src/main/java/net/gleamynode/netty/buffer/ChannelBufferOutputStream.java b/src/main/java/org/jboss/netty/buffer/ChannelBufferOutputStream.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/buffer/ChannelBufferOutputStream.java
rename to src/main/java/org/jboss/netty/buffer/ChannelBufferOutputStream.java
index 66cfb8545e..9d471dd893 100644
--- a/src/main/java/net/gleamynode/netty/buffer/ChannelBufferOutputStream.java
+++ b/src/main/java/org/jboss/netty/buffer/ChannelBufferOutputStream.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.DataOutput;
 import java.io.DataOutputStream;
@@ -35,7 +35,7 @@ import java.io.OutputStream;
  * @version $Rev$, $Date$
  *
  * @see ChannelBufferInputStream
- * @apiviz.uses net.gleamynode.netty.buffer.ChannelBuffer
+ * @apiviz.uses org.jboss.netty.buffer.ChannelBuffer
  */
 public class ChannelBufferOutputStream extends OutputStream implements DataOutput {
 
diff --git a/src/main/java/net/gleamynode/netty/buffer/ChannelBuffers.java b/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/ChannelBuffers.java
rename to src/main/java/org/jboss/netty/buffer/ChannelBuffers.java
index fac26d4b01..08a747a704 100644
--- a/src/main/java/net/gleamynode/netty/buffer/ChannelBuffers.java
+++ b/src/main/java/org/jboss/netty/buffer/ChannelBuffers.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -34,7 +34,7 @@ import java.nio.ByteOrder;
  * This classes is intended to be used with Java 5 static import statement:
  *
  * <pre>
- * import static net.gleamynode.netty.buffer.ChannelBuffers.*;
+ * import static org.jboss.netty.buffer.ChannelBuffers.*;
  *
  * ChannelBuffer heapBuffer = buffer(128);
  * ChannelBuffer directBuffer = directBuffer(256);
@@ -85,7 +85,7 @@ import java.nio.ByteOrder;
  * @version $Rev$, $Date$
  *
  * @apiviz.landmark
- * @apiviz.has net.gleamynode.netty.buffer.ChannelBuffer oneway - - creates
+ * @apiviz.has org.jboss.netty.buffer.ChannelBuffer oneway - - creates
  */
 public class ChannelBuffers {
 
diff --git a/src/main/java/net/gleamynode/netty/buffer/CompositeChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/CompositeChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
index 47973f0a42..800ea9e00c 100644
--- a/src/main/java/net/gleamynode/netty/buffer/CompositeChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/CompositeChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/buffer/DuplicatedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/DuplicatedChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/DuplicatedChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/DuplicatedChannelBuffer.java
index a25ca66e5f..f26305511b 100644
--- a/src/main/java/net/gleamynode/netty/buffer/DuplicatedChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/DuplicatedChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/buffer/DynamicChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/DynamicChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java
index 25a12be627..cbbf33749a 100644
--- a/src/main/java/net/gleamynode/netty/buffer/DynamicChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/DynamicChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/buffer/HeapChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/HeapChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/HeapChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/HeapChannelBuffer.java
index 54c12b967f..5542814e15 100644
--- a/src/main/java/net/gleamynode/netty/buffer/HeapChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/HeapChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/main/java/net/gleamynode/netty/buffer/LittleEndianHeapChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/LittleEndianHeapChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/LittleEndianHeapChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/LittleEndianHeapChannelBuffer.java
index d8cc11009f..fbd840e9e5 100644
--- a/src/main/java/net/gleamynode/netty/buffer/LittleEndianHeapChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/LittleEndianHeapChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.nio.ByteOrder;
 
diff --git a/src/main/java/net/gleamynode/netty/buffer/ReadOnlyChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/ReadOnlyChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/ReadOnlyChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/ReadOnlyChannelBuffer.java
index 2ab663d9c6..8a95a27d8a 100644
--- a/src/main/java/net/gleamynode/netty/buffer/ReadOnlyChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/ReadOnlyChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/buffer/SlicedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/SlicedChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/SlicedChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/SlicedChannelBuffer.java
index 2abc1fb655..69ec6194e0 100644
--- a/src/main/java/net/gleamynode/netty/buffer/SlicedChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/SlicedChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/buffer/TruncatedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/TruncatedChannelBuffer.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/buffer/TruncatedChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/TruncatedChannelBuffer.java
index b3b73b6cde..a4b000c94d 100644
--- a/src/main/java/net/gleamynode/netty/buffer/TruncatedChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/TruncatedChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/buffer/WrappedChannelBuffer.java b/src/main/java/org/jboss/netty/buffer/WrappedChannelBuffer.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/buffer/WrappedChannelBuffer.java
rename to src/main/java/org/jboss/netty/buffer/WrappedChannelBuffer.java
index 5514589b34..48ada3e7fe 100644
--- a/src/main/java/net/gleamynode/netty/buffer/WrappedChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/buffer/WrappedChannelBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/buffer/package-info.java b/src/main/java/org/jboss/netty/buffer/package-info.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/buffer/package-info.java
rename to src/main/java/org/jboss/netty/buffer/package-info.java
index 9469185cd7..98f95eb2b8 100644
--- a/src/main/java/net/gleamynode/netty/buffer/package-info.java
+++ b/src/main/java/org/jboss/netty/buffer/package-info.java
@@ -28,4 +28,4 @@
  * @apiviz.landmark
  * @apiviz.exclude ^java\.io\.[^\.]+Stream$
  */
-package net.gleamynode.netty.buffer;
\ No newline at end of file
+package org.jboss.netty.buffer;
\ No newline at end of file
diff --git a/src/main/java/net/gleamynode/netty/channel/AbstractChannel.java b/src/main/java/org/jboss/netty/channel/AbstractChannel.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/channel/AbstractChannel.java
rename to src/main/java/org/jboss/netty/channel/AbstractChannel.java
index 235b84f4a7..c9b789ad23 100644
--- a/src/main/java/net/gleamynode/netty/channel/AbstractChannel.java
+++ b/src/main/java/org/jboss/netty/channel/AbstractChannel.java
@@ -20,13 +20,13 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.net.SocketAddress;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import net.gleamynode.netty.util.TimeBasedUuidGenerator;
+import org.jboss.netty.util.TimeBasedUuidGenerator;
 
 /**
  *
diff --git a/src/main/java/net/gleamynode/netty/channel/AbstractChannelSink.java b/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
similarity index 94%
rename from src/main/java/net/gleamynode/netty/channel/AbstractChannelSink.java
rename to src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
index fc3b356ac6..34f358181e 100644
--- a/src/main/java/net/gleamynode/netty/channel/AbstractChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/AbstractChannelSink.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 /**
  *
diff --git a/src/main/java/net/gleamynode/netty/channel/AbstractServerChannel.java b/src/main/java/org/jboss/netty/channel/AbstractServerChannel.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/channel/AbstractServerChannel.java
rename to src/main/java/org/jboss/netty/channel/AbstractServerChannel.java
index 387db89c31..b760cfa9c3 100644
--- a/src/main/java/net/gleamynode/netty/channel/AbstractServerChannel.java
+++ b/src/main/java/org/jboss/netty/channel/AbstractServerChannel.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/net/gleamynode/netty/channel/Channel.java b/src/main/java/org/jboss/netty/channel/Channel.java
similarity index 92%
rename from src/main/java/net/gleamynode/netty/channel/Channel.java
rename to src/main/java/org/jboss/netty/channel/Channel.java
index 6b24ef5593..e54793981a 100644
--- a/src/main/java/net/gleamynode/netty/channel/Channel.java
+++ b/src/main/java/org/jboss/netty/channel/Channel.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.net.SocketAddress;
 import java.util.UUID;
@@ -34,8 +34,8 @@ import java.util.UUID;
  * @version $Rev$, $Date$
  *
  * @apiviz.landmark
- * @apiviz.composedOf net.gleamynode.netty.channel.ChannelConfig
- * @apiviz.composedOf net.gleamynode.netty.channel.ChannelPipeline
+ * @apiviz.composedOf org.jboss.netty.channel.ChannelConfig
+ * @apiviz.composedOf org.jboss.netty.channel.ChannelPipeline
  */
 public interface Channel {
     static int OP_NONE = 0;
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelConfig.java b/src/main/java/org/jboss/netty/channel/ChannelConfig.java
similarity index 93%
rename from src/main/java/net/gleamynode/netty/channel/ChannelConfig.java
rename to src/main/java/org/jboss/netty/channel/ChannelConfig.java
index e76fb8093d..b74e2a147c 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelConfig.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.util.Map;
 
@@ -32,7 +32,7 @@ import java.util.Map;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.has net.gleamynode.netty.channel.ChannelPipelineFactory
+ * @apiviz.has org.jboss.netty.channel.ChannelPipelineFactory
  */
 public interface ChannelConfig {
     void setOptions(Map<String, Object> options);
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelDownstreamHandler.java b/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/ChannelDownstreamHandler.java
rename to src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java
index f9ac842fad..7b0efe2e87 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelDownstreamHandler.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelDownstreamHandler.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 
 /**
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelEvent.java b/src/main/java/org/jboss/netty/channel/ChannelEvent.java
similarity index 92%
rename from src/main/java/net/gleamynode/netty/channel/ChannelEvent.java
rename to src/main/java/org/jboss/netty/channel/ChannelEvent.java
index f2c094ccde..42798a22f2 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelEvent.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 /**
  *
@@ -30,7 +30,7 @@ package net.gleamynode.netty.channel;
  * @version $Rev$, $Date$
  *
  * @apiviz.landmark
- * @apiviz.composedOf net.gleamynode.netty.channel.ChannelFuture
+ * @apiviz.composedOf org.jboss.netty.channel.ChannelFuture
  */
 public interface ChannelEvent {
     Channel getChannel();
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelException.java b/src/main/java/org/jboss/netty/channel/ChannelException.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/ChannelException.java
rename to src/main/java/org/jboss/netty/channel/ChannelException.java
index 1a44abb127..b1d123a76b 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelException.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelException.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 /**
  *
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelFactory.java b/src/main/java/org/jboss/netty/channel/ChannelFactory.java
similarity index 91%
rename from src/main/java/net/gleamynode/netty/channel/ChannelFactory.java
rename to src/main/java/org/jboss/netty/channel/ChannelFactory.java
index 63b711abee..b4d0d13f06 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 
 /**
@@ -31,7 +31,7 @@ package net.gleamynode.netty.channel;
  * @version $Rev$, $Date$
  *
  * @apiviz.landmark
- * @apiviz.has        net.gleamynode.netty.channel.Channel oneway - - creates
+ * @apiviz.has        org.jboss.netty.channel.Channel oneway - - creates
  */
 public interface ChannelFactory {
     Channel newChannel(ChannelPipeline pipeline);
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelFuture.java b/src/main/java/org/jboss/netty/channel/ChannelFuture.java
similarity index 94%
rename from src/main/java/net/gleamynode/netty/channel/ChannelFuture.java
rename to src/main/java/org/jboss/netty/channel/ChannelFuture.java
index 5ed7900455..31de4a0237 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelFuture.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.util.concurrent.TimeUnit;
 
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit;
  * @version $Rev$, $Date$
  *
  * @apiviz.landmark
- * @apiviz.owns net.gleamynode.netty.channel.ChannelFutureListener - - notifies
+ * @apiviz.owns org.jboss.netty.channel.ChannelFutureListener - - notifies
  */
 public interface ChannelFuture {
     Channel getChannel();
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelFutureListener.java b/src/main/java/org/jboss/netty/channel/ChannelFutureListener.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/channel/ChannelFutureListener.java
rename to src/main/java/org/jboss/netty/channel/ChannelFutureListener.java
index 60cebf3591..1f4de1f52b 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelFutureListener.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelFutureListener.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.util.EventListener;
 
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelHandler.java b/src/main/java/org/jboss/netty/channel/ChannelHandler.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/channel/ChannelHandler.java
rename to src/main/java/org/jboss/netty/channel/ChannelHandler.java
index 2c78790c15..eb6840ad10 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelHandler.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelHandler.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 /**
  *
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelHandlerContext.java b/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java
similarity index 93%
rename from src/main/java/net/gleamynode/netty/channel/ChannelHandlerContext.java
rename to src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java
index 13b6ce3922..3a5e0bc232 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelHandlerContext.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelHandlerContext.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 
 /**
@@ -30,7 +30,7 @@ package net.gleamynode.netty.channel;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.owns net.gleamynode.netty.channel.ChannelHandler
+ * @apiviz.owns org.jboss.netty.channel.ChannelHandler
  */
 public interface ChannelHandlerContext {
     ChannelPipeline getPipeline();
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelPipeline.java b/src/main/java/org/jboss/netty/channel/ChannelPipeline.java
similarity index 90%
rename from src/main/java/net/gleamynode/netty/channel/ChannelPipeline.java
rename to src/main/java/org/jboss/netty/channel/ChannelPipeline.java
index a193e4c02d..fff977babb 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelPipeline.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelPipeline.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.util.Map;
 
@@ -33,9 +33,9 @@ import java.util.Map;
  * @version $Rev$, $Date$
  *
  * @apiviz.landmark
- * @apiviz.composedOf net.gleamynode.netty.channel.ChannelHandlerContext
- * @apiviz.owns       net.gleamynode.netty.channel.ChannelHandler
- * @apiviz.uses       net.gleamynode.netty.channel.ChannelSink - - sends events downstream
+ * @apiviz.composedOf org.jboss.netty.channel.ChannelHandlerContext
+ * @apiviz.owns       org.jboss.netty.channel.ChannelHandler
+ * @apiviz.uses       org.jboss.netty.channel.ChannelSink - - sends events downstream
  */
 public interface ChannelPipeline {
     void addFirst (String name, ChannelHandler handler);
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelPipelineCoverage.java b/src/main/java/org/jboss/netty/channel/ChannelPipelineCoverage.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/ChannelPipelineCoverage.java
rename to src/main/java/org/jboss/netty/channel/ChannelPipelineCoverage.java
index 9c24b31632..4f30f88092 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelPipelineCoverage.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelPipelineCoverage.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelPipelineException.java b/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/ChannelPipelineException.java
rename to src/main/java/org/jboss/netty/channel/ChannelPipelineException.java
index 8a5e427d33..559c15ca33 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelPipelineException.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelPipelineException.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 /**
  *
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelPipelineFactory.java b/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java
similarity index 91%
rename from src/main/java/net/gleamynode/netty/channel/ChannelPipelineFactory.java
rename to src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java
index 4d42822f8a..4712abac35 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelPipelineFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 /**
  *
@@ -29,7 +29,7 @@ package net.gleamynode.netty.channel;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.has net.gleamynode.netty.channel.ChannelPipeline oneway - - creates
+ * @apiviz.has org.jboss.netty.channel.ChannelPipeline oneway - - creates
  */
 public interface ChannelPipelineFactory {
     ChannelPipeline getPipeline() throws Exception;
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelSink.java b/src/main/java/org/jboss/netty/channel/ChannelSink.java
similarity index 91%
rename from src/main/java/net/gleamynode/netty/channel/ChannelSink.java
rename to src/main/java/org/jboss/netty/channel/ChannelSink.java
index fac16af053..53f34588b2 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelSink.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelSink.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 
 /**
@@ -30,7 +30,7 @@ package net.gleamynode.netty.channel;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.uses net.gleamynode.netty.channel.ChannelPipeline - - sends events upstream
+ * @apiviz.uses org.jboss.netty.channel.ChannelPipeline - - sends events upstream
  */
 public interface ChannelSink {
     void eventSunk(ChannelPipeline pipeline, ChannelEvent e) throws Exception;
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelState.java b/src/main/java/org/jboss/netty/channel/ChannelState.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/ChannelState.java
rename to src/main/java/org/jboss/netty/channel/ChannelState.java
index e44d97ae89..18035faaff 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelState.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelState.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 /**
  *
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelStateEvent.java b/src/main/java/org/jboss/netty/channel/ChannelStateEvent.java
similarity index 93%
rename from src/main/java/net/gleamynode/netty/channel/ChannelStateEvent.java
rename to src/main/java/org/jboss/netty/channel/ChannelStateEvent.java
index f37855e1ef..b670a908c6 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelStateEvent.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelStateEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 
 /**
@@ -30,7 +30,7 @@ package net.gleamynode.netty.channel;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.has net.gleamynode.netty.channel.ChannelState
+ * @apiviz.has org.jboss.netty.channel.ChannelState
  */
 public interface ChannelStateEvent extends ChannelEvent {
     ChannelState getState();
diff --git a/src/main/java/net/gleamynode/netty/channel/ChannelUpstreamHandler.java b/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/ChannelUpstreamHandler.java
rename to src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
index 9bf05905a6..d772559b15 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChannelUpstreamHandler.java
+++ b/src/main/java/org/jboss/netty/channel/ChannelUpstreamHandler.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 
 /**
diff --git a/src/main/java/net/gleamynode/netty/channel/Channels.java b/src/main/java/org/jboss/netty/channel/Channels.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/channel/Channels.java
rename to src/main/java/org/jboss/netty/channel/Channels.java
index 39425e285d..8e6717f368 100644
--- a/src/main/java/net/gleamynode/netty/channel/Channels.java
+++ b/src/main/java/org/jboss/netty/channel/Channels.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.net.SocketAddress;
 import java.util.Map;
diff --git a/src/main/java/net/gleamynode/netty/channel/ChildChannelStateEvent.java b/src/main/java/org/jboss/netty/channel/ChildChannelStateEvent.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/ChildChannelStateEvent.java
rename to src/main/java/org/jboss/netty/channel/ChildChannelStateEvent.java
index dee19be5c1..0ecbca3979 100644
--- a/src/main/java/net/gleamynode/netty/channel/ChildChannelStateEvent.java
+++ b/src/main/java/org/jboss/netty/channel/ChildChannelStateEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 /**
  *
diff --git a/src/main/java/net/gleamynode/netty/channel/CompleteChannelFuture.java b/src/main/java/org/jboss/netty/channel/CompleteChannelFuture.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/CompleteChannelFuture.java
rename to src/main/java/org/jboss/netty/channel/CompleteChannelFuture.java
index 2e1879cd44..90a733fbcb 100644
--- a/src/main/java/net/gleamynode/netty/channel/CompleteChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/CompleteChannelFuture.java
@@ -20,11 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.util.concurrent.TimeUnit;
 
-import net.gleamynode.netty.logging.Logger;
+import org.jboss.netty.logging.Logger;
 
 public abstract class CompleteChannelFuture implements ChannelFuture {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/DefaultChannelEvent.java b/src/main/java/org/jboss/netty/channel/DefaultChannelEvent.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/DefaultChannelEvent.java
rename to src/main/java/org/jboss/netty/channel/DefaultChannelEvent.java
index b88280817a..1a0fda46be 100644
--- a/src/main/java/net/gleamynode/netty/channel/DefaultChannelEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChannelEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 public class DefaultChannelEvent implements ChannelEvent {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/DefaultChannelFuture.java b/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/channel/DefaultChannelFuture.java
rename to src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
index 670a86a2fc..1fd3336ecc 100644
--- a/src/main/java/net/gleamynode/netty/channel/DefaultChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
@@ -20,13 +20,13 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import net.gleamynode.netty.logging.Logger;
+import org.jboss.netty.logging.Logger;
 
 
 public class DefaultChannelFuture implements ChannelFuture {
diff --git a/src/main/java/net/gleamynode/netty/channel/DefaultChannelPipeline.java b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/channel/DefaultChannelPipeline.java
rename to src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
index a42073ea08..adf526a8ae 100644
--- a/src/main/java/net/gleamynode/netty/channel/DefaultChannelPipeline.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChannelPipeline.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
-import static net.gleamynode.netty.channel.ChannelPipelineCoverage.*;
+import static org.jboss.netty.channel.ChannelPipelineCoverage.*;
 
 import java.lang.annotation.AnnotationFormatError;
 import java.util.HashMap;
@@ -30,7 +30,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import net.gleamynode.netty.logging.Logger;
+import org.jboss.netty.logging.Logger;
 
 
 public class DefaultChannelPipeline implements ChannelPipeline {
diff --git a/src/main/java/net/gleamynode/netty/channel/DefaultChannelStateEvent.java b/src/main/java/org/jboss/netty/channel/DefaultChannelStateEvent.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/channel/DefaultChannelStateEvent.java
rename to src/main/java/org/jboss/netty/channel/DefaultChannelStateEvent.java
index 089854d96c..8127702f65 100644
--- a/src/main/java/net/gleamynode/netty/channel/DefaultChannelStateEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChannelStateEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 public class DefaultChannelStateEvent extends DefaultChannelEvent implements
         ChannelStateEvent {
diff --git a/src/main/java/net/gleamynode/netty/channel/DefaultChildChannelStateEvent.java b/src/main/java/org/jboss/netty/channel/DefaultChildChannelStateEvent.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/channel/DefaultChildChannelStateEvent.java
rename to src/main/java/org/jboss/netty/channel/DefaultChildChannelStateEvent.java
index b1f44510fa..6897dda8fb 100644
--- a/src/main/java/net/gleamynode/netty/channel/DefaultChildChannelStateEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultChildChannelStateEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 public class DefaultChildChannelStateEvent extends DefaultChannelEvent implements
         ChildChannelStateEvent {
diff --git a/src/main/java/net/gleamynode/netty/channel/DefaultExceptionEvent.java b/src/main/java/org/jboss/netty/channel/DefaultExceptionEvent.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/DefaultExceptionEvent.java
rename to src/main/java/org/jboss/netty/channel/DefaultExceptionEvent.java
index 984b32ceb9..eb2e72354b 100644
--- a/src/main/java/net/gleamynode/netty/channel/DefaultExceptionEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultExceptionEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 
 public class DefaultExceptionEvent extends DefaultChannelEvent implements
diff --git a/src/main/java/net/gleamynode/netty/channel/DefaultMessageEvent.java b/src/main/java/org/jboss/netty/channel/DefaultMessageEvent.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/channel/DefaultMessageEvent.java
rename to src/main/java/org/jboss/netty/channel/DefaultMessageEvent.java
index 292e610cee..30adb6eb7b 100644
--- a/src/main/java/net/gleamynode/netty/channel/DefaultMessageEvent.java
+++ b/src/main/java/org/jboss/netty/channel/DefaultMessageEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/net/gleamynode/netty/channel/ExceptionEvent.java b/src/main/java/org/jboss/netty/channel/ExceptionEvent.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/ExceptionEvent.java
rename to src/main/java/org/jboss/netty/channel/ExceptionEvent.java
index e05f6d98e2..dbb81aaeaa 100644
--- a/src/main/java/net/gleamynode/netty/channel/ExceptionEvent.java
+++ b/src/main/java/org/jboss/netty/channel/ExceptionEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 /**
  *
diff --git a/src/main/java/net/gleamynode/netty/channel/FailedChannelFuture.java b/src/main/java/org/jboss/netty/channel/FailedChannelFuture.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/FailedChannelFuture.java
rename to src/main/java/org/jboss/netty/channel/FailedChannelFuture.java
index c822a40851..98c9505e37 100644
--- a/src/main/java/net/gleamynode/netty/channel/FailedChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/FailedChannelFuture.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 
 public class FailedChannelFuture extends CompleteChannelFuture {
diff --git a/src/main/java/net/gleamynode/netty/channel/MessageEvent.java b/src/main/java/org/jboss/netty/channel/MessageEvent.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/MessageEvent.java
rename to src/main/java/org/jboss/netty/channel/MessageEvent.java
index ad976b7581..1d93988d97 100644
--- a/src/main/java/net/gleamynode/netty/channel/MessageEvent.java
+++ b/src/main/java/org/jboss/netty/channel/MessageEvent.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 import java.net.SocketAddress;
 
diff --git a/src/main/java/net/gleamynode/netty/channel/SimpleChannelHandler.java b/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/channel/SimpleChannelHandler.java
rename to src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
index 1911f7e752..9d3b5ae194 100644
--- a/src/main/java/net/gleamynode/netty/channel/SimpleChannelHandler.java
+++ b/src/main/java/org/jboss/netty/channel/SimpleChannelHandler.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
-import net.gleamynode.netty.logging.Logger;
+import org.jboss.netty.logging.Logger;
 
 
 /**
diff --git a/src/main/java/net/gleamynode/netty/channel/SucceededChannelFuture.java b/src/main/java/org/jboss/netty/channel/SucceededChannelFuture.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/SucceededChannelFuture.java
rename to src/main/java/org/jboss/netty/channel/SucceededChannelFuture.java
index d05fa27658..066c3a491f 100644
--- a/src/main/java/net/gleamynode/netty/channel/SucceededChannelFuture.java
+++ b/src/main/java/org/jboss/netty/channel/SucceededChannelFuture.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel;
+package org.jboss.netty.channel;
 
 
 public class SucceededChannelFuture extends CompleteChannelFuture {
diff --git a/src/main/java/net/gleamynode/netty/channel/package-info.java b/src/main/java/org/jboss/netty/channel/package-info.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/package-info.java
rename to src/main/java/org/jboss/netty/channel/package-info.java
index ebc6dee5f6..e5e59972b2 100644
--- a/src/main/java/net/gleamynode/netty/channel/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/package-info.java
@@ -34,4 +34,4 @@
  * @apiviz.exclude \.[A-Za-z]+ChannelFuture$
  * @apiviz.exclude \.ChannelState$
  */
-package net.gleamynode.netty.channel;
\ No newline at end of file
+package org.jboss.netty.channel;
\ No newline at end of file
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/ClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/ClientSocketChannelFactory.java
similarity index 84%
rename from src/main/java/net/gleamynode/netty/channel/socket/ClientSocketChannelFactory.java
rename to src/main/java/org/jboss/netty/channel/socket/ClientSocketChannelFactory.java
index 6b0d9cfbb1..70ca701234 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/ClientSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/ClientSocketChannelFactory.java
@@ -20,10 +20,10 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket;
+package org.jboss.netty.channel.socket;
 
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
@@ -31,7 +31,7 @@ import net.gleamynode.netty.channel.ChannelPipeline;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.has net.gleamynode.netty.channel.socket.SocketChannel oneway - - creates
+ * @apiviz.has org.jboss.netty.channel.socket.SocketChannel oneway - - creates
  */
 public interface ClientSocketChannelFactory extends ChannelFactory {
     SocketChannel newChannel(ChannelPipeline pipeline);
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/DefaultServerSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/channel/socket/DefaultServerSocketChannelConfig.java
rename to src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java
index adc755e205..b9f95119a9 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/DefaultServerSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/DefaultServerSocketChannelConfig.java
@@ -20,16 +20,16 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket;
+package org.jboss.netty.channel.socket;
 
 import java.net.ServerSocket;
 import java.net.SocketException;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelPipelineFactory;
-import net.gleamynode.netty.util.ConvertUtil;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.util.ConvertUtil;
 
 public class DefaultServerSocketChannelConfig implements ServerSocketChannelConfig {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/DefaultSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/socket/DefaultSocketChannelConfig.java
rename to src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java
index 1c218f28d3..fb77688505 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/DefaultSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/DefaultSocketChannelConfig.java
@@ -20,16 +20,16 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket;
+package org.jboss.netty.channel.socket;
 
 import java.net.Socket;
 import java.net.SocketException;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelPipelineFactory;
-import net.gleamynode.netty.util.ConvertUtil;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.util.ConvertUtil;
 
 public class DefaultSocketChannelConfig implements SocketChannelConfig {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/ServerSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannel.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/channel/socket/ServerSocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/ServerSocketChannel.java
index c04b1f7306..98a86a7ce6 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/ServerSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannel.java
@@ -20,11 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket;
+package org.jboss.netty.channel.socket;
 
 import java.net.InetSocketAddress;
 
-import net.gleamynode.netty.channel.Channel;
+import org.jboss.netty.channel.Channel;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
@@ -32,7 +32,7 @@ import net.gleamynode.netty.channel.Channel;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.composedOf net.gleamynode.netty.channel.socket.ServerSocketChannelConfig
+ * @apiviz.composedOf org.jboss.netty.channel.socket.ServerSocketChannelConfig
  */
 public interface ServerSocketChannel extends Channel {
     ServerSocketChannelConfig getConfig();
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/ServerSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelConfig.java
similarity index 93%
rename from src/main/java/net/gleamynode/netty/channel/socket/ServerSocketChannelConfig.java
rename to src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelConfig.java
index e691539e03..4179d2c611 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/ServerSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelConfig.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket;
+package org.jboss.netty.channel.socket;
 
-import net.gleamynode.netty.channel.ChannelConfig;
+import org.jboss.netty.channel.ChannelConfig;
 
 public interface ServerSocketChannelConfig extends ChannelConfig {
     int getBacklog();
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/ServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelFactory.java
similarity index 84%
rename from src/main/java/net/gleamynode/netty/channel/socket/ServerSocketChannelFactory.java
rename to src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelFactory.java
index 8b47f3aea2..62632eabbc 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/ServerSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/ServerSocketChannelFactory.java
@@ -20,10 +20,10 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket;
+package org.jboss.netty.channel.socket;
 
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
@@ -31,7 +31,7 @@ import net.gleamynode.netty.channel.ChannelPipeline;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.has net.gleamynode.netty.channel.socket.ServerSocketChannel oneway - - creates
+ * @apiviz.has org.jboss.netty.channel.socket.ServerSocketChannel oneway - - creates
  */
 public interface ServerSocketChannelFactory extends ChannelFactory {
     ServerSocketChannel newChannel(ChannelPipeline pipeline);
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/SocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/SocketChannel.java
similarity index 89%
rename from src/main/java/net/gleamynode/netty/channel/socket/SocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/SocketChannel.java
index c9e5a3b526..a0c61ec01e 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/SocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/SocketChannel.java
@@ -20,11 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket;
+package org.jboss.netty.channel.socket;
 
 import java.net.InetSocketAddress;
 
-import net.gleamynode.netty.channel.Channel;
+import org.jboss.netty.channel.Channel;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
@@ -32,7 +32,7 @@ import net.gleamynode.netty.channel.Channel;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.composedOf net.gleamynode.netty.channel.socket.SocketChannelConfig
+ * @apiviz.composedOf org.jboss.netty.channel.socket.SocketChannelConfig
  */
 public interface SocketChannel extends Channel {
     SocketChannelConfig getConfig();
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/SocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/SocketChannelConfig.java
similarity index 94%
rename from src/main/java/net/gleamynode/netty/channel/socket/SocketChannelConfig.java
rename to src/main/java/org/jboss/netty/channel/socket/SocketChannelConfig.java
index 5c65a280b0..13d814213d 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/SocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/SocketChannelConfig.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket;
+package org.jboss.netty.channel.socket;
 
-import net.gleamynode.netty.channel.ChannelConfig;
+import org.jboss.netty.channel.ChannelConfig;
 
 public interface SocketChannelConfig extends ChannelConfig {
     boolean isTcpNoDelay();
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
similarity index 94%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
index 9b1cc1abeb..a0897fab2d 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultNioSocketChannelConfig.java
@@ -20,12 +20,12 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
 import java.net.Socket;
 
-import net.gleamynode.netty.channel.socket.DefaultSocketChannelConfig;
-import net.gleamynode.netty.util.ConvertUtil;
+import org.jboss.netty.channel.socket.DefaultSocketChannelConfig;
+import org.jboss.netty.util.ConvertUtil;
 
 class DefaultNioSocketChannelConfig extends DefaultSocketChannelConfig
         implements NioSocketChannelConfig {
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java
index da35f1cbaf..fe0956f728 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/DefaultReceiveBufferSizePredictor.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
 public class DefaultReceiveBufferSizePredictor implements
         ReceiveBufferSizePredictor {
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioAcceptedSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
similarity index 86%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioAcceptedSocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
index bdd59c1b41..0daa732b7f 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioAcceptedSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
@@ -20,16 +20,16 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
 import java.io.IOException;
 import java.nio.channels.SocketChannel;
 
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
 
 class NioAcceptedSocketChannel extends NioSocketChannel {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioClientSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java
similarity index 87%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioClientSocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java
index 60d2703703..885505c3cf 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioClientSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannel.java
@@ -20,19 +20,19 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.nio.channels.SocketChannel;
 
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
-import net.gleamynode.netty.logging.Logger;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.logging.Logger;
 
 class NioClientSocketChannel extends NioSocketChannel {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioClientSocketChannelFactory.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java
index b38bcad63a..cba1c7ccfb 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioClientSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketChannelFactory.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
 import java.util.concurrent.Executor;
 
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
-import net.gleamynode.netty.channel.socket.ClientSocketChannelFactory;
-import net.gleamynode.netty.channel.socket.SocketChannel;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.SocketChannel;
 
 public class NioClientSocketChannelFactory implements ClientSocketChannelFactory {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
similarity index 94%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioClientSocketPipelineSink.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
index edbd17dd3d..fefb909618 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioClientSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -35,17 +35,17 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import net.gleamynode.netty.channel.AbstractChannelSink;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelFutureListener;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelState;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.logging.Logger;
-import net.gleamynode.netty.util.NamePreservingRunnable;
+import org.jboss.netty.channel.AbstractChannelSink;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.logging.Logger;
+import org.jboss.netty.util.NamePreservingRunnable;
 
 class NioClientSocketPipelineSink extends AbstractChannelSink {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioServerSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java
similarity index 80%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioServerSocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java
index df18c70bad..530cc9f427 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioServerSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannel.java
@@ -20,26 +20,26 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.nio.channels.ServerSocketChannel;
 
-import net.gleamynode.netty.channel.AbstractServerChannel;
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
-import net.gleamynode.netty.channel.socket.DefaultServerSocketChannelConfig;
-import net.gleamynode.netty.channel.socket.ServerSocketChannelConfig;
-import net.gleamynode.netty.logging.Logger;
+import org.jboss.netty.channel.AbstractServerChannel;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.socket.DefaultServerSocketChannelConfig;
+import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+import org.jboss.netty.logging.Logger;
 
 class NioServerSocketChannel extends AbstractServerChannel
-                             implements net.gleamynode.netty.channel.socket.ServerSocketChannel {
+                             implements org.jboss.netty.channel.socket.ServerSocketChannel {
 
     private static final Logger logger =
         Logger.getLogger(NioServerSocketChannel.class);
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioServerSocketChannelFactory.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java
index 0f5c0da412..6953227471 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioServerSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketChannelFactory.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
 import java.util.concurrent.Executor;
 
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
-import net.gleamynode.netty.channel.socket.ServerSocketChannel;
-import net.gleamynode.netty.channel.socket.ServerSocketChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
 
 public class NioServerSocketChannelFactory implements ServerSocketChannelFactory {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioServerSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java
similarity index 92%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioServerSocketPipelineSink.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java
index ab522addbc..83580757ea 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioServerSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioServerSocketPipelineSink.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -32,16 +32,16 @@ import java.nio.channels.SocketChannel;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import net.gleamynode.netty.channel.AbstractChannelSink;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelState;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.logging.Logger;
-import net.gleamynode.netty.util.NamePreservingRunnable;
+import org.jboss.netty.channel.AbstractChannelSink;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.logging.Logger;
+import org.jboss.netty.util.NamePreservingRunnable;
 
 class NioServerSocketPipelineSink extends AbstractChannelSink {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
similarity index 86%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioSocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
index 471c35f275..6037a232fc 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannel.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -28,13 +28,13 @@ import java.nio.channels.SocketChannel;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import net.gleamynode.netty.channel.AbstractChannel;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
-import net.gleamynode.netty.channel.MessageEvent;
+import org.jboss.netty.channel.AbstractChannel;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.MessageEvent;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
@@ -44,7 +44,7 @@ import net.gleamynode.netty.channel.MessageEvent;
  *
  */
 abstract class NioSocketChannel extends AbstractChannel
-                                implements net.gleamynode.netty.channel.socket.SocketChannel {
+                                implements org.jboss.netty.channel.socket.SocketChannel {
 
     final SocketChannel socket;
     private final NioSocketChannelConfig config;
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioSocketChannelConfig.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
similarity index 90%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioSocketChannelConfig.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
index 2c2348a23c..62bcaa06d2 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioSocketChannelConfig.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioSocketChannelConfig.java
@@ -20,12 +20,12 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-import net.gleamynode.netty.channel.socket.SocketChannelConfig;
+import org.jboss.netty.channel.socket.SocketChannelConfig;
 
 /**
  *
@@ -34,7 +34,7 @@ import net.gleamynode.netty.channel.socket.SocketChannelConfig;
  *
  * @version $Rev$, $Date$
  *
- * @apiviz.has net.gleamynode.netty.channel.socket.nio.ReceiveBufferSizePredictor
+ * @apiviz.has org.jboss.netty.channel.socket.nio.ReceiveBufferSizePredictor
  */
 public interface NioSocketChannelConfig extends SocketChannelConfig {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/NioWorker.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
index 5223cdf2d4..e00eb25d02 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/NioWorker.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -35,13 +35,13 @@ import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBuffers;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.logging.Logger;
-import net.gleamynode.netty.util.NamePreservingRunnable;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.logging.Logger;
+import org.jboss.netty.util.NamePreservingRunnable;
 
 class NioWorker implements Runnable {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/ReceiveBufferSizePredictor.java b/src/main/java/org/jboss/netty/channel/socket/nio/ReceiveBufferSizePredictor.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/ReceiveBufferSizePredictor.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/ReceiveBufferSizePredictor.java
index 45acb5ff57..cbb38a55cf 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/ReceiveBufferSizePredictor.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/ReceiveBufferSizePredictor.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
 
 public interface ReceiveBufferSizePredictor {
     int nextReceiveBufferSize();
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/nio/package-info.java b/src/main/java/org/jboss/netty/channel/socket/nio/package-info.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/channel/socket/nio/package-info.java
rename to src/main/java/org/jboss/netty/channel/socket/nio/package-info.java
index 7350ead8ed..f94b63f55a 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/nio/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/package-info.java
@@ -25,4 +25,4 @@
  * <a href="http://en.wikipedia.org/wiki/New_I/O">NIO</a>-based socket channel
  * API implementation - recommended for large number of connections (&gt; 1000).
  */
-package net.gleamynode.netty.channel.socket.nio;
+package org.jboss.netty.channel.socket.nio;
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioAcceptedSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java
similarity index 87%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/OioAcceptedSocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java
index 160cde9fcf..16e2974e8c 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioAcceptedSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioAcceptedSocketChannel.java
@@ -20,20 +20,20 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
 import java.net.Socket;
 
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
 
 class OioAcceptedSocketChannel extends OioSocketChannel {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioClientSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java
similarity index 89%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/OioClientSocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java
index 08502ce04a..6607dcbdb6 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioClientSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannel.java
@@ -20,17 +20,17 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
 import java.net.Socket;
 
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
 
 class OioClientSocketChannel extends OioSocketChannel {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioClientSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java
similarity index 87%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/OioClientSocketChannelFactory.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java
index 9acb76faa8..f056cdb034 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioClientSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketChannelFactory.java
@@ -20,13 +20,13 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
 
 import java.util.concurrent.Executor;
 
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.socket.ClientSocketChannelFactory;
-import net.gleamynode.netty.channel.socket.SocketChannel;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.socket.ClientSocketChannelFactory;
+import org.jboss.netty.channel.socket.SocketChannel;
 
 public class OioClientSocketChannelFactory implements ClientSocketChannelFactory {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
similarity index 89%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/OioClientSocketPipelineSink.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
index 2e1f88f5b7..43ca159b73 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioClientSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioClientSocketPipelineSink.java
@@ -20,23 +20,23 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.PushbackInputStream;
 import java.net.SocketAddress;
 import java.util.concurrent.Executor;
 
-import net.gleamynode.netty.channel.AbstractChannelSink;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelFutureListener;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelState;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.util.NamePreservingRunnable;
+import org.jboss.netty.channel.AbstractChannelSink;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.util.NamePreservingRunnable;
 
 class OioClientSocketPipelineSink extends AbstractChannelSink {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioServerSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java
similarity index 81%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/OioServerSocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java
index 5f98f2727c..db0b1c4dd2 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioServerSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannel.java
@@ -20,24 +20,24 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 
-import net.gleamynode.netty.channel.AbstractServerChannel;
-import net.gleamynode.netty.channel.ChannelException;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
-import net.gleamynode.netty.channel.socket.DefaultServerSocketChannelConfig;
-import net.gleamynode.netty.channel.socket.ServerSocketChannel;
-import net.gleamynode.netty.channel.socket.ServerSocketChannelConfig;
-import net.gleamynode.netty.logging.Logger;
+import org.jboss.netty.channel.AbstractServerChannel;
+import org.jboss.netty.channel.ChannelException;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.socket.DefaultServerSocketChannelConfig;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jboss.netty.channel.socket.ServerSocketChannelConfig;
+import org.jboss.netty.logging.Logger;
 
 class OioServerSocketChannel extends AbstractServerChannel
                              implements ServerSocketChannel {
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioServerSocketChannelFactory.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java
similarity index 86%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/OioServerSocketChannelFactory.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java
index 55a24958d8..91a018ff52 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioServerSocketChannelFactory.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketChannelFactory.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
 
 import java.util.concurrent.Executor;
 
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
-import net.gleamynode.netty.channel.socket.ServerSocketChannel;
-import net.gleamynode.netty.channel.socket.ServerSocketChannelFactory;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.socket.ServerSocketChannel;
+import org.jboss.netty.channel.socket.ServerSocketChannelFactory;
 
 public class OioServerSocketChannelFactory implements ServerSocketChannelFactory {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioServerSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
similarity index 92%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/OioServerSocketPipelineSink.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
index 0fd1c2ffb9..321f750418 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioServerSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioServerSocketPipelineSink.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.IOException;
 import java.net.Socket;
@@ -30,16 +30,16 @@ import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
 import java.util.concurrent.Executor;
 
-import net.gleamynode.netty.channel.AbstractChannelSink;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelState;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.logging.Logger;
-import net.gleamynode.netty.util.NamePreservingRunnable;
+import org.jboss.netty.channel.AbstractChannelSink;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.logging.Logger;
+import org.jboss.netty.util.NamePreservingRunnable;
 
 class OioServerSocketPipelineSink extends AbstractChannelSink {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java
similarity index 84%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/OioSocketChannel.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java
index 512140e192..c7b9cd289e 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioSocketChannel.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
 
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
@@ -28,15 +28,15 @@ import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
 
-import net.gleamynode.netty.channel.AbstractChannel;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelSink;
-import net.gleamynode.netty.channel.socket.DefaultSocketChannelConfig;
-import net.gleamynode.netty.channel.socket.SocketChannel;
-import net.gleamynode.netty.channel.socket.SocketChannelConfig;
+import org.jboss.netty.channel.AbstractChannel;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelSink;
+import org.jboss.netty.channel.socket.DefaultSocketChannelConfig;
+import org.jboss.netty.channel.socket.SocketChannel;
+import org.jboss.netty.channel.socket.SocketChannelConfig;
 
 abstract class OioSocketChannel extends AbstractChannel
                                 implements SocketChannel {
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioWorker.java b/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java
similarity index 94%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/OioWorker.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java
index 6a9558e353..0dda137b52 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/OioWorker.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/OioWorker.java
@@ -20,17 +20,17 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.OutputStream;
 import java.io.PushbackInputStream;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBuffers;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelFuture;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFuture;
 
 class OioWorker implements Runnable {
 
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/oio/package-info.java b/src/main/java/org/jboss/netty/channel/socket/oio/package-info.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/channel/socket/oio/package-info.java
rename to src/main/java/org/jboss/netty/channel/socket/oio/package-info.java
index 6ad36ea2e7..d390c3fcd4 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/oio/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/socket/oio/package-info.java
@@ -25,4 +25,4 @@
  * Old blocking I/O based socket channel API implementation - recommended for
  * small number of connections (&lt; 1000).
  */
-package net.gleamynode.netty.channel.socket.oio;
+package org.jboss.netty.channel.socket.oio;
diff --git a/src/main/java/net/gleamynode/netty/channel/socket/package-info.java b/src/main/java/org/jboss/netty/channel/socket/package-info.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/channel/socket/package-info.java
rename to src/main/java/org/jboss/netty/channel/socket/package-info.java
index 36ee325639..8dc1b8b4b1 100644
--- a/src/main/java/net/gleamynode/netty/channel/socket/package-info.java
+++ b/src/main/java/org/jboss/netty/channel/socket/package-info.java
@@ -24,4 +24,4 @@
 /**
  * Abstract TCP and UDP socket interfaces which extend the core channel API.
  */
-package net.gleamynode.netty.channel.socket;
+package org.jboss.netty.channel.socket;
diff --git a/src/main/java/net/gleamynode/netty/example/discard/DiscardClient.java b/src/main/java/org/jboss/netty/example/discard/DiscardClient.java
similarity index 91%
rename from src/main/java/net/gleamynode/netty/example/discard/DiscardClient.java
rename to src/main/java/org/jboss/netty/example/discard/DiscardClient.java
index 641eedb9c9..891fd32f7c 100644
--- a/src/main/java/net/gleamynode/netty/example/discard/DiscardClient.java
+++ b/src/main/java/org/jboss/netty/example/discard/DiscardClient.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.discard;
+package org.jboss.netty.example.discard;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ClientBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 public class DiscardClient {
 
diff --git a/src/main/java/net/gleamynode/netty/example/discard/DiscardHandler.java b/src/main/java/org/jboss/netty/example/discard/DiscardHandler.java
similarity index 85%
rename from src/main/java/net/gleamynode/netty/example/discard/DiscardHandler.java
rename to src/main/java/org/jboss/netty/example/discard/DiscardHandler.java
index ecaec862ca..846efecde1 100644
--- a/src/main/java/net/gleamynode/netty/example/discard/DiscardHandler.java
+++ b/src/main/java/org/jboss/netty/example/discard/DiscardHandler.java
@@ -20,23 +20,23 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.discard;
+package org.jboss.netty.example.discard;
 
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBuffers;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 @ChannelPipelineCoverage("all")
 public class DiscardHandler extends SimpleChannelHandler {
diff --git a/src/main/java/net/gleamynode/netty/example/discard/DiscardServer.java b/src/main/java/org/jboss/netty/example/discard/DiscardServer.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/example/discard/DiscardServer.java
rename to src/main/java/org/jboss/netty/example/discard/DiscardServer.java
index 97e3022f16..5ca21b8618 100644
--- a/src/main/java/net/gleamynode/netty/example/discard/DiscardServer.java
+++ b/src/main/java/org/jboss/netty/example/discard/DiscardServer.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.discard;
+package org.jboss.netty.example.discard;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ServerBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 public class DiscardServer {
 
diff --git a/src/main/java/net/gleamynode/netty/example/discard/ThroughputMonitor.java b/src/main/java/org/jboss/netty/example/discard/ThroughputMonitor.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/example/discard/ThroughputMonitor.java
rename to src/main/java/org/jboss/netty/example/discard/ThroughputMonitor.java
index 8a7218be26..4538f87a36 100644
--- a/src/main/java/net/gleamynode/netty/example/discard/ThroughputMonitor.java
+++ b/src/main/java/org/jboss/netty/example/discard/ThroughputMonitor.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.discard;
+package org.jboss.netty.example.discard;
 
 public class ThroughputMonitor extends Thread {
 
diff --git a/src/main/java/net/gleamynode/netty/example/echo/EchoClient.java b/src/main/java/org/jboss/netty/example/echo/EchoClient.java
similarity index 91%
rename from src/main/java/net/gleamynode/netty/example/echo/EchoClient.java
rename to src/main/java/org/jboss/netty/example/echo/EchoClient.java
index 429aed6ba5..30cfb18ccf 100644
--- a/src/main/java/net/gleamynode/netty/example/echo/EchoClient.java
+++ b/src/main/java/org/jboss/netty/example/echo/EchoClient.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.echo;
+package org.jboss.netty.example.echo;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ClientBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 public class EchoClient {
 
diff --git a/src/main/java/net/gleamynode/netty/example/echo/EchoHandler.java b/src/main/java/org/jboss/netty/example/echo/EchoHandler.java
similarity index 84%
rename from src/main/java/net/gleamynode/netty/example/echo/EchoHandler.java
rename to src/main/java/org/jboss/netty/example/echo/EchoHandler.java
index fea0a20b1e..2bf2728b0a 100644
--- a/src/main/java/net/gleamynode/netty/example/echo/EchoHandler.java
+++ b/src/main/java/org/jboss/netty/example/echo/EchoHandler.java
@@ -20,21 +20,21 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.echo;
+package org.jboss.netty.example.echo;
 
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBuffers;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 @ChannelPipelineCoverage("all")
 public class EchoHandler extends SimpleChannelHandler {
diff --git a/src/main/java/net/gleamynode/netty/example/echo/EchoServer.java b/src/main/java/org/jboss/netty/example/echo/EchoServer.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/example/echo/EchoServer.java
rename to src/main/java/org/jboss/netty/example/echo/EchoServer.java
index a355437f78..bd04abc3ce 100644
--- a/src/main/java/net/gleamynode/netty/example/echo/EchoServer.java
+++ b/src/main/java/org/jboss/netty/example/echo/EchoServer.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.echo;
+package org.jboss.netty.example.echo;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ServerBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 public class EchoServer {
 
diff --git a/src/main/java/net/gleamynode/netty/example/echo/ThroughputMonitor.java b/src/main/java/org/jboss/netty/example/echo/ThroughputMonitor.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/example/echo/ThroughputMonitor.java
rename to src/main/java/org/jboss/netty/example/echo/ThroughputMonitor.java
index c940e18a46..c484a76bd3 100644
--- a/src/main/java/net/gleamynode/netty/example/echo/ThroughputMonitor.java
+++ b/src/main/java/org/jboss/netty/example/echo/ThroughputMonitor.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.echo;
+package org.jboss.netty.example.echo;
 
 public class ThroughputMonitor extends Thread {
 
diff --git a/src/main/java/net/gleamynode/netty/example/factorial/BigIntegerDecoder.java b/src/main/java/org/jboss/netty/example/factorial/BigIntegerDecoder.java
similarity index 87%
rename from src/main/java/net/gleamynode/netty/example/factorial/BigIntegerDecoder.java
rename to src/main/java/org/jboss/netty/example/factorial/BigIntegerDecoder.java
index db1681dad1..0fcc859b5a 100644
--- a/src/main/java/net/gleamynode/netty/example/factorial/BigIntegerDecoder.java
+++ b/src/main/java/org/jboss/netty/example/factorial/BigIntegerDecoder.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.factorial;
+package org.jboss.netty.example.factorial;
 
 import java.math.BigInteger;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.handler.codec.frame.FrameDecoder;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/example/factorial/FactorialClient.java b/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java
similarity index 91%
rename from src/main/java/net/gleamynode/netty/example/factorial/FactorialClient.java
rename to src/main/java/org/jboss/netty/example/factorial/FactorialClient.java
index 7e12b89267..7609713168 100644
--- a/src/main/java/net/gleamynode/netty/example/factorial/FactorialClient.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialClient.java
@@ -20,15 +20,15 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.factorial;
+package org.jboss.netty.example.factorial;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ClientBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 public class FactorialClient {
 
diff --git a/src/main/java/net/gleamynode/netty/example/factorial/FactorialClientHandler.java b/src/main/java/org/jboss/netty/example/factorial/FactorialClientHandler.java
similarity index 85%
rename from src/main/java/net/gleamynode/netty/example/factorial/FactorialClientHandler.java
rename to src/main/java/org/jboss/netty/example/factorial/FactorialClientHandler.java
index c93cb63ac9..5bf11b9f58 100644
--- a/src/main/java/net/gleamynode/netty/example/factorial/FactorialClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialClientHandler.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.factorial;
+package org.jboss.netty.example.factorial;
 
 import java.math.BigInteger;
 import java.util.concurrent.BlockingQueue;
@@ -28,16 +28,16 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelFutureListener;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 @ChannelPipelineCoverage("one")
 public class FactorialClientHandler extends SimpleChannelHandler {
diff --git a/src/main/java/net/gleamynode/netty/example/factorial/FactorialClientPipelineFactory.java b/src/main/java/org/jboss/netty/example/factorial/FactorialClientPipelineFactory.java
similarity index 89%
rename from src/main/java/net/gleamynode/netty/example/factorial/FactorialClientPipelineFactory.java
rename to src/main/java/org/jboss/netty/example/factorial/FactorialClientPipelineFactory.java
index 17658e3c63..e56a5c2f6b 100644
--- a/src/main/java/net/gleamynode/netty/example/factorial/FactorialClientPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialClientPipelineFactory.java
@@ -20,11 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.factorial;
+package org.jboss.netty.example.factorial;
 
-import static net.gleamynode.netty.channel.Channels.*;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelPipelineFactory;
+import static org.jboss.netty.channel.Channels.*;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/example/factorial/FactorialProtocolException.java b/src/main/java/org/jboss/netty/example/factorial/FactorialProtocolException.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/example/factorial/FactorialProtocolException.java
rename to src/main/java/org/jboss/netty/example/factorial/FactorialProtocolException.java
index 6f84097552..2aacf7fb42 100644
--- a/src/main/java/net/gleamynode/netty/example/factorial/FactorialProtocolException.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialProtocolException.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.factorial;
+package org.jboss.netty.example.factorial;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/example/factorial/FactorialServer.java b/src/main/java/org/jboss/netty/example/factorial/FactorialServer.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/example/factorial/FactorialServer.java
rename to src/main/java/org/jboss/netty/example/factorial/FactorialServer.java
index b08e004f4c..d756273b71 100644
--- a/src/main/java/net/gleamynode/netty/example/factorial/FactorialServer.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialServer.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.factorial;
+package org.jboss.netty.example.factorial;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ServerBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 public class FactorialServer {
 
diff --git a/src/main/java/net/gleamynode/netty/example/factorial/FactorialServerHandler.java b/src/main/java/org/jboss/netty/example/factorial/FactorialServerHandler.java
similarity index 86%
rename from src/main/java/net/gleamynode/netty/example/factorial/FactorialServerHandler.java
rename to src/main/java/org/jboss/netty/example/factorial/FactorialServerHandler.java
index 469a92da2a..2bdf7cf9fb 100644
--- a/src/main/java/net/gleamynode/netty/example/factorial/FactorialServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialServerHandler.java
@@ -20,20 +20,20 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.factorial;
+package org.jboss.netty.example.factorial;
 
 import java.math.BigInteger;
 import java.util.Formatter;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 @ChannelPipelineCoverage("one")
 public class FactorialServerHandler extends SimpleChannelHandler {
diff --git a/src/main/java/net/gleamynode/netty/example/factorial/FactorialServerPipelineFactory.java b/src/main/java/org/jboss/netty/example/factorial/FactorialServerPipelineFactory.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/example/factorial/FactorialServerPipelineFactory.java
rename to src/main/java/org/jboss/netty/example/factorial/FactorialServerPipelineFactory.java
index d2dc7a8b21..1c9b36dace 100644
--- a/src/main/java/net/gleamynode/netty/example/factorial/FactorialServerPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/factorial/FactorialServerPipelineFactory.java
@@ -20,11 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.factorial;
+package org.jboss.netty.example.factorial;
 
-import static net.gleamynode.netty.channel.Channels.*;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelPipelineFactory;
+import static org.jboss.netty.channel.Channels.*;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/example/factorial/NumberEncoder.java b/src/main/java/org/jboss/netty/example/factorial/NumberEncoder.java
similarity index 83%
rename from src/main/java/net/gleamynode/netty/example/factorial/NumberEncoder.java
rename to src/main/java/org/jboss/netty/example/factorial/NumberEncoder.java
index e51b70966f..aa8d671f93 100644
--- a/src/main/java/net/gleamynode/netty/example/factorial/NumberEncoder.java
+++ b/src/main/java/org/jboss/netty/example/factorial/NumberEncoder.java
@@ -20,19 +20,19 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.factorial;
+package org.jboss.netty.example.factorial;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.math.BigInteger;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBuffers;
-import net.gleamynode.netty.channel.ChannelDownstreamHandler;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.MessageEvent;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelDownstreamHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.MessageEvent;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/example/objectecho/ObjectEchoClient.java b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClient.java
similarity index 91%
rename from src/main/java/net/gleamynode/netty/example/objectecho/ObjectEchoClient.java
rename to src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClient.java
index f416e72304..62be25bc17 100644
--- a/src/main/java/net/gleamynode/netty/example/objectecho/ObjectEchoClient.java
+++ b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoClient.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.objectecho;
+package org.jboss.netty.example.objectecho;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ClientBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 public class ObjectEchoClient {
 
diff --git a/src/main/java/net/gleamynode/netty/example/objectecho/ObjectEchoHandler.java b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoHandler.java
similarity index 84%
rename from src/main/java/net/gleamynode/netty/example/objectecho/ObjectEchoHandler.java
rename to src/main/java/org/jboss/netty/example/objectecho/ObjectEchoHandler.java
index 93adb04765..6129928c50 100644
--- a/src/main/java/net/gleamynode/netty/example/objectecho/ObjectEchoHandler.java
+++ b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoHandler.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.objectecho;
+package org.jboss.netty.example.objectecho;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,16 +28,16 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelState;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
-import net.gleamynode.netty.handler.codec.serialization.ObjectDecoder;
-import net.gleamynode.netty.handler.codec.serialization.ObjectEncoder;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.handler.codec.serialization.ObjectDecoder;
+import org.jboss.netty.handler.codec.serialization.ObjectEncoder;
 
 @ChannelPipelineCoverage("all")
 public class ObjectEchoHandler extends SimpleChannelHandler {
diff --git a/src/main/java/net/gleamynode/netty/example/objectecho/ObjectEchoServer.java b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServer.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/example/objectecho/ObjectEchoServer.java
rename to src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServer.java
index d35a8d92cf..07cfc95038 100644
--- a/src/main/java/net/gleamynode/netty/example/objectecho/ObjectEchoServer.java
+++ b/src/main/java/org/jboss/netty/example/objectecho/ObjectEchoServer.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.objectecho;
+package org.jboss.netty.example.objectecho;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ServerBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 public class ObjectEchoServer {
 
diff --git a/src/main/java/net/gleamynode/netty/example/objectecho/ThroughputMonitor.java b/src/main/java/org/jboss/netty/example/objectecho/ThroughputMonitor.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/example/objectecho/ThroughputMonitor.java
rename to src/main/java/org/jboss/netty/example/objectecho/ThroughputMonitor.java
index 5e72360e8c..1404421128 100644
--- a/src/main/java/net/gleamynode/netty/example/objectecho/ThroughputMonitor.java
+++ b/src/main/java/org/jboss/netty/example/objectecho/ThroughputMonitor.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.objectecho;
+package org.jboss.netty.example.objectecho;
 
 public class ThroughputMonitor extends Thread {
 
diff --git a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatClient.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java
similarity index 90%
rename from src/main/java/net/gleamynode/netty/example/securechat/SecureChatClient.java
rename to src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java
index fc01ca4e0f..5b0e428415 100644
--- a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatClient.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatClient.java
@@ -20,18 +20,18 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.securechat;
+package org.jboss.netty.example.securechat;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ClientBootstrap;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 public class SecureChatClient {
 
diff --git a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatClientHandler.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatClientHandler.java
similarity index 82%
rename from src/main/java/net/gleamynode/netty/example/securechat/SecureChatClientHandler.java
rename to src/main/java/org/jboss/netty/example/securechat/SecureChatClientHandler.java
index 24537ad6d4..075d9d83db 100644
--- a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatClientHandler.java
@@ -20,19 +20,19 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.securechat;
+package org.jboss.netty.example.securechat;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
-import net.gleamynode.netty.handler.ssl.SslHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.handler.ssl.SslHandler;
 
 @ChannelPipelineCoverage("all")
 public class SecureChatClientHandler extends SimpleChannelHandler {
diff --git a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatKeyStore.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatKeyStore.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/example/securechat/SecureChatKeyStore.java
rename to src/main/java/org/jboss/netty/example/securechat/SecureChatKeyStore.java
index 16db3ca160..c9a0e3c747 100644
--- a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatKeyStore.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatKeyStore.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.securechat;
+package org.jboss.netty.example.securechat;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatPipelineFactory.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatPipelineFactory.java
similarity index 81%
rename from src/main/java/net/gleamynode/netty/example/securechat/SecureChatPipelineFactory.java
rename to src/main/java/org/jboss/netty/example/securechat/SecureChatPipelineFactory.java
index fdfc78fa10..c459d3da5d 100644
--- a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatPipelineFactory.java
@@ -20,20 +20,20 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.securechat;
+package org.jboss.netty.example.securechat;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import javax.net.ssl.SSLEngine;
 
-import net.gleamynode.netty.channel.ChannelHandler;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelPipelineFactory;
-import net.gleamynode.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import net.gleamynode.netty.handler.codec.frame.Delimiters;
-import net.gleamynode.netty.handler.codec.string.StringDecoder;
-import net.gleamynode.netty.handler.codec.string.StringEncoder;
-import net.gleamynode.netty.handler.ssl.SslHandler;
+import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import org.jboss.netty.handler.codec.frame.Delimiters;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
+import org.jboss.netty.handler.ssl.SslHandler;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatServer.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatServer.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/example/securechat/SecureChatServer.java
rename to src/main/java/org/jboss/netty/example/securechat/SecureChatServer.java
index 229ff6b425..4d1c69665b 100644
--- a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatServer.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatServer.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.securechat;
+package org.jboss.netty.example.securechat;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ServerBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 public class SecureChatServer {
 
diff --git a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatServerHandler.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java
similarity index 86%
rename from src/main/java/net/gleamynode/netty/example/securechat/SecureChatServerHandler.java
rename to src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java
index 61a16646b7..91dd6d29ec 100644
--- a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatServerHandler.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.securechat;
+package org.jboss.netty.example.securechat;
 
 import java.net.InetAddress;
 import java.util.Set;
@@ -28,18 +28,18 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelFutureListener;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
-import net.gleamynode.netty.handler.ssl.SslHandler;
-import net.gleamynode.netty.util.MapBackedSet;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.handler.ssl.SslHandler;
+import org.jboss.netty.util.MapBackedSet;
 
 @ChannelPipelineCoverage("all")
 public class SecureChatServerHandler extends SimpleChannelHandler {
diff --git a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatSslContextFactory.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/example/securechat/SecureChatSslContextFactory.java
rename to src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java
index d4873a5c14..521347b969 100644
--- a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatSslContextFactory.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatSslContextFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.securechat;
+package org.jboss.netty.example.securechat;
 
 import java.security.KeyStore;
 import java.security.Security;
diff --git a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatTrustManagerFactory.java b/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/example/securechat/SecureChatTrustManagerFactory.java
rename to src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java
index d9a031c9b0..790a552252 100644
--- a/src/main/java/net/gleamynode/netty/example/securechat/SecureChatTrustManagerFactory.java
+++ b/src/main/java/org/jboss/netty/example/securechat/SecureChatTrustManagerFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.securechat;
+package org.jboss.netty.example.securechat;
 
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
diff --git a/src/main/java/net/gleamynode/netty/example/telnet/TelnetClient.java b/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java
similarity index 90%
rename from src/main/java/net/gleamynode/netty/example/telnet/TelnetClient.java
rename to src/main/java/org/jboss/netty/example/telnet/TelnetClient.java
index 0eb0cb532a..96ae62a254 100644
--- a/src/main/java/net/gleamynode/netty/example/telnet/TelnetClient.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetClient.java
@@ -20,18 +20,18 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.telnet;
+package org.jboss.netty.example.telnet;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ClientBootstrap;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
 
 public class TelnetClient {
 
diff --git a/src/main/java/net/gleamynode/netty/example/telnet/TelnetClientHandler.java b/src/main/java/org/jboss/netty/example/telnet/TelnetClientHandler.java
similarity index 82%
rename from src/main/java/net/gleamynode/netty/example/telnet/TelnetClientHandler.java
rename to src/main/java/org/jboss/netty/example/telnet/TelnetClientHandler.java
index 8239bc1bac..00f5fdac73 100644
--- a/src/main/java/net/gleamynode/netty/example/telnet/TelnetClientHandler.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetClientHandler.java
@@ -20,18 +20,18 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.telnet;
+package org.jboss.netty.example.telnet;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 @ChannelPipelineCoverage("all")
 public class TelnetClientHandler extends SimpleChannelHandler {
diff --git a/src/main/java/net/gleamynode/netty/example/telnet/TelnetPipelineFactory.java b/src/main/java/org/jboss/netty/example/telnet/TelnetPipelineFactory.java
similarity index 78%
rename from src/main/java/net/gleamynode/netty/example/telnet/TelnetPipelineFactory.java
rename to src/main/java/org/jboss/netty/example/telnet/TelnetPipelineFactory.java
index 8b0b5907be..2a400cc71c 100644
--- a/src/main/java/net/gleamynode/netty/example/telnet/TelnetPipelineFactory.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetPipelineFactory.java
@@ -20,16 +20,16 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.telnet;
+package org.jboss.netty.example.telnet;
 
-import static net.gleamynode.netty.channel.Channels.*;
-import net.gleamynode.netty.channel.ChannelHandler;
-import net.gleamynode.netty.channel.ChannelPipeline;
-import net.gleamynode.netty.channel.ChannelPipelineFactory;
-import net.gleamynode.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
-import net.gleamynode.netty.handler.codec.frame.Delimiters;
-import net.gleamynode.netty.handler.codec.string.StringDecoder;
-import net.gleamynode.netty.handler.codec.string.StringEncoder;
+import static org.jboss.netty.channel.Channels.*;
+import org.jboss.netty.channel.ChannelHandler;
+import org.jboss.netty.channel.ChannelPipeline;
+import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.handler.codec.frame.DelimiterBasedFrameDecoder;
+import org.jboss.netty.handler.codec.frame.Delimiters;
+import org.jboss.netty.handler.codec.string.StringDecoder;
+import org.jboss.netty.handler.codec.string.StringEncoder;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/example/telnet/TelnetServer.java b/src/main/java/org/jboss/netty/example/telnet/TelnetServer.java
similarity index 88%
rename from src/main/java/net/gleamynode/netty/example/telnet/TelnetServer.java
rename to src/main/java/org/jboss/netty/example/telnet/TelnetServer.java
index f1264892a1..81fe8702ec 100644
--- a/src/main/java/net/gleamynode/netty/example/telnet/TelnetServer.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetServer.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.telnet;
+package org.jboss.netty.example.telnet;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 
-import net.gleamynode.netty.bootstrap.ServerBootstrap;
-import net.gleamynode.netty.channel.ChannelFactory;
-import net.gleamynode.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 
 public class TelnetServer {
 
diff --git a/src/main/java/net/gleamynode/netty/example/telnet/TelnetServerHandler.java b/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java
similarity index 84%
rename from src/main/java/net/gleamynode/netty/example/telnet/TelnetServerHandler.java
rename to src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java
index 6672b4303d..15a77f9ade 100644
--- a/src/main/java/net/gleamynode/netty/example/telnet/TelnetServerHandler.java
+++ b/src/main/java/org/jboss/netty/example/telnet/TelnetServerHandler.java
@@ -20,22 +20,22 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.example.telnet;
+package org.jboss.netty.example.telnet;
 
 import java.net.InetAddress;
 import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelFutureListener;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 @ChannelPipelineCoverage("all")
 public class TelnetServerHandler extends SimpleChannelHandler {
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
similarity index 94%
rename from src/main/java/net/gleamynode/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
rename to src/main/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
index 60fcb4aaa1..38359ac68b 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/DelimiterBasedFrameDecoder.java
@@ -20,11 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.frame;
+package org.jboss.netty.handler.codec.frame;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
@@ -32,7 +32,7 @@ import net.gleamynode.netty.channel.ChannelHandlerContext;
  *
  * @version $Rev:231 $, $Date:2008-06-12 16:44:50 +0900 (목, 12 6월 2008) $
  *
- * @apiviz.uses net.gleamynode.netty.handler.codec.frame.Delimiters - - optional yet useful
+ * @apiviz.uses org.jboss.netty.handler.codec.frame.Delimiters - - optional yet useful
  */
 public class DelimiterBasedFrameDecoder extends FrameDecoder {
 
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/frame/Delimiters.java b/src/main/java/org/jboss/netty/handler/codec/frame/Delimiters.java
similarity index 92%
rename from src/main/java/net/gleamynode/netty/handler/codec/frame/Delimiters.java
rename to src/main/java/org/jboss/netty/handler/codec/frame/Delimiters.java
index cec40f4cb1..32fb45cd25 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/frame/Delimiters.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/Delimiters.java
@@ -20,10 +20,10 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.frame;
+package org.jboss.netty.handler.codec.frame;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBuffers;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/frame/FixedLengthFrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/frame/FixedLengthFrameDecoder.java
similarity index 90%
rename from src/main/java/net/gleamynode/netty/handler/codec/frame/FixedLengthFrameDecoder.java
rename to src/main/java/org/jboss/netty/handler/codec/frame/FixedLengthFrameDecoder.java
index 488b4ed878..a92be0b889 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/frame/FixedLengthFrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/FixedLengthFrameDecoder.java
@@ -20,11 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.frame;
+package org.jboss.netty.handler.codec.frame;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/frame/FrameDecoder.java b/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java
similarity index 89%
rename from src/main/java/net/gleamynode/netty/handler/codec/frame/FrameDecoder.java
rename to src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java
index fdb201475c..e1e5dd3724 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/frame/FrameDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/FrameDecoder.java
@@ -20,21 +20,21 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.frame;
+package org.jboss.netty.handler.codec.frame;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.net.SocketAddress;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBuffers;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/frame/TooLongFrameException.java b/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/handler/codec/frame/TooLongFrameException.java
rename to src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java
index 2b838eef28..d8988a090e 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/frame/TooLongFrameException.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/TooLongFrameException.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.frame;
+package org.jboss.netty.handler.codec.frame;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/frame/package-info.java b/src/main/java/org/jboss/netty/handler/codec/frame/package-info.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/handler/codec/frame/package-info.java
rename to src/main/java/org/jboss/netty/handler/codec/frame/package-info.java
index c7f0c611ee..868faa164a 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/frame/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/frame/package-info.java
@@ -26,4 +26,4 @@
  * packet fragmentation and reassembly issue found in a stream-based transport
  * such as TCP/IP.
  */
-package net.gleamynode.netty.handler.codec.frame;
\ No newline at end of file
+package org.jboss.netty.handler.codec.frame;
\ No newline at end of file
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/replay/ReplayError.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/handler/codec/replay/ReplayError.java
rename to src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java
index 494141a359..d59ff18d67 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/replay/ReplayError.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayError.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.replay;
+package org.jboss.netty.handler.codec.replay;
 
 
 /**
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/replay/ReplayingDecoder.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
similarity index 90%
rename from src/main/java/net/gleamynode/netty/handler/codec/replay/ReplayingDecoder.java
rename to src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
index 50354d22df..ddbdddcc3d 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/replay/ReplayingDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoder.java
@@ -20,21 +20,21 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.replay;
+package org.jboss.netty.handler.codec.replay;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.net.SocketAddress;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.Channels;
-import net.gleamynode.netty.channel.ExceptionEvent;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.channel.SimpleChannelHandler;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.ExceptionEvent;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.channel.SimpleChannelHandler;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/replay/ReplayingDecoderBuffer.java b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/handler/codec/replay/ReplayingDecoderBuffer.java
rename to src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java
index 9a73608e24..65f8c0dbe7 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/replay/ReplayingDecoderBuffer.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/ReplayingDecoderBuffer.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.replay;
+package org.jboss.netty.handler.codec.replay;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,8 +30,8 @@ import java.nio.ByteOrder;
 import java.nio.channels.GatheringByteChannel;
 import java.nio.channels.ScatteringByteChannel;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBufferIndexFinder;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBufferIndexFinder;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java b/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
similarity index 93%
rename from src/main/java/net/gleamynode/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
rename to src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
index 22a1e56f50..392ada2616 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/UnsafeDynamicChannelBuffer.java
@@ -20,11 +20,11 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.replay;
+package org.jboss.netty.handler.codec.replay;
 
 import java.nio.ByteOrder;
 
-import net.gleamynode.netty.buffer.DynamicChannelBuffer;
+import org.jboss.netty.buffer.DynamicChannelBuffer;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/replay/VoidEnum.java b/src/main/java/org/jboss/netty/handler/codec/replay/VoidEnum.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/handler/codec/replay/VoidEnum.java
rename to src/main/java/org/jboss/netty/handler/codec/replay/VoidEnum.java
index dcef861a8e..83b490cdc6 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/replay/VoidEnum.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/VoidEnum.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.replay;
+package org.jboss.netty.handler.codec.replay;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/replay/package-info.java b/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/handler/codec/replay/package-info.java
rename to src/main/java/org/jboss/netty/handler/codec/replay/package-info.java
index 530b38b0ef..0b010915ae 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/replay/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/replay/package-info.java
@@ -25,4 +25,4 @@
  * Specialized decoder which enables implementation of a non-blocking decoder
  * with blocking I/O paradigm.
  */
-package net.gleamynode.netty.handler.codec.replay;
\ No newline at end of file
+package org.jboss.netty.handler.codec.replay;
\ No newline at end of file
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompactObjectInputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/CompactObjectInputStream.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java
index f66e60c9cd..b0631a413f 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompactObjectInputStream.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectInputStream.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
 
 import java.io.EOFException;
 import java.io.IOException;
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompactObjectOutputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/CompactObjectOutputStream.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java
index b70ff24938..d9df6419d3 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompactObjectOutputStream.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompactObjectOutputStream.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompatibleObjectDecoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java
similarity index 87%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/CompatibleObjectDecoder.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java
index 00bfa1f0fc..2f06811161 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompatibleObjectDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoder.java
@@ -20,18 +20,18 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
 
 import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamConstants;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBufferInputStream;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.handler.codec.replay.ReplayingDecoder;
-import net.gleamynode.netty.util.SwitchableInputStream;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBufferInputStream;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.replay.ReplayingDecoder;
+import org.jboss.netty.util.SwitchableInputStream;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompatibleObjectDecoderState.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
index 35e16fbf7b..0c34055e66 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectDecoderState.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompatibleObjectEncoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectEncoder.java
similarity index 83%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/CompatibleObjectEncoder.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectEncoder.java
index 8fdcc25b36..dcf5d2b648 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/CompatibleObjectEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/CompatibleObjectEncoder.java
@@ -20,21 +20,21 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
 
-import static net.gleamynode.netty.buffer.ChannelBuffers.*;
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBufferOutputStream;
-import net.gleamynode.netty.channel.ChannelDownstreamHandler;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.MessageEvent;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBufferOutputStream;
+import org.jboss.netty.channel.ChannelDownstreamHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.MessageEvent;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectDecoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java
similarity index 89%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectDecoder.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java
index ce8edbcde4..f736e0afb6 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoder.java
@@ -20,15 +20,15 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
 
 import java.io.StreamCorruptedException;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBufferInputStream;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.handler.codec.frame.FrameDecoder;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBufferInputStream;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectDecoderInputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoderInputStream.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectDecoderInputStream.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoderInputStream.java
index 819e58ccce..d794511242 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectDecoderInputStream.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectDecoderInputStream.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectEncoder.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java
similarity index 81%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectEncoder.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java
index 3490a70644..8e7541ca7e 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoder.java
@@ -20,20 +20,20 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
 
-import static net.gleamynode.netty.buffer.ChannelBuffers.*;
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.buffer.ChannelBuffers.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.io.ObjectOutputStream;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBufferOutputStream;
-import net.gleamynode.netty.channel.ChannelDownstreamHandler;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.MessageEvent;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBufferOutputStream;
+import org.jboss.netty.channel.ChannelDownstreamHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.MessageEvent;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectEncoderOutputStream.java b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
similarity index 94%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
index 73019a7950..1fcbd594ec 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/ObjectEncoderOutputStream.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -28,9 +28,9 @@ import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBufferOutputStream;
-import net.gleamynode.netty.buffer.ChannelBuffers;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBufferOutputStream;
+import org.jboss.netty.buffer.ChannelBuffers;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/serialization/package-info.java b/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/handler/codec/serialization/package-info.java
rename to src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java
index fad510b8e6..e598cfbdb1 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/serialization/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/serialization/package-info.java
@@ -28,4 +28,4 @@
  *
  * @apiviz.exclude ^java\..*Stream$
  */
-package net.gleamynode.netty.handler.codec.serialization;
+package org.jboss.netty.handler.codec.serialization;
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/string/StringDecoder.java b/src/main/java/org/jboss/netty/handler/codec/string/StringDecoder.java
similarity index 84%
rename from src/main/java/net/gleamynode/netty/handler/codec/string/StringDecoder.java
rename to src/main/java/org/jboss/netty/handler/codec/string/StringDecoder.java
index f22648da0b..39387e810c 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/string/StringDecoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/string/StringDecoder.java
@@ -20,18 +20,18 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.string;
+package org.jboss.netty.handler.codec.string;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.nio.charset.Charset;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelUpstreamHandler;
-import net.gleamynode.netty.channel.MessageEvent;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelUpstreamHandler;
+import org.jboss.netty.channel.MessageEvent;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/string/StringEncoder.java b/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java
similarity index 84%
rename from src/main/java/net/gleamynode/netty/handler/codec/string/StringEncoder.java
rename to src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java
index 1d65f9c295..1333fba586 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/string/StringEncoder.java
+++ b/src/main/java/org/jboss/netty/handler/codec/string/StringEncoder.java
@@ -20,18 +20,18 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.codec.string;
+package org.jboss.netty.handler.codec.string;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.nio.charset.Charset;
 
-import net.gleamynode.netty.buffer.ChannelBuffers;
-import net.gleamynode.netty.channel.ChannelDownstreamHandler;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.MessageEvent;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.ChannelDownstreamHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.MessageEvent;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/codec/string/package-info.java b/src/main/java/org/jboss/netty/handler/codec/string/package-info.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/handler/codec/string/package-info.java
rename to src/main/java/org/jboss/netty/handler/codec/string/package-info.java
index e0e9beb4d1..7549f91b4a 100644
--- a/src/main/java/net/gleamynode/netty/handler/codec/string/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/codec/string/package-info.java
@@ -25,4 +25,4 @@
  * Encoder and decoder which transform a string into a byte buffer and vice
  * versa.
  */
-package net.gleamynode.netty.handler.codec.string;
\ No newline at end of file
+package org.jboss.netty.handler.codec.string;
\ No newline at end of file
diff --git a/src/main/java/net/gleamynode/netty/handler/execution/ChannelEventRunnable.java b/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java
similarity index 90%
rename from src/main/java/net/gleamynode/netty/handler/execution/ChannelEventRunnable.java
rename to src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java
index b46e9b447c..71df42c435 100644
--- a/src/main/java/net/gleamynode/netty/handler/execution/ChannelEventRunnable.java
+++ b/src/main/java/org/jboss/netty/handler/execution/ChannelEventRunnable.java
@@ -20,10 +20,10 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.execution;
+package org.jboss.netty.handler.execution;
 
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
 
 public class ChannelEventRunnable implements Runnable {
     private final ChannelHandlerContext ctx;
diff --git a/src/main/java/net/gleamynode/netty/handler/execution/DefaultObjectSizeEstimator.java b/src/main/java/org/jboss/netty/handler/execution/DefaultObjectSizeEstimator.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/handler/execution/DefaultObjectSizeEstimator.java
rename to src/main/java/org/jboss/netty/handler/execution/DefaultObjectSizeEstimator.java
index 7e1766c614..13888007ac 100644
--- a/src/main/java/net/gleamynode/netty/handler/execution/DefaultObjectSizeEstimator.java
+++ b/src/main/java/org/jboss/netty/handler/execution/DefaultObjectSizeEstimator.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.execution;
+package org.jboss.netty.handler.execution;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -30,8 +30,8 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.channel.MessageEvent;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.channel.MessageEvent;
 
 public class DefaultObjectSizeEstimator implements ObjectSizeEstimator {
 
diff --git a/src/main/java/net/gleamynode/netty/handler/execution/ExecutionHandler.java b/src/main/java/org/jboss/netty/handler/execution/ExecutionHandler.java
similarity index 86%
rename from src/main/java/net/gleamynode/netty/handler/execution/ExecutionHandler.java
rename to src/main/java/org/jboss/netty/handler/execution/ExecutionHandler.java
index 8b484e8664..da7380b71f 100644
--- a/src/main/java/net/gleamynode/netty/handler/execution/ExecutionHandler.java
+++ b/src/main/java/org/jboss/netty/handler/execution/ExecutionHandler.java
@@ -20,14 +20,14 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.execution;
+package org.jboss.netty.handler.execution;
 
 import java.util.concurrent.Executor;
 
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelPipelineCoverage;
-import net.gleamynode.netty.channel.ChannelUpstreamHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelPipelineCoverage;
+import org.jboss.netty.channel.ChannelUpstreamHandler;
 
 /**
  *
diff --git a/src/main/java/net/gleamynode/netty/handler/execution/MemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
rename to src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
index f47e23bb37..f13e4943bf 100644
--- a/src/main/java/net/gleamynode/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
+++ b/src/main/java/org/jboss/netty/handler/execution/MemoryAwareThreadPoolExecutor.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.execution;
+package org.jboss.netty.handler.execution;
 
 import java.lang.reflect.Method;
 import java.util.concurrent.ConcurrentHashMap;
@@ -33,9 +33,9 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelState;
-import net.gleamynode.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelState;
+import org.jboss.netty.channel.ChannelStateEvent;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
@@ -44,8 +44,8 @@ import net.gleamynode.netty.channel.ChannelStateEvent;
  * @version $Rev$, $Date$
  *
  * @apiviz.landmark
- * @apiviz.uses net.gleamynode.netty.handler.execution.ObjectSizeEstimator
- * @apiviz.uses net.gleamynode.netty.handler.execution.ChannelEventRunnable
+ * @apiviz.uses org.jboss.netty.handler.execution.ObjectSizeEstimator
+ * @apiviz.uses org.jboss.netty.handler.execution.ChannelEventRunnable
  */
 public class MemoryAwareThreadPoolExecutor extends ThreadPoolExecutor {
 
diff --git a/src/main/java/net/gleamynode/netty/handler/execution/ObjectSizeEstimator.java b/src/main/java/org/jboss/netty/handler/execution/ObjectSizeEstimator.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/handler/execution/ObjectSizeEstimator.java
rename to src/main/java/org/jboss/netty/handler/execution/ObjectSizeEstimator.java
index 40bf8c139a..fd3f00700b 100644
--- a/src/main/java/net/gleamynode/netty/handler/execution/ObjectSizeEstimator.java
+++ b/src/main/java/org/jboss/netty/handler/execution/ObjectSizeEstimator.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.execution;
+package org.jboss.netty.handler.execution;
 
 public interface ObjectSizeEstimator {
     int estimateSize(Object o);
diff --git a/src/main/java/net/gleamynode/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
rename to src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
index 43aa2d31e3..e7cdc0513b 100644
--- a/src/main/java/net/gleamynode/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
+++ b/src/main/java/org/jboss/netty/handler/execution/OrderedMemoryAwareThreadPoolExecutor.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.execution;
+package org.jboss.netty.handler.execution;
 
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -32,7 +32,7 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 
-import net.gleamynode.netty.channel.Channel;
+import org.jboss.netty.channel.Channel;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/handler/execution/package-info.java b/src/main/java/org/jboss/netty/handler/execution/package-info.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/handler/execution/package-info.java
rename to src/main/java/org/jboss/netty/handler/execution/package-info.java
index 6a981ec489..57c506e3d8 100644
--- a/src/main/java/net/gleamynode/netty/handler/execution/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/execution/package-info.java
@@ -27,4 +27,4 @@
  *
  * @apiviz.exclude ^java\.lang\.
  */
-package net.gleamynode.netty.handler.execution;
\ No newline at end of file
+package org.jboss.netty.handler.execution;
\ No newline at end of file
diff --git a/src/main/java/net/gleamynode/netty/handler/ssl/SslBufferPool.java b/src/main/java/org/jboss/netty/handler/ssl/SslBufferPool.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/handler/ssl/SslBufferPool.java
rename to src/main/java/org/jboss/netty/handler/ssl/SslBufferPool.java
index f2687bf1ff..376c395388 100644
--- a/src/main/java/net/gleamynode/netty/handler/ssl/SslBufferPool.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/SslBufferPool.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.ssl;
+package org.jboss.netty.handler.ssl;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/net/gleamynode/netty/handler/ssl/SslHandler.java b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
similarity index 95%
rename from src/main/java/net/gleamynode/netty/handler/ssl/SslHandler.java
rename to src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
index 8bb240dd9b..5a9a1d17be 100644
--- a/src/main/java/net/gleamynode/netty/handler/ssl/SslHandler.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.handler.ssl;
+package org.jboss.netty.handler.ssl;
 
-import static net.gleamynode.netty.channel.Channels.*;
+import static org.jboss.netty.channel.Channels.*;
 
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
@@ -36,19 +36,19 @@ import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLEngineResult.Status;
 
-import net.gleamynode.netty.buffer.ChannelBuffer;
-import net.gleamynode.netty.buffer.ChannelBuffers;
-import net.gleamynode.netty.channel.Channel;
-import net.gleamynode.netty.channel.ChannelDownstreamHandler;
-import net.gleamynode.netty.channel.ChannelEvent;
-import net.gleamynode.netty.channel.ChannelFuture;
-import net.gleamynode.netty.channel.ChannelFutureListener;
-import net.gleamynode.netty.channel.ChannelHandlerContext;
-import net.gleamynode.netty.channel.ChannelStateEvent;
-import net.gleamynode.netty.channel.Channels;
-import net.gleamynode.netty.channel.MessageEvent;
-import net.gleamynode.netty.handler.codec.frame.FrameDecoder;
-import net.gleamynode.netty.util.ImmediateExecutor;
+import org.jboss.netty.buffer.ChannelBuffer;
+import org.jboss.netty.buffer.ChannelBuffers;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelDownstreamHandler;
+import org.jboss.netty.channel.ChannelEvent;
+import org.jboss.netty.channel.ChannelFuture;
+import org.jboss.netty.channel.ChannelFutureListener;
+import org.jboss.netty.channel.ChannelHandlerContext;
+import org.jboss.netty.channel.ChannelStateEvent;
+import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.MessageEvent;
+import org.jboss.netty.handler.codec.frame.FrameDecoder;
+import org.jboss.netty.util.ImmediateExecutor;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
@@ -57,7 +57,7 @@ import net.gleamynode.netty.util.ImmediateExecutor;
  * @version $Rev$, $Date$
  *
  * @apiviz.landmark
- * @apiviz.uses net.gleamynode.netty.handler.ssl.SslBufferPool
+ * @apiviz.uses org.jboss.netty.handler.ssl.SslBufferPool
  */
 public class SslHandler extends FrameDecoder implements ChannelDownstreamHandler {
 
diff --git a/src/main/java/net/gleamynode/netty/handler/ssl/package-info.java b/src/main/java/org/jboss/netty/handler/ssl/package-info.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/handler/ssl/package-info.java
rename to src/main/java/org/jboss/netty/handler/ssl/package-info.java
index 7971489e3a..48cfeff11e 100644
--- a/src/main/java/net/gleamynode/netty/handler/ssl/package-info.java
+++ b/src/main/java/org/jboss/netty/handler/ssl/package-info.java
@@ -25,4 +25,4 @@
  * <a href="http://en.wikipedia.org/wiki/Transport_Layer_Security">SSL &middot;
  * TLS</a> implementation.
  */
-package net.gleamynode.netty.handler.ssl;
\ No newline at end of file
+package org.jboss.netty.handler.ssl;
\ No newline at end of file
diff --git a/src/main/java/net/gleamynode/netty/logging/CommonsLoggerFactory.java b/src/main/java/org/jboss/netty/logging/CommonsLoggerFactory.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/logging/CommonsLoggerFactory.java
rename to src/main/java/org/jboss/netty/logging/CommonsLoggerFactory.java
index f0b197296e..fb26fe47de 100644
--- a/src/main/java/net/gleamynode/netty/logging/CommonsLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/CommonsLoggerFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.logging;
+package org.jboss.netty.logging;
 
 
 /**
diff --git a/src/main/java/net/gleamynode/netty/logging/JBossLoggerFactory.java b/src/main/java/org/jboss/netty/logging/JBossLoggerFactory.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/logging/JBossLoggerFactory.java
rename to src/main/java/org/jboss/netty/logging/JBossLoggerFactory.java
index fc6e56e11d..04cce362c5 100644
--- a/src/main/java/net/gleamynode/netty/logging/JBossLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/JBossLoggerFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.logging;
+package org.jboss.netty.logging;
 
 
 /**
diff --git a/src/main/java/net/gleamynode/netty/logging/JdkLoggerFactory.java b/src/main/java/org/jboss/netty/logging/JdkLoggerFactory.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/logging/JdkLoggerFactory.java
rename to src/main/java/org/jboss/netty/logging/JdkLoggerFactory.java
index e7119a159f..7eea656540 100644
--- a/src/main/java/net/gleamynode/netty/logging/JdkLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/JdkLoggerFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.logging;
+package org.jboss.netty.logging;
 
 import java.util.logging.Level;
 
diff --git a/src/main/java/net/gleamynode/netty/logging/Log4JLoggerFactory.java b/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/logging/Log4JLoggerFactory.java
rename to src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java
index b8b432bca8..dfda1a7200 100644
--- a/src/main/java/net/gleamynode/netty/logging/Log4JLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/Log4JLoggerFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.logging;
+package org.jboss.netty.logging;
 
 
 /**
diff --git a/src/main/java/net/gleamynode/netty/logging/Logger.java b/src/main/java/org/jboss/netty/logging/Logger.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/logging/Logger.java
rename to src/main/java/org/jboss/netty/logging/Logger.java
index c21d76427a..3b8b548f10 100644
--- a/src/main/java/net/gleamynode/netty/logging/Logger.java
+++ b/src/main/java/org/jboss/netty/logging/Logger.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.logging;
+package org.jboss.netty.logging;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/logging/LoggerFactory.java b/src/main/java/org/jboss/netty/logging/LoggerFactory.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/logging/LoggerFactory.java
rename to src/main/java/org/jboss/netty/logging/LoggerFactory.java
index 005cef1ef4..810bebf916 100644
--- a/src/main/java/net/gleamynode/netty/logging/LoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/LoggerFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.logging;
+package org.jboss.netty.logging;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/logging/Slf4JLoggerFactory.java b/src/main/java/org/jboss/netty/logging/Slf4JLoggerFactory.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/logging/Slf4JLoggerFactory.java
rename to src/main/java/org/jboss/netty/logging/Slf4JLoggerFactory.java
index e184cc92af..b68ce2f40d 100644
--- a/src/main/java/net/gleamynode/netty/logging/Slf4JLoggerFactory.java
+++ b/src/main/java/org/jboss/netty/logging/Slf4JLoggerFactory.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.logging;
+package org.jboss.netty.logging;
 
 
 /**
diff --git a/src/main/java/net/gleamynode/netty/logging/package-info.java b/src/main/java/org/jboss/netty/logging/package-info.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/logging/package-info.java
rename to src/main/java/org/jboss/netty/logging/package-info.java
index 8da0c5c581..2a15f9979d 100644
--- a/src/main/java/net/gleamynode/netty/logging/package-info.java
+++ b/src/main/java/org/jboss/netty/logging/package-info.java
@@ -25,4 +25,4 @@
  * Simplistic <em>internal-use-only</em> logging layer which allows a user to
  * decide what logging framework Netty should use to log its own messages.
  */
-package net.gleamynode.netty.logging;
\ No newline at end of file
+package org.jboss.netty.logging;
\ No newline at end of file
diff --git a/src/main/java/net/gleamynode/netty/util/ConvertUtil.java b/src/main/java/org/jboss/netty/util/ConvertUtil.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/util/ConvertUtil.java
rename to src/main/java/org/jboss/netty/util/ConvertUtil.java
index d8c545cca8..f68bd429f2 100644
--- a/src/main/java/net/gleamynode/netty/util/ConvertUtil.java
+++ b/src/main/java/org/jboss/netty/util/ConvertUtil.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.util;
+package org.jboss.netty.util;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/net/gleamynode/netty/util/ImmediateExecutor.java b/src/main/java/org/jboss/netty/util/ImmediateExecutor.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/util/ImmediateExecutor.java
rename to src/main/java/org/jboss/netty/util/ImmediateExecutor.java
index 61ac3dfb79..09457aa8c1 100644
--- a/src/main/java/net/gleamynode/netty/util/ImmediateExecutor.java
+++ b/src/main/java/org/jboss/netty/util/ImmediateExecutor.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.util;
+package org.jboss.netty.util;
 
 import java.util.concurrent.Executor;
 
diff --git a/src/main/java/net/gleamynode/netty/util/MapBackedSet.java b/src/main/java/org/jboss/netty/util/MapBackedSet.java
similarity index 98%
rename from src/main/java/net/gleamynode/netty/util/MapBackedSet.java
rename to src/main/java/org/jboss/netty/util/MapBackedSet.java
index 15675a512c..2b0306bb3d 100644
--- a/src/main/java/net/gleamynode/netty/util/MapBackedSet.java
+++ b/src/main/java/org/jboss/netty/util/MapBackedSet.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.util;
+package org.jboss.netty.util;
 
 import java.io.Serializable;
 import java.util.AbstractSet;
diff --git a/src/main/java/net/gleamynode/netty/util/NamePreservingRunnable.java b/src/main/java/org/jboss/netty/util/NamePreservingRunnable.java
similarity index 96%
rename from src/main/java/net/gleamynode/netty/util/NamePreservingRunnable.java
rename to src/main/java/org/jboss/netty/util/NamePreservingRunnable.java
index 429a2a4777..bbd4516fd4 100644
--- a/src/main/java/net/gleamynode/netty/util/NamePreservingRunnable.java
+++ b/src/main/java/org/jboss/netty/util/NamePreservingRunnable.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.util;
+package org.jboss.netty.util;
 
-import net.gleamynode.netty.logging.Logger;
+import org.jboss.netty.logging.Logger;
 
 public class NamePreservingRunnable implements Runnable {
     private static final Logger logger =
diff --git a/src/main/java/net/gleamynode/netty/util/SwitchableInputStream.java b/src/main/java/org/jboss/netty/util/SwitchableInputStream.java
similarity index 97%
rename from src/main/java/net/gleamynode/netty/util/SwitchableInputStream.java
rename to src/main/java/org/jboss/netty/util/SwitchableInputStream.java
index 00d831bf53..e331ff6eda 100644
--- a/src/main/java/net/gleamynode/netty/util/SwitchableInputStream.java
+++ b/src/main/java/org/jboss/netty/util/SwitchableInputStream.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.util;
+package org.jboss.netty.util;
 
 import java.io.FilterInputStream;
 import java.io.InputStream;
diff --git a/src/main/java/net/gleamynode/netty/util/TimeBasedUuidGenerator.java b/src/main/java/org/jboss/netty/util/TimeBasedUuidGenerator.java
similarity index 99%
rename from src/main/java/net/gleamynode/netty/util/TimeBasedUuidGenerator.java
rename to src/main/java/org/jboss/netty/util/TimeBasedUuidGenerator.java
index bc837a5c53..bca882ed9d 100644
--- a/src/main/java/net/gleamynode/netty/util/TimeBasedUuidGenerator.java
+++ b/src/main/java/org/jboss/netty/util/TimeBasedUuidGenerator.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.util;
+package org.jboss.netty.util;
 
 import java.io.UnsupportedEncodingException;
 import java.lang.management.ManagementFactory;
diff --git a/src/test/java/net/gleamynode/netty/buffer/AbstractChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java
similarity index 99%
rename from src/test/java/net/gleamynode/netty/buffer/AbstractChannelBufferTest.java
rename to src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java
index 326b78f914..4ed645383f 100644
--- a/src/test/java/net/gleamynode/netty/buffer/AbstractChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/AbstractChannelBufferTest.java
@@ -20,9 +20,9 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
-import static net.gleamynode.netty.buffer.ChannelBuffers.*;
+import static org.jboss.netty.buffer.ChannelBuffers.*;
 import static org.junit.Assert.*;
 
 import java.nio.ByteBuffer;
diff --git a/src/test/java/net/gleamynode/netty/buffer/BigEndianHeapChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java
similarity index 97%
rename from src/test/java/net/gleamynode/netty/buffer/BigEndianHeapChannelBufferTest.java
rename to src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java
index b730efe1dd..557ffaf8e8 100644
--- a/src/test/java/net/gleamynode/netty/buffer/BigEndianHeapChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/BigEndianHeapChannelBufferTest.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/net/gleamynode/netty/buffer/ChannelBuffersTest.java b/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java
similarity index 99%
rename from src/test/java/net/gleamynode/netty/buffer/ChannelBuffersTest.java
rename to src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java
index dc163c829c..fcaaf10477 100644
--- a/src/test/java/net/gleamynode/netty/buffer/ChannelBuffersTest.java
+++ b/src/test/java/org/jboss/netty/buffer/ChannelBuffersTest.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/net/gleamynode/netty/buffer/CompositeChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/CompositeChannelBufferTest.java
similarity index 98%
rename from src/test/java/net/gleamynode/netty/buffer/CompositeChannelBufferTest.java
rename to src/test/java/org/jboss/netty/buffer/CompositeChannelBufferTest.java
index 2ffa455142..f68a7ac48c 100644
--- a/src/test/java/net/gleamynode/netty/buffer/CompositeChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/CompositeChannelBufferTest.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/net/gleamynode/netty/buffer/DirectChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/DirectChannelBufferTest.java
similarity index 97%
rename from src/test/java/net/gleamynode/netty/buffer/DirectChannelBufferTest.java
rename to src/test/java/org/jboss/netty/buffer/DirectChannelBufferTest.java
index 1ae77bc403..81aa21546a 100644
--- a/src/test/java/net/gleamynode/netty/buffer/DirectChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/DirectChannelBufferTest.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/net/gleamynode/netty/buffer/DuplicateChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java
similarity index 97%
rename from src/test/java/net/gleamynode/netty/buffer/DuplicateChannelBufferTest.java
rename to src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java
index 2fbbf296cf..99e6fef6db 100644
--- a/src/test/java/net/gleamynode/netty/buffer/DuplicateChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/DuplicateChannelBufferTest.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/net/gleamynode/netty/buffer/LittleEndianHeapChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java
similarity index 97%
rename from src/test/java/net/gleamynode/netty/buffer/LittleEndianHeapChannelBufferTest.java
rename to src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java
index 719e848cea..6b6e2e52a7 100644
--- a/src/test/java/net/gleamynode/netty/buffer/LittleEndianHeapChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/LittleEndianHeapChannelBufferTest.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/net/gleamynode/netty/buffer/SlicedChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java
similarity index 97%
rename from src/test/java/net/gleamynode/netty/buffer/SlicedChannelBufferTest.java
rename to src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java
index 8629cf79be..615ea24bd7 100644
--- a/src/test/java/net/gleamynode/netty/buffer/SlicedChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/SlicedChannelBufferTest.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/net/gleamynode/netty/buffer/TruncatedChannelBufferTest.java b/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java
similarity index 97%
rename from src/test/java/net/gleamynode/netty/buffer/TruncatedChannelBufferTest.java
rename to src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java
index 5e29f15d2d..b199de2c06 100644
--- a/src/test/java/net/gleamynode/netty/buffer/TruncatedChannelBufferTest.java
+++ b/src/test/java/org/jboss/netty/buffer/TruncatedChannelBufferTest.java
@@ -20,7 +20,7 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package net.gleamynode.netty.buffer;
+package org.jboss.netty.buffer;
 
 import static org.junit.Assert.*;