diff --git a/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java b/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
index 9cf8fe5399..397d50f19b 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/IdleStateHandler.java
@@ -34,6 +34,9 @@ import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 import org.jboss.netty.channel.WriteCompletionEvent;
 import org.jboss.netty.util.ExternalResourceReleasable;
+import org.jboss.netty.util.Timeout;
+import org.jboss.netty.util.Timer;
+import org.jboss.netty.util.TimerTask;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
index 93c543bc57..52d84eaeea 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/ReadTimeoutHandler.java
@@ -34,6 +34,9 @@ import org.jboss.netty.channel.LifeCycleAwareChannelHandler;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 import org.jboss.netty.util.ExternalResourceReleasable;
+import org.jboss.netty.util.Timeout;
+import org.jboss.netty.util.Timer;
+import org.jboss.netty.util.TimerTask;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
index e5d41a0161..b2eda9640a 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
+++ b/src/main/java/org/jboss/netty/handler/timeout/WriteTimeoutHandler.java
@@ -34,6 +34,9 @@ import org.jboss.netty.channel.Channels;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelDownstreamHandler;
 import org.jboss.netty.util.ExternalResourceReleasable;
+import org.jboss.netty.util.Timeout;
+import org.jboss.netty.util.Timer;
+import org.jboss.netty.util.TimerTask;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java b/src/main/java/org/jboss/netty/util/HashedWheelTimer.java
similarity index 99%
rename from src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java
rename to src/main/java/org/jboss/netty/util/HashedWheelTimer.java
index 8f9d9191d3..aa1a808c72 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/HashedWheelTimer.java
+++ b/src/main/java/org/jboss/netty/util/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.handler.timeout;
+package org.jboss.netty.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/org/jboss/netty/handler/timeout/Timeout.java b/src/main/java/org/jboss/netty/util/Timeout.java
similarity index 96%
rename from src/main/java/org/jboss/netty/handler/timeout/Timeout.java
rename to src/main/java/org/jboss/netty/util/Timeout.java
index 6da087bf42..5d87f4b583 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/Timeout.java
+++ b/src/main/java/org/jboss/netty/util/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.handler.timeout;
+package org.jboss.netty.util;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)
diff --git a/src/main/java/org/jboss/netty/handler/timeout/Timer.java b/src/main/java/org/jboss/netty/util/Timer.java
similarity index 97%
rename from src/main/java/org/jboss/netty/handler/timeout/Timer.java
rename to src/main/java/org/jboss/netty/util/Timer.java
index ba17c4c52c..70d1172e5c 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/Timer.java
+++ b/src/main/java/org/jboss/netty/util/Timer.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.handler.timeout;
+package org.jboss.netty.util;
 
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/org/jboss/netty/handler/timeout/TimerTask.java b/src/main/java/org/jboss/netty/util/TimerTask.java
similarity index 96%
rename from src/main/java/org/jboss/netty/handler/timeout/TimerTask.java
rename to src/main/java/org/jboss/netty/util/TimerTask.java
index b4a45ded4e..e7fd1db529 100644
--- a/src/main/java/org/jboss/netty/handler/timeout/TimerTask.java
+++ b/src/main/java/org/jboss/netty/util/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.handler.timeout;
+package org.jboss.netty.util;
 
 /**
  * @author The Netty Project (netty-dev@lists.jboss.org)