diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/AcceptingChannel.java b/apps/ministreaming/java/src/net/i2p/client/streaming/AcceptingChannel.java
index 292bb28ea..7828f6989 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/AcceptingChannel.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/AcceptingChannel.java
@@ -16,11 +16,11 @@ import java.nio.channels.SelectableChannel;
  */
 public abstract class AcceptingChannel extends SelectableChannel {
 
-    abstract I2PSocket accept() throws I2PException, ConnectException;
+    public abstract I2PSocket accept() throws I2PException, ConnectException;
 
     protected final I2PSocketManager _socketManager;
 
-    AcceptingChannel(I2PSocketManager manager) {
+    protected AcceptingChannel(I2PSocketManager manager) {
         this._socketManager = manager;
     }
 }
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
index ebfb0c707..e7aff4cfb 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java
@@ -25,7 +25,7 @@ import net.i2p.util.Log;
 public class I2PSocketManagerFactory {
 
     public static final String PROP_MANAGER = "i2p.streaming.manager";
-    public static final String DEFAULT_MANAGER = "net.i2p.client.streaming.I2PSocketManagerFull";
+    public static final String DEFAULT_MANAGER = "net.i2p.client.streaming.impl.I2PSocketManagerFull";
     
     /**
      * Create a socket manager using a brand new destination connected to the
diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java
index 02a4d9dd4..a4053111e 100644
--- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java
+++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java
@@ -6,7 +6,7 @@ import java.util.Properties;
  * Define the configuration for streaming and verifying data on the socket.
  * Use I2PSocketManager.buildOptions() to get one of these.
  */
-class I2PSocketOptionsImpl implements I2PSocketOptions {
+public class I2PSocketOptionsImpl implements I2PSocketOptions {
     private long _connectTimeout;
     private long _readTimeout;
     private long _writeTimeout;
@@ -93,7 +93,7 @@ class I2PSocketOptionsImpl implements I2PSocketOptions {
         }
     }
     
-    protected static double getDouble(Properties opts, String name, double defaultVal) {
+    public static double getDouble(Properties opts, String name, double defaultVal) {
         if (opts == null) return defaultVal;
         String val = opts.getProperty(name);
         if (val == null) {
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/AcceptingChannelImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java
similarity index 91%
rename from apps/streaming/java/src/net/i2p/client/streaming/AcceptingChannelImpl.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java
index 61dc90170..4dfa3ed16 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/AcceptingChannelImpl.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java
@@ -1,6 +1,10 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PException;
+import net.i2p.client.streaming.AcceptingChannel;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.client.streaming.I2PSocketManager;
 
 import java.net.SocketTimeoutException;
 import java.net.ConnectException;
@@ -29,7 +33,7 @@ class AcceptingChannelImpl extends AcceptingChannel {
     private volatile I2PSocket next;
     private final I2PServerSocket socket;
 
-    I2PSocket accept() throws I2PException, ConnectException {
+    public I2PSocket accept() throws I2PException, ConnectException {
         I2PSocket sock;
         try {
             sock = socket.accept();
@@ -43,7 +47,7 @@ class AcceptingChannelImpl extends AcceptingChannel {
         }
     }
 
-    AcceptingChannelImpl(I2PSocketManager manager) {
+    protected AcceptingChannelImpl(I2PSocketManager manager) {
         super(manager);
         // this cheats and just sets the manager timeout low in order to repeatedly poll it.
         // that means we can "only" accept one new connection every 100 milliseconds.
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnThrottler.java
similarity index 98%
rename from apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/ConnThrottler.java
index 14dd77c9c..14add7b3f 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnThrottler.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/Connection.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
index 9c2a9051f..47cfd6a53 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionDataReceiver.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionDataReceiver.java
index c758f692b..dbf546ad8 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionDataReceiver.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/ConnectionHandler.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
index c7cfed88a..5ac1468ce 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
index e4281b5fb..0e3c976a7 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionManager.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java
index 0e5b0dccb..3375a4def 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java
@@ -1,4 +1,7 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
+
+import net.i2p.client.streaming.I2PSocketOptionsImpl;
+import net.i2p.client.streaming.I2PSocketOptions;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java
index f758c749f..0595c8471 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionPacketHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.List;
 
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/I2PServerSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
similarity index 86%
rename from apps/streaming/java/src/net/i2p/client/streaming/I2PServerSocketFull.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
index 5eddc45c5..6ef59e0c5 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/I2PServerSocketFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java
@@ -1,7 +1,11 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.net.SocketTimeoutException;
 import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.client.streaming.AcceptingChannel;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketManager;
 
 /**
  * Bridge to allow accepting new connections
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java
similarity index 97%
rename from apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java
index 09060b595..c8775c903 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,6 +10,8 @@ import net.i2p.I2PAppContext;
 import net.i2p.client.I2PSession;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketOptions;
 
 /**
  * Bridge between the full streaming lib and the I2PSocket API
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
similarity index 98%
rename from apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
index 0d0659757..30a76f6b5 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/I2PSocketManagerFull.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.net.NoRouteToHostException;
@@ -17,7 +17,10 @@ import net.i2p.client.I2PSession;
 import net.i2p.client.I2PSessionException;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
-
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.client.streaming.I2PSocketOptions;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PServerSocket;
 
 /**
  * Centralize the coordination and multiplexing of the local client's streaming.
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageChannel.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageChannel.java
similarity index 98%
rename from apps/streaming/java/src/net/i2p/client/streaming/MessageChannel.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/MessageChannel.java
index af10cf886..d8ef4a2ac 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/MessageChannel.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageChannel.java
@@ -1,4 +1,6 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
+
+import net.i2p.client.streaming.I2PSocket;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java
similarity index 98%
rename from apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java
index 63b15c829..0066d933b 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/MessageHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -9,6 +9,7 @@ import net.i2p.client.I2PSessionException;
 import net.i2p.client.I2PSessionMuxedListener;
 import net.i2p.client.streaming.I2PSocketManager.DisconnectListener;
 import net.i2p.util.Log;
+import net.i2p.client.streaming.I2PSocketManager;
 
 /**
  * Receive raw information from the I2PSession and turn it into
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java
index d06273730..8527bc72f 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/MessageInputStream.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java
index 5afb37358..681c77b7f 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/MessageOutputStream.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/Packet.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java
index 6fbe1dcce..010674c9b 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/Packet.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
index 7dd10c331..04c5cbbb9 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/PacketHandler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java
index 37ebb0f54..f95ff335c 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/PacketLocal.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java
index 4764c9abf..399d9f718 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/PacketQueue.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.I2PSession;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/PcapWriter.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/PcapWriter.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java
index 716f41ff8..8e3c77c1a 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/PcapWriter.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/RetransmissionTimer.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/RetransmissionTimer.java
similarity index 93%
rename from apps/streaming/java/src/net/i2p/client/streaming/RetransmissionTimer.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/RetransmissionTimer.java
index 93e9fda35..5ffac1016 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/RetransmissionTimer.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/RetransmissionTimer.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.SimpleTimer2;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerChooser.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerChooser.java
similarity index 98%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerChooser.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerChooser.java
index 34195cc28..f995954cb 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerChooser.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerChooser.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerClosed.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerClosed.java
similarity index 97%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerClosed.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerClosed.java
index c9e8cae9b..4159c76b1 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerClosed.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerClosed.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerClosing.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerClosing.java
similarity index 98%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerClosing.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerClosing.java
index b8754f784..424c9a46c 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerClosing.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerClosing.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnectedBulk.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerConnectedBulk.java
similarity index 98%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnectedBulk.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerConnectedBulk.java
index 77ec05587..228b8a706 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnectedBulk.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerConnectedBulk.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnecting.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerConnecting.java
similarity index 98%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnecting.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerConnecting.java
index 1df4ecdfd..e85644249 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerConnecting.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerConnecting.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerDead.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerDead.java
similarity index 96%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerDead.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerDead.java
index 9aa70ea8e..04c420509 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerDead.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerDead.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerHardDisconnected.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerHardDisconnected.java
similarity index 97%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerHardDisconnected.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerHardDisconnected.java
index 597e2c6ca..eaf682f9e 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerHardDisconnected.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerHardDisconnected.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerImpl.java
similarity index 93%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerImpl.java
index 0b8c7fa8a..7a5b63574 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerImpl.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerImpl.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerPreconnect.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerPreconnect.java
similarity index 97%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerPreconnect.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerPreconnect.java
index fdbefe1c3..3f4855b96 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerPreconnect.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerPreconnect.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerReceived.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerReceived.java
similarity index 97%
rename from apps/streaming/java/src/net/i2p/client/streaming/SchedulerReceived.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerReceived.java
index e44c68d11..abe2cec2a 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/SchedulerReceived.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerReceived.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/StandardServerSocket.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardServerSocket.java
similarity index 97%
rename from apps/streaming/java/src/net/i2p/client/streaming/StandardServerSocket.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/StandardServerSocket.java
index 1429fa606..a2c1a9118 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/StandardServerSocket.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardServerSocket.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -9,6 +9,7 @@ import java.net.SocketException;
 import java.nio.channels.ServerSocketChannel;
 
 import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PSocket;
 
 /**
  * Bridge to I2PServerSocket.
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/StandardSocket.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java
similarity index 98%
rename from apps/streaming/java/src/net/i2p/client/streaming/StandardSocket.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java
index 30de8265a..529db4760 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/StandardSocket.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java
@@ -1,4 +1,7 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
+
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketOptions;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/TCBShare.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java
similarity index 99%
rename from apps/streaming/java/src/net/i2p/client/streaming/TCBShare.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java
index 67d30f52d..e5150b3d1 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/TCBShare.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.Iterator;
 import java.util.Map;
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/TaskScheduler.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/TaskScheduler.java
similarity index 93%
rename from apps/streaming/java/src/net/i2p/client/streaming/TaskScheduler.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/TaskScheduler.java
index c998c8425..7f515f416 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/TaskScheduler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/TaskScheduler.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 /**
  * Coordinates what we do 'next'.  The scheduler used by a connection is
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/TooManyStreamsException.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/TooManyStreamsException.java
similarity index 91%
rename from apps/streaming/java/src/net/i2p/client/streaming/TooManyStreamsException.java
rename to apps/streaming/java/src/net/i2p/client/streaming/impl/TooManyStreamsException.java
index d53ef08a9..7ccb7ffc8 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/TooManyStreamsException.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/TooManyStreamsException.java
@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PException;
 
diff --git a/history.txt b/history.txt
index e0b60f0fc..568ac36ea 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2014-01-04 dg
+ * Streaming: Move streaming to new package (ticket #1135)
+
 2013-12-25 dg
  * Console: Add 'advanced warning' to /configclients
  * SOCKS5Server: Remove redundant, commented out line from my previous findbugs