diff --git a/src/main/java/org/jboss/netty/util/HashedWheelTimer.java b/src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java
similarity index 99%
rename from src/main/java/org/jboss/netty/util/HashedWheelTimer.java
rename to src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java
index a2a4a78099..942680989d 100644
--- a/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.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 org.jboss.netty.util;
+package org.jboss.netty.handler.timeout;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -32,6 +32,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import org.jboss.netty.util.ExecutorUtil;
+import org.jboss.netty.util.MapBackedSet;
+
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
diff --git a/src/main/java/org/jboss/netty/util/Timeout.java b/src/main/java/org/jboss/netty/handler/timeout/Timeout.java
similarity index 97%
rename from src/main/java/org/jboss/netty/util/Timeout.java
rename to src/main/java/org/jboss/netty/handler/timeout/Timeout.java
index 3d10a667e9..0dcf91e462 100644
--- a/src/main/java/org/jboss/netty/util/Timeout.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/Timeout.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 org.jboss.netty.util;
+package org.jboss.netty.handler.timeout;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/main/java/org/jboss/netty/util/Timer.java b/src/main/java/org/jboss/netty/handler/timeout/Timer.java
similarity index 93%
rename from src/main/java/org/jboss/netty/util/Timer.java
rename to src/main/java/org/jboss/netty/handler/timeout/Timer.java
index d85badfc50..7023ccc29c 100644
--- a/src/main/java/org/jboss/netty/util/Timer.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/Timer.java
@@ -20,10 +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 org.jboss.netty.util;
+package org.jboss.netty.handler.timeout;
 
 import java.util.concurrent.TimeUnit;
 
+import org.jboss.netty.util.ExternalResourceReleasable;
+
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
  * @author Trustin Lee (tlee@redhat.com)
diff --git a/src/main/java/org/jboss/netty/util/TimerTask.java b/src/main/java/org/jboss/netty/handler/timeout/TimerTask.java
similarity index 96%
rename from src/main/java/org/jboss/netty/util/TimerTask.java
rename to src/main/java/org/jboss/netty/handler/timeout/TimerTask.java
index e7fd1db529..b4a45ded4e 100644
--- a/src/main/java/org/jboss/netty/util/TimerTask.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/TimerTask.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 org.jboss.netty.util;
+package org.jboss.netty.handler.timeout;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)