diff --git a/router/java/src/net/i2p/router/transport/udp/PeerState.java b/router/java/src/net/i2p/router/transport/udp/PeerState.java
index 881d178589..3c902883c9 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerState.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java
@@ -17,9 +17,9 @@ import net.i2p.data.Hash;
 import net.i2p.data.SessionKey;
 import net.i2p.router.OutNetMessage;
 import net.i2p.router.RouterContext;
+import net.i2p.router.util.CachedIteratorArrayList;
 import net.i2p.router.util.CoDelPriorityBlockingQueue;
 import net.i2p.router.util.PriBlockingQueue;
-import net.i2p.util.CachedIteratorArrayList;
 import net.i2p.util.Log;
 import net.i2p.util.ConcurrentHashSet;
 
diff --git a/core/java/src/net/i2p/util/CachedIteratorArrayList.java b/router/java/src/net/i2p/router/util/CachedIteratorArrayList.java
similarity index 97%
rename from core/java/src/net/i2p/util/CachedIteratorArrayList.java
rename to router/java/src/net/i2p/router/util/CachedIteratorArrayList.java
index 534e33c78f..b6abba63bd 100644
--- a/core/java/src/net/i2p/util/CachedIteratorArrayList.java
+++ b/router/java/src/net/i2p/router/util/CachedIteratorArrayList.java
@@ -1,4 +1,4 @@
-package net.i2p.util;
+package net.i2p.router.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -11,7 +11,7 @@ import java.util.NoSuchElementException;
  * ArrayList that uses a single iterator.  Useful to avoid object churn
  * while keeping the conveniences of an iterator.
  * 
- * @since 0.9.4
+ * @since 0.9.4 moved from net.i2p.util in 0.9.24
  * 
  * @author zab
  */
diff --git a/core/java/test/junit/net/i2p/util/CachedIteratorArrayListTest.java b/router/java/test/junit/net/i2p/router/util/CachedIteratorArrayListTest.java
similarity index 98%
rename from core/java/test/junit/net/i2p/util/CachedIteratorArrayListTest.java
rename to router/java/test/junit/net/i2p/router/util/CachedIteratorArrayListTest.java
index 860f0e213c..6ba570f0fb 100644
--- a/core/java/test/junit/net/i2p/util/CachedIteratorArrayListTest.java
+++ b/router/java/test/junit/net/i2p/router/util/CachedIteratorArrayListTest.java
@@ -1,4 +1,4 @@
-package net.i2p.util;
+package net.i2p.router.util;
 
 import static org.junit.Assert.*;