diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
index 23700e13d..da1ecb4b8 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildHandler.java
@@ -35,8 +35,6 @@ import net.i2p.router.RouterContext;
 import net.i2p.router.crypto.ratchet.RatchetSessionTag;
 import net.i2p.router.networkdb.kademlia.MessageWrapper;
 import net.i2p.router.peermanager.TunnelHistory;
-import net.i2p.router.tunnel.BuildMessageProcessor;
-import net.i2p.router.tunnel.BuildReplyHandler;
 import net.i2p.router.tunnel.HopConfig;
 import net.i2p.router.tunnel.TunnelDispatcher;
 import net.i2p.router.util.CDQEntry;
diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java b/router/java/src/net/i2p/router/tunnel/pool/BuildMessageGenerator.java
similarity index 97%
rename from router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java
rename to router/java/src/net/i2p/router/tunnel/pool/BuildMessageGenerator.java
index 6b16c2013..4e7aa3e05 100644
--- a/router/java/src/net/i2p/router/tunnel/BuildMessageGenerator.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildMessageGenerator.java
@@ -1,4 +1,4 @@
-package net.i2p.router.tunnel;
+package net.i2p.router.tunnel.pool;
 
 import java.util.List;
 
@@ -17,11 +17,15 @@ import net.i2p.data.i2np.ShortEncryptedBuildRecord;
 import net.i2p.data.i2np.ShortTunnelBuildMessage;
 import net.i2p.data.i2np.TunnelBuildMessage;
 import net.i2p.router.RouterContext;
+import net.i2p.router.tunnel.HopConfig;
+import net.i2p.router.tunnel.TunnelCreatorConfig;
 
 /**
  *  Fill in the encrypted BuildRequestRecords in a TunnelBuildMessage
+ *
+ *  @since 0.9.51 moved to tunnel.pool package
  */
-public abstract class BuildMessageGenerator {
+abstract class BuildMessageGenerator {
     
     /**
      * Place the asymmetrically encrypted record in the specified record slot, 
diff --git a/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildMessageProcessor.java
similarity index 98%
rename from router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java
rename to router/java/src/net/i2p/router/tunnel/pool/BuildMessageProcessor.java
index f499bca36..9d0aade21 100644
--- a/router/java/src/net/i2p/router/tunnel/BuildMessageProcessor.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildMessageProcessor.java
@@ -1,4 +1,4 @@
-package net.i2p.router.tunnel;
+package net.i2p.router.tunnel.pool;
 
 import net.i2p.crypto.EncType;
 import net.i2p.data.Base64;
@@ -26,8 +26,9 @@ import net.i2p.util.SystemVersion;
  * There is only one of these.
  * Instantiated by BuildHandler.
  *
+ * @since 0.9.51 moved to tunnel.pool package
  */
-public class BuildMessageProcessor {
+class BuildMessageProcessor {
     private final RouterContext ctx;
     private final Log log;
     private final DecayingBloomFilter _filter;
diff --git a/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java b/router/java/src/net/i2p/router/tunnel/pool/BuildReplyHandler.java
similarity index 97%
rename from router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java
rename to router/java/src/net/i2p/router/tunnel/pool/BuildReplyHandler.java
index 53663ae0d..ba13ad318 100644
--- a/router/java/src/net/i2p/router/tunnel/BuildReplyHandler.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildReplyHandler.java
@@ -1,4 +1,4 @@
-package net.i2p.router.tunnel;
+package net.i2p.router.tunnel.pool;
 
 import java.util.List;
 
@@ -11,6 +11,7 @@ import net.i2p.data.i2np.BuildResponseRecord;
 import net.i2p.data.i2np.EncryptedBuildRecord;
 import net.i2p.data.i2np.OutboundTunnelBuildReplyMessage;
 import net.i2p.data.i2np.TunnelBuildReplyMessage;
+import net.i2p.router.tunnel.TunnelCreatorConfig;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleByteCache;
 
@@ -18,8 +19,9 @@ import net.i2p.util.SimpleByteCache;
  * Decrypt the layers of a tunnel build reply message, determining whether the individual 
  * hops agreed to participate in the tunnel, or if not, why not.
  *
+ * @since 0.9.51 moved to tunnel.pool package
  */
-public class BuildReplyHandler {
+class BuildReplyHandler {
 
     private final I2PAppContext ctx;
     private final Log log;
diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
index 444b5cf26..2ac64b928 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java
@@ -22,7 +22,6 @@ import net.i2p.router.TunnelInfo;
 import net.i2p.router.TunnelManagerFacade;
 import net.i2p.router.TunnelPoolSettings;
 import net.i2p.router.networkdb.kademlia.MessageWrapper;
-import net.i2p.router.tunnel.BuildMessageGenerator;
 import net.i2p.router.tunnel.HopConfig;
 import net.i2p.router.tunnel.TunnelCreatorConfig;
 import net.i2p.util.Log;