diff --git a/akka-actor/src/main/java/org/jboss/netty/akka/util/internal/ConcurrentIdentityHashMap.java b/akka-actor/src/main/java/akka/util/internal/ConcurrentIdentityHashMap.java
similarity index 99%
rename from akka-actor/src/main/java/org/jboss/netty/akka/util/internal/ConcurrentIdentityHashMap.java
rename to akka-actor/src/main/java/akka/util/internal/ConcurrentIdentityHashMap.java
index ff8a568d02..eb83c98f35 100644
--- a/akka-actor/src/main/java/org/jboss/netty/akka/util/internal/ConcurrentIdentityHashMap.java
+++ b/akka-actor/src/main/java/akka/util/internal/ConcurrentIdentityHashMap.java
@@ -18,7 +18,7 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/licenses/publicdomain
  */
-package org.jboss.netty.akka.util.internal;
+package akka.util.internal;
 
 import java.util.AbstractCollection;
 import java.util.AbstractMap;
diff --git a/akka-actor/src/main/java/org/jboss/netty/akka/util/HashedWheelTimer.java b/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
similarity index 97%
rename from akka-actor/src/main/java/org/jboss/netty/akka/util/HashedWheelTimer.java
rename to akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
index 9eba51e53f..25841861c5 100644
--- a/akka-actor/src/main/java/org/jboss/netty/akka/util/HashedWheelTimer.java
+++ b/akka-actor/src/main/java/akka/util/internal/HashedWheelTimer.java
@@ -13,12 +13,10 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.akka.util;
+package akka.util.internal;
 
 import akka.event.LoggingAdapter;
 import akka.util.Duration;
-import org.jboss.netty.akka.util.internal.ConcurrentIdentityHashMap;
-import org.jboss.netty.akka.util.internal.ReusableIterator;
 
 import java.util.*;
 import java.util.concurrent.ThreadFactory;
@@ -34,7 +32,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  * <h3>Tick Duration</h3>
  *
  * As described with 'approximated', this timer does not execute the scheduled
- * {@link TimerTask} on time.  {@link org.jboss.netty.akka.util.HashedWheelTimer}, on every tick, will
+ * {@link TimerTask} on time.  {@link HashedWheelTimer}, on every tick, will
  * check if there are any {@link TimerTask}s behind the schedule and execute
  * them.
  * <p>
@@ -46,7 +44,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  *
  * <h3>Ticks per Wheel (Wheel Size)</h3>
  *
- * {@link org.jboss.netty.akka.util.HashedWheelTimer} maintains a data structure called 'wheel'.
+ * {@link HashedWheelTimer} maintains a data structure called 'wheel'.
  * To put simply, a wheel is a hash table of {@link TimerTask}s whose hash
  * function is 'dead line of the task'.  The default number of ticks per wheel
  * (i.e. the size of the wheel) is 512.  You could specify a larger value
@@ -54,7 +52,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  *
  * <h3>Do not create many instances.</h3>
  *
- * {@link org.jboss.netty.akka.util.HashedWheelTimer} creates a new thread whenever it is instantiated and
+ * {@link HashedWheelTimer} creates a new thread whenever it is instantiated and
  * started.  Therefore, you should make sure to create only one instance and
  * share it across your application.  One of the common mistakes, that makes
  * your application unresponsive, is to create a new instance in
@@ -63,7 +61,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  *
  * <h3>Implementation Details</h3>
  *
- * {@link org.jboss.netty.akka.util.HashedWheelTimer} is based on
+ * {@link HashedWheelTimer} is based on
  * <a href="http://cseweb.ucsd.edu/users/varghese/">George Varghese</a> and
  * Tony Lauck's paper,
  * <a href="http://cseweb.ucsd.edu/users/varghese/PAPERS/twheel.ps.Z">'Hashed
diff --git a/akka-actor/src/main/java/org/jboss/netty/akka/util/internal/ReusableIterator.java b/akka-actor/src/main/java/akka/util/internal/ReusableIterator.java
similarity index 95%
rename from akka-actor/src/main/java/org/jboss/netty/akka/util/internal/ReusableIterator.java
rename to akka-actor/src/main/java/akka/util/internal/ReusableIterator.java
index 210edbe65d..8c8e5e50e5 100644
--- a/akka-actor/src/main/java/org/jboss/netty/akka/util/internal/ReusableIterator.java
+++ b/akka-actor/src/main/java/akka/util/internal/ReusableIterator.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.akka.util.internal;
+package akka.util.internal;
 
 import java.util.Iterator;
 
diff --git a/akka-actor/src/main/java/org/jboss/netty/akka/util/internal/SystemPropertyUtil.java b/akka-actor/src/main/java/akka/util/internal/SystemPropertyUtil.java
similarity index 98%
rename from akka-actor/src/main/java/org/jboss/netty/akka/util/internal/SystemPropertyUtil.java
rename to akka-actor/src/main/java/akka/util/internal/SystemPropertyUtil.java
index bf3e2ac571..affef54bfc 100644
--- a/akka-actor/src/main/java/org/jboss/netty/akka/util/internal/SystemPropertyUtil.java
+++ b/akka-actor/src/main/java/akka/util/internal/SystemPropertyUtil.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.akka.util.internal;
+package akka.util.internal;
 
 import java.util.regex.Pattern;
 
diff --git a/akka-actor/src/main/java/org/jboss/netty/akka/util/Timeout.java b/akka-actor/src/main/java/akka/util/internal/Timeout.java
similarity index 97%
rename from akka-actor/src/main/java/org/jboss/netty/akka/util/Timeout.java
rename to akka-actor/src/main/java/akka/util/internal/Timeout.java
index dbda2110d3..a03534bb8d 100644
--- a/akka-actor/src/main/java/org/jboss/netty/akka/util/Timeout.java
+++ b/akka-actor/src/main/java/akka/util/internal/Timeout.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.akka.util;
+package akka.util.internal;
 
 /**
  * A handle associated with a {@link TimerTask} that is returned by a
diff --git a/akka-actor/src/main/java/org/jboss/netty/akka/util/Timer.java b/akka-actor/src/main/java/akka/util/internal/Timer.java
similarity index 92%
rename from akka-actor/src/main/java/org/jboss/netty/akka/util/Timer.java
rename to akka-actor/src/main/java/akka/util/internal/Timer.java
index b5bd8c6a7c..9cb02794de 100644
--- a/akka-actor/src/main/java/org/jboss/netty/akka/util/Timer.java
+++ b/akka-actor/src/main/java/akka/util/internal/Timer.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.akka.util;
+package akka.util.internal;
 
 import akka.util.Duration;
 import java.util.Set;
@@ -45,7 +45,7 @@ public interface Timer {
     Timeout newTimeout(TimerTask task, Duration delay);
 
     /**
-     * Releases all resources acquired by this {@link org.jboss.netty.akka.util.Timer} and cancels all
+     * Releases all resources acquired by this {@link Timer} and cancels all
      * tasks which were scheduled but not executed yet.
      *
      * @return the handles associated with the tasks which were canceled by
diff --git a/akka-actor/src/main/java/org/jboss/netty/akka/util/TimerTask.java b/akka-actor/src/main/java/akka/util/internal/TimerTask.java
similarity index 82%
rename from akka-actor/src/main/java/org/jboss/netty/akka/util/TimerTask.java
rename to akka-actor/src/main/java/akka/util/internal/TimerTask.java
index 3d0190d8f5..673dde67c7 100644
--- a/akka-actor/src/main/java/org/jboss/netty/akka/util/TimerTask.java
+++ b/akka-actor/src/main/java/akka/util/internal/TimerTask.java
@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package org.jboss.netty.akka.util;
+package akka.util.internal;
 
 /**
  * A task which is executed after the delay specified with
- * {@link Timer#newTimeout(org.jboss.netty.akka.util.TimerTask, long, java.util.concurrent.TimeUnit)}
+ * {@link Timer#newTimeout(TimerTask, long, java.util.concurrent.TimeUnit)}
  * .
  * 
  * @author <a href="http://www.jboss.org/netty/">The Netty Project</a>
@@ -28,7 +28,7 @@ public interface TimerTask {
 
   /**
    * Executed after the delay specified with
-   * {@link Timer#newTimeout(org.jboss.netty.akka.util.TimerTask, long, java.util.concurrent.TimeUnit)}
+   * {@link Timer#newTimeout(TimerTask, long, java.util.concurrent.TimeUnit)}
    * .
    * 
    * @param timeout
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index a1d30ddbc6..ab2996f0a7 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -7,16 +7,15 @@ package akka.actor
 import akka.event._
 import akka.dispatch._
 import akka.pattern.ask
-import org.jboss.netty.akka.util.HashedWheelTimer
-import java.util.concurrent.TimeUnit.MILLISECONDS
 import com.typesafe.config.{ Config, ConfigFactory }
 import scala.annotation.tailrec
-import org.jboss.netty.akka.util.internal.ConcurrentIdentityHashMap
 import java.io.Closeable
 import akka.dispatch.Await.{ Awaitable, CanAwait }
 import akka.util._
+import akka.util.internal.{ HashedWheelTimer, ConcurrentIdentityHashMap }
 import collection.immutable.Stack
 import java.util.concurrent.{ ThreadFactory, CountDownLatch, TimeoutException, RejectedExecutionException }
+import java.util.concurrent.TimeUnit.MILLISECONDS
 
 object ActorSystem {
 
diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
index 91e54a592d..8ad3d8ee98 100644
--- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala
+++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala
@@ -5,12 +5,13 @@
 package akka.actor
 
 import akka.util.Duration
-import org.jboss.netty.akka.util.{ TimerTask, HashedWheelTimer, Timeout ⇒ HWTimeout, Timer }
+import akka.util.internal.{ TimerTask, HashedWheelTimer, Timeout ⇒ HWTimeout, Timer }
 import akka.event.LoggingAdapter
 import akka.dispatch.MessageDispatcher
 import java.io.Closeable
 import java.util.concurrent.atomic.AtomicReference
 import scala.annotation.tailrec
+import akka.util.internal._
 
 //#scheduler
 /**