diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectCloseTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectCloseTest.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectCloseTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectCloseTest.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectInactivityTest.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectInactivityTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectInactivityTest.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectTest.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectTest.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectTimeoutTest.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/ConnectTimeoutTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/ConnectTimeoutTest.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/EchoLargeTest.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/EchoLargeTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/EchoLargeTest.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/EchoTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/EchoTest.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/EchoTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/EchoTest.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/MessageInputStreamTest.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/MessageInputStreamTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/MessageInputStreamTest.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/MessageOutputStreamTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/MessageOutputStreamTest.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/MessageOutputStreamTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/MessageOutputStreamTest.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/PingTest.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/PingTest.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/PingTest.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/PingTest.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestClient.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/StreamSinkTestClient.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestClient.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/StreamSinkTestClient.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestServer.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/StreamSinkTestServer.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestServer.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/StreamSinkTestServer.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestStandalone.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/StreamSinkTestStandalone.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/StreamSinkTestStandalone.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/StreamSinkTestStandalone.java
diff --git a/apps/streaming/java/test/junit/net/i2p/client/streaming/StreamingTestBase.java b/apps/streaming/java/test/junit/net/i2p/client/streaming/impl/StreamingTestBase.java
similarity index 100%
rename from apps/streaming/java/test/junit/net/i2p/client/streaming/StreamingTestBase.java
rename to apps/streaming/java/test/junit/net/i2p/client/streaming/impl/StreamingTestBase.java