diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/BandwidthEstimator.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/BandwidthEstimator.java
deleted file mode 100644
index b0fb51ce0..000000000
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/BandwidthEstimator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.i2p.client.streaming.impl;
-
-/**
- *  A Westwood bandwidth estimator
- *
- *  @since 0.9.46
- */
-interface BandwidthEstimator {
-
-    /**
-     * Records an arriving ack.
-     * @param acked how many packets were acked with this ack
-     */
-    public void addSample(int acked);
-
-    /**
-     * @return the current bandwidth estimate in packets/ms.
-     */
-    public float getBandwidthEstimate();
-}
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
index 9698ec9d0..d2c5f7ead 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
@@ -17,6 +17,7 @@ import net.i2p.client.streaming.I2PSocketException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.data.SigningPublicKey;
+import net.i2p.util.BandwidthEstimator;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleTimer;
 import net.i2p.util.SimpleTimer2;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/SimpleBandwidthEstimator.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SimpleBandwidthEstimator.java
index bcc1ccc45..dae414a3c 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/SimpleBandwidthEstimator.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SimpleBandwidthEstimator.java
@@ -2,6 +2,7 @@ package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
+import net.i2p.util.BandwidthEstimator;
 import net.i2p.util.Log;
 
 /**
diff --git a/core/java/src/net/i2p/util/BandwidthEstimator.java b/core/java/src/net/i2p/util/BandwidthEstimator.java
new file mode 100644
index 000000000..6262c1c77
--- /dev/null
+++ b/core/java/src/net/i2p/util/BandwidthEstimator.java
@@ -0,0 +1,20 @@
+package net.i2p.util;
+
+/**
+ *  A Westwood bandwidth estimator
+ *
+ *  @since 0.9.46 consolidated from streaming and udp in 0.9.50
+ */
+public interface BandwidthEstimator {
+
+    /**
+     * Records an arriving ack.
+     * @param acked how many bytes or packets were acked with this ack
+     */
+    public void addSample(int acked);
+
+    /**
+     * @return the current bandwidth estimate in bytes/ms or packets/ms.
+     */
+    public float getBandwidthEstimate();
+}
diff --git a/router/java/src/net/i2p/router/transport/udp/BandwidthEstimator.java b/router/java/src/net/i2p/router/transport/udp/BandwidthEstimator.java
deleted file mode 100644
index 2012a4532..000000000
--- a/router/java/src/net/i2p/router/transport/udp/BandwidthEstimator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.i2p.router.transport.udp;
-
-/**
- *  A Westwood bandwidth estimator
- *
- *  @since 0.9.49 adapted from streaming
- */
-interface BandwidthEstimator {
-
-    /**
-     * Records an arriving ack.
-     * @param acked how many bytes were acked with this ack
-     */
-    public void addSample(int acked);
-
-    /**
-     * @return the current bandwidth estimate in bytes/ms.
-     */
-    public float getBandwidthEstimate();
-}
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 fa0e9bc07..115960ec0 100644
--- a/router/java/src/net/i2p/router/transport/udp/PeerState.java
+++ b/router/java/src/net/i2p/router/transport/udp/PeerState.java
@@ -24,6 +24,7 @@ import net.i2p.router.transport.udp.InboundMessageFragments.ModifiableLong;
 import net.i2p.router.util.CachedIteratorCollection;
 import net.i2p.router.util.CoDelPriorityBlockingQueue;
 import net.i2p.router.util.PriBlockingQueue;
+import net.i2p.util.BandwidthEstimator;
 import net.i2p.util.Log;
 import net.i2p.util.ConcurrentHashSet;
 
diff --git a/router/java/src/net/i2p/router/transport/udp/SimpleBandwidthEstimator.java b/router/java/src/net/i2p/router/transport/udp/SimpleBandwidthEstimator.java
index ba1726dbf..e7443cc6c 100644
--- a/router/java/src/net/i2p/router/transport/udp/SimpleBandwidthEstimator.java
+++ b/router/java/src/net/i2p/router/transport/udp/SimpleBandwidthEstimator.java
@@ -2,6 +2,7 @@ package net.i2p.router.transport.udp;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
+import net.i2p.util.BandwidthEstimator;
 import net.i2p.util.Log;
 
 /**