commit 29cbef1f9ba14dab4cc3117c11bf552a1b24c597
author nathanmittler <nathanmittler@google.com> Mon Oct 27 11:33:19 2014 -0700
committer Eric Anderson <ejona@google.com> Thu Jan 08 14:43:00 2015 -0800
tree 8eb0cac0cd1801101b84302c304305fabbe60398
parent 3c986bbcdb2f603883107270c8c4d0b6bbc0b748

Renaming gRPC-java "newtransport" package to just "transport".

-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=78596663

core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java

diff --git a/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java b/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java
index 0c5348b..61a8111 100644
--- a/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java
+++ b/core/src/main/java/com/google/net/stubby/AbstractChannelBuilder.java
@@ -3,7 +3,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Service;
-import com.google.net.stubby.newtransport.ClientTransportFactory;
+import com.google.net.stubby.transport.ClientTransportFactory;
 
 import java.util.concurrent.ExecutorService;
 

core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java

diff --git a/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java b/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java
index 969184b..6e210cb 100644
--- a/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java
+++ b/core/src/main/java/com/google/net/stubby/AbstractServerBuilder.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Service;
-import com.google.net.stubby.newtransport.ServerListener;
+import com.google.net.stubby.transport.ServerListener;
 
 import java.util.concurrent.ExecutorService;
 

core/src/main/java/com/google/net/stubby/ChannelImpl.java

diff --git a/core/src/main/java/com/google/net/stubby/ChannelImpl.java b/core/src/main/java/com/google/net/stubby/ChannelImpl.java
index 56d76c3..a378836 100644
--- a/core/src/main/java/com/google/net/stubby/ChannelImpl.java
+++ b/core/src/main/java/com/google/net/stubby/ChannelImpl.java
@@ -5,15 +5,15 @@
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.AbstractService;
-import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
-import com.google.net.stubby.newtransport.ClientStream;
-import com.google.net.stubby.newtransport.ClientStreamListener;
-import com.google.net.stubby.newtransport.ClientTransport;
-import com.google.net.stubby.newtransport.ClientTransportFactory;
+import com.google.net.stubby.transport.ClientStream;
+import com.google.net.stubby.transport.ClientStreamListener;
+import com.google.net.stubby.transport.ClientTransport;
+import com.google.net.stubby.transport.ClientTransportFactory;
 
 import java.io.IOException;
 import java.io.InputStream;

core/src/main/java/com/google/net/stubby/ServerImpl.java

diff --git a/core/src/main/java/com/google/net/stubby/ServerImpl.java b/core/src/main/java/com/google/net/stubby/ServerImpl.java
index ec21fdd..962ecec 100644
--- a/core/src/main/java/com/google/net/stubby/ServerImpl.java
+++ b/core/src/main/java/com/google/net/stubby/ServerImpl.java
@@ -3,23 +3,23 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.util.concurrent.AbstractService;
-import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Service;
 import com.google.common.util.concurrent.SettableFuture;
-import com.google.net.stubby.newtransport.ServerListener;
-import com.google.net.stubby.newtransport.ServerStream;
-import com.google.net.stubby.newtransport.ServerStreamListener;
-import com.google.net.stubby.newtransport.ServerTransportListener;
+import com.google.net.stubby.transport.ServerListener;
+import com.google.net.stubby.transport.ServerStream;
+import com.google.net.stubby.transport.ServerStreamListener;
+import com.google.net.stubby.transport.ServerTransportListener;
 
 import java.io.InputStream;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.concurrent.Executor;
 import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
 
 import javax.annotation.Nullable;
 

core/src/main/java/com/google/net/stubby/transport/AbstractBuffer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractBuffer.java b/core/src/main/java/com/google/net/stubby/transport/AbstractBuffer.java
similarity index 96%
rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractBuffer.java
rename to core/src/main/java/com/google/net/stubby/transport/AbstractBuffer.java
index f85860d..0d53cf0 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractBuffer.java
+++ b/core/src/main/java/com/google/net/stubby/transport/AbstractBuffer.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 /**
  * Abstract base class for {@link Buffer} implementations.

core/src/main/java/com/google/net/stubby/transport/AbstractClientStream.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractClientStream.java b/core/src/main/java/com/google/net/stubby/transport/AbstractClientStream.java
similarity index 94%
rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractClientStream.java
rename to core/src/main/java/com/google/net/stubby/transport/AbstractClientStream.java
index 7fbe7de..4141f10 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractClientStream.java
+++ b/core/src/main/java/com/google/net/stubby/transport/AbstractClientStream.java
@@ -1,8 +1,8 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
-import static com.google.net.stubby.newtransport.StreamState.CLOSED;
-import static com.google.net.stubby.newtransport.StreamState.OPEN;
-import static com.google.net.stubby.newtransport.StreamState.READ_ONLY;
+import static com.google.net.stubby.transport.StreamState.CLOSED;
+import static com.google.net.stubby.transport.StreamState.OPEN;
+import static com.google.net.stubby.transport.StreamState.READ_ONLY;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;

core/src/main/java/com/google/net/stubby/transport/AbstractClientTransport.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractClientTransport.java b/core/src/main/java/com/google/net/stubby/transport/AbstractClientTransport.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractClientTransport.java
rename to core/src/main/java/com/google/net/stubby/transport/AbstractClientTransport.java
index 1461a1e..aa7bcff 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractClientTransport.java
+++ b/core/src/main/java/com/google/net/stubby/transport/AbstractClientTransport.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.AbstractService;

core/src/main/java/com/google/net/stubby/transport/AbstractServerStream.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractServerStream.java b/core/src/main/java/com/google/net/stubby/transport/AbstractServerStream.java
similarity index 95%
rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractServerStream.java
rename to core/src/main/java/com/google/net/stubby/transport/AbstractServerStream.java
index 7864c84..0e4a44a 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractServerStream.java
+++ b/core/src/main/java/com/google/net/stubby/transport/AbstractServerStream.java
@@ -1,8 +1,8 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
-import static com.google.net.stubby.newtransport.StreamState.CLOSED;
-import static com.google.net.stubby.newtransport.StreamState.OPEN;
-import static com.google.net.stubby.newtransport.StreamState.WRITE_ONLY;
+import static com.google.net.stubby.transport.StreamState.CLOSED;
+import static com.google.net.stubby.transport.StreamState.OPEN;
+import static com.google.net.stubby.transport.StreamState.WRITE_ONLY;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;

core/src/main/java/com/google/net/stubby/transport/AbstractStream.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/AbstractStream.java b/core/src/main/java/com/google/net/stubby/transport/AbstractStream.java
similarity index 99%
rename from core/src/main/java/com/google/net/stubby/newtransport/AbstractStream.java
rename to core/src/main/java/com/google/net/stubby/transport/AbstractStream.java
index 95f1974..c4b3a2d 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/AbstractStream.java
+++ b/core/src/main/java/com/google/net/stubby/transport/AbstractStream.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.base.Preconditions;
 import com.google.common.io.Closeables;

core/src/main/java/com/google/net/stubby/transport/Buffer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Buffer.java b/core/src/main/java/com/google/net/stubby/transport/Buffer.java
similarity index 98%
rename from core/src/main/java/com/google/net/stubby/newtransport/Buffer.java
rename to core/src/main/java/com/google/net/stubby/transport/Buffer.java
index 7e4be67..05eb656 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/Buffer.java
+++ b/core/src/main/java/com/google/net/stubby/transport/Buffer.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import java.io.Closeable;
 import java.io.IOException;

core/src/main/java/com/google/net/stubby/transport/Buffers.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Buffers.java b/core/src/main/java/com/google/net/stubby/transport/Buffers.java
similarity index 99%
rename from core/src/main/java/com/google/net/stubby/newtransport/Buffers.java
rename to core/src/main/java/com/google/net/stubby/transport/Buffers.java
index cc21f50..06c46a4 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/Buffers.java
+++ b/core/src/main/java/com/google/net/stubby/transport/Buffers.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static com.google.common.base.Charsets.UTF_8;
 

core/src/main/java/com/google/net/stubby/transport/ClientStream.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ClientStream.java b/core/src/main/java/com/google/net/stubby/transport/ClientStream.java
similarity index 93%
rename from core/src/main/java/com/google/net/stubby/newtransport/ClientStream.java
rename to core/src/main/java/com/google/net/stubby/transport/ClientStream.java
index a2110bb..7848209 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/ClientStream.java
+++ b/core/src/main/java/com/google/net/stubby/transport/ClientStream.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 /**
  * Extension of {@link Stream} to support client-side termination semantics.

core/src/main/java/com/google/net/stubby/transport/ClientStreamListener.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ClientStreamListener.java b/core/src/main/java/com/google/net/stubby/transport/ClientStreamListener.java
similarity index 96%
rename from core/src/main/java/com/google/net/stubby/newtransport/ClientStreamListener.java
rename to core/src/main/java/com/google/net/stubby/transport/ClientStreamListener.java
index 07b92dd..d8d6a47 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/ClientStreamListener.java
+++ b/core/src/main/java/com/google/net/stubby/transport/ClientStreamListener.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.net.stubby.Metadata;

core/src/main/java/com/google/net/stubby/transport/ClientTransport.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ClientTransport.java b/core/src/main/java/com/google/net/stubby/transport/ClientTransport.java
similarity index 96%
rename from core/src/main/java/com/google/net/stubby/newtransport/ClientTransport.java
rename to core/src/main/java/com/google/net/stubby/transport/ClientTransport.java
index 418cf6e..28cff82 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/ClientTransport.java
+++ b/core/src/main/java/com/google/net/stubby/transport/ClientTransport.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.util.concurrent.Service;
 import com.google.net.stubby.Metadata;

core/src/main/java/com/google/net/stubby/transport/ClientTransportFactory.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ClientTransportFactory.java b/core/src/main/java/com/google/net/stubby/transport/ClientTransportFactory.java
similarity index 83%
rename from core/src/main/java/com/google/net/stubby/newtransport/ClientTransportFactory.java
rename to core/src/main/java/com/google/net/stubby/transport/ClientTransportFactory.java
index fc399da..8acf295 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/ClientTransportFactory.java
+++ b/core/src/main/java/com/google/net/stubby/transport/ClientTransportFactory.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 /** Pre-configured factory for creating {@link ClientTransport} instances. */
 public interface ClientTransportFactory {

core/src/main/java/com/google/net/stubby/transport/CompositeBuffer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/CompositeBuffer.java b/core/src/main/java/com/google/net/stubby/transport/CompositeBuffer.java
similarity index 98%
rename from core/src/main/java/com/google/net/stubby/newtransport/CompositeBuffer.java
rename to core/src/main/java/com/google/net/stubby/transport/CompositeBuffer.java
index 3fbf521..cc83138 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/CompositeBuffer.java
+++ b/core/src/main/java/com/google/net/stubby/transport/CompositeBuffer.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import java.io.IOException;
 import java.io.OutputStream;

core/src/main/java/com/google/net/stubby/transport/CompressionFramer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/CompressionFramer.java b/core/src/main/java/com/google/net/stubby/transport/CompressionFramer.java
similarity index 98%
rename from core/src/main/java/com/google/net/stubby/newtransport/CompressionFramer.java
rename to core/src/main/java/com/google/net/stubby/transport/CompressionFramer.java
index 43b3484..65a453f 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/CompressionFramer.java
+++ b/core/src/main/java/com/google/net/stubby/transport/CompressionFramer.java
@@ -1,10 +1,10 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.io.ByteStreams;
 import com.google.net.stubby.DeferredInputStream;
-import com.google.net.stubby.newtransport.Framer.Sink;
+import com.google.net.stubby.transport.Framer.Sink;
 
 import java.io.IOException;
 import java.io.InputStream;

core/src/main/java/com/google/net/stubby/transport/Decompressor.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Decompressor.java b/core/src/main/java/com/google/net/stubby/transport/Decompressor.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/Decompressor.java
rename to core/src/main/java/com/google/net/stubby/transport/Decompressor.java
index cd955b6..60d3167 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/Decompressor.java
+++ b/core/src/main/java/com/google/net/stubby/transport/Decompressor.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import java.io.Closeable;
 

core/src/main/java/com/google/net/stubby/transport/ForwardingBuffer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ForwardingBuffer.java b/core/src/main/java/com/google/net/stubby/transport/ForwardingBuffer.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/ForwardingBuffer.java
rename to core/src/main/java/com/google/net/stubby/transport/ForwardingBuffer.java
index 3e47920..c891d2c 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/ForwardingBuffer.java
+++ b/core/src/main/java/com/google/net/stubby/transport/ForwardingBuffer.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.base.Preconditions;
 

core/src/main/java/com/google/net/stubby/transport/Framer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Framer.java b/core/src/main/java/com/google/net/stubby/transport/Framer.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/Framer.java
rename to core/src/main/java/com/google/net/stubby/transport/Framer.java
index 1e9bdf4..a9b2d5d 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/Framer.java
+++ b/core/src/main/java/com/google/net/stubby/transport/Framer.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.net.stubby.Status;
 

core/src/main/java/com/google/net/stubby/transport/GrpcDeframer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/GrpcDeframer.java b/core/src/main/java/com/google/net/stubby/transport/GrpcDeframer.java
similarity index 99%
rename from core/src/main/java/com/google/net/stubby/newtransport/GrpcDeframer.java
rename to core/src/main/java/com/google/net/stubby/transport/GrpcDeframer.java
index 0c5b6e3..c20394e 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/GrpcDeframer.java
+++ b/core/src/main/java/com/google/net/stubby/transport/GrpcDeframer.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static com.google.net.stubby.GrpcFramingUtil.FRAME_LENGTH;
 import static com.google.net.stubby.GrpcFramingUtil.FRAME_TYPE_LENGTH;

core/src/main/java/com/google/net/stubby/transport/HttpUtil.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/HttpUtil.java b/core/src/main/java/com/google/net/stubby/transport/HttpUtil.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/HttpUtil.java
rename to core/src/main/java/com/google/net/stubby/transport/HttpUtil.java
index f974aec..aa05927 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/HttpUtil.java
+++ b/core/src/main/java/com/google/net/stubby/transport/HttpUtil.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.net.stubby.Status;
 

core/src/main/java/com/google/net/stubby/transport/MessageDeframer2.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/MessageDeframer2.java b/core/src/main/java/com/google/net/stubby/transport/MessageDeframer2.java
similarity index 99%
rename from core/src/main/java/com/google/net/stubby/newtransport/MessageDeframer2.java
rename to core/src/main/java/com/google/net/stubby/transport/MessageDeframer2.java
index ffe2c54..3d7361a 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/MessageDeframer2.java
+++ b/core/src/main/java/com/google/net/stubby/transport/MessageDeframer2.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.base.Preconditions;
 import com.google.common.io.ByteStreams;

core/src/main/java/com/google/net/stubby/transport/MessageFramer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/MessageFramer.java b/core/src/main/java/com/google/net/stubby/transport/MessageFramer.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/MessageFramer.java
rename to core/src/main/java/com/google/net/stubby/transport/MessageFramer.java
index 6080cdb..fa8a547 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/MessageFramer.java
+++ b/core/src/main/java/com/google/net/stubby/transport/MessageFramer.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.net.stubby.GrpcFramingUtil;
 import com.google.net.stubby.Status;

core/src/main/java/com/google/net/stubby/transport/MessageFramer2.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/MessageFramer2.java b/core/src/main/java/com/google/net/stubby/transport/MessageFramer2.java
similarity index 98%
rename from core/src/main/java/com/google/net/stubby/newtransport/MessageFramer2.java
rename to core/src/main/java/com/google/net/stubby/transport/MessageFramer2.java
index c46b54a..3512975 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/MessageFramer2.java
+++ b/core/src/main/java/com/google/net/stubby/transport/MessageFramer2.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.base.Preconditions;
 import com.google.common.io.ByteStreams;

core/src/main/java/com/google/net/stubby/transport/ServerListener.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ServerListener.java b/core/src/main/java/com/google/net/stubby/transport/ServerListener.java
similarity index 90%
rename from core/src/main/java/com/google/net/stubby/newtransport/ServerListener.java
rename to core/src/main/java/com/google/net/stubby/transport/ServerListener.java
index 19f1c7a..1c8f728 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/ServerListener.java
+++ b/core/src/main/java/com/google/net/stubby/transport/ServerListener.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.util.concurrent.Service;
 

core/src/main/java/com/google/net/stubby/transport/ServerStream.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java b/core/src/main/java/com/google/net/stubby/transport/ServerStream.java
similarity index 95%
rename from core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java
rename to core/src/main/java/com/google/net/stubby/transport/ServerStream.java
index f491d9f..f2127cc 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/ServerStream.java
+++ b/core/src/main/java/com/google/net/stubby/transport/ServerStream.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.Status;

core/src/main/java/com/google/net/stubby/transport/ServerStreamListener.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ServerStreamListener.java b/core/src/main/java/com/google/net/stubby/transport/ServerStreamListener.java
similarity index 96%
rename from core/src/main/java/com/google/net/stubby/newtransport/ServerStreamListener.java
rename to core/src/main/java/com/google/net/stubby/transport/ServerStreamListener.java
index 1bd06c7..0849cf3 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/ServerStreamListener.java
+++ b/core/src/main/java/com/google/net/stubby/transport/ServerStreamListener.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.net.stubby.Status;
 

core/src/main/java/com/google/net/stubby/transport/ServerTransportListener.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/ServerTransportListener.java b/core/src/main/java/com/google/net/stubby/transport/ServerTransportListener.java
similarity index 92%
rename from core/src/main/java/com/google/net/stubby/newtransport/ServerTransportListener.java
rename to core/src/main/java/com/google/net/stubby/transport/ServerTransportListener.java
index c711794..00aeb09 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/ServerTransportListener.java
+++ b/core/src/main/java/com/google/net/stubby/transport/ServerTransportListener.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.net.stubby.Metadata;
 

core/src/main/java/com/google/net/stubby/transport/Stream.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/Stream.java b/core/src/main/java/com/google/net/stubby/transport/Stream.java
similarity index 96%
rename from core/src/main/java/com/google/net/stubby/newtransport/Stream.java
rename to core/src/main/java/com/google/net/stubby/transport/Stream.java
index cd2e6d2..6de7a5b 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/Stream.java
+++ b/core/src/main/java/com/google/net/stubby/transport/Stream.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import java.io.InputStream;
 

core/src/main/java/com/google/net/stubby/transport/StreamListener.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java b/core/src/main/java/com/google/net/stubby/transport/StreamListener.java
similarity index 96%
rename from core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java
rename to core/src/main/java/com/google/net/stubby/transport/StreamListener.java
index f9ef261..7ab497e 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/StreamListener.java
+++ b/core/src/main/java/com/google/net/stubby/transport/StreamListener.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import com.google.common.util.concurrent.ListenableFuture;
 

core/src/main/java/com/google/net/stubby/transport/StreamState.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/StreamState.java b/core/src/main/java/com/google/net/stubby/transport/StreamState.java
similarity index 94%
rename from core/src/main/java/com/google/net/stubby/newtransport/StreamState.java
rename to core/src/main/java/com/google/net/stubby/transport/StreamState.java
index 5d5e967..d102e63 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/StreamState.java
+++ b/core/src/main/java/com/google/net/stubby/transport/StreamState.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 /**
  * The state of a single {@link Stream} within a transport.

core/src/main/java/com/google/net/stubby/transport/TransportFrameUtil.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/TransportFrameUtil.java b/core/src/main/java/com/google/net/stubby/transport/TransportFrameUtil.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/TransportFrameUtil.java
rename to core/src/main/java/com/google/net/stubby/transport/TransportFrameUtil.java
index 8140120..021bee8 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/TransportFrameUtil.java
+++ b/core/src/main/java/com/google/net/stubby/transport/TransportFrameUtil.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import javax.annotation.Nullable;
 

core/src/test/java/com/google/net/stubby/ServerImplTest.java

diff --git a/core/src/test/java/com/google/net/stubby/ServerImplTest.java b/core/src/test/java/com/google/net/stubby/ServerImplTest.java
index 825185b..5980b88 100644
--- a/core/src/test/java/com/google/net/stubby/ServerImplTest.java
+++ b/core/src/test/java/com/google/net/stubby/ServerImplTest.java
@@ -18,9 +18,9 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.Service;
 import com.google.common.util.concurrent.SettableFuture;
-import com.google.net.stubby.newtransport.ServerStream;
-import com.google.net.stubby.newtransport.ServerStreamListener;
-import com.google.net.stubby.newtransport.ServerTransportListener;
+import com.google.net.stubby.transport.ServerStream;
+import com.google.net.stubby.transport.ServerStreamListener;
+import com.google.net.stubby.transport.ServerTransportListener;
 
 import org.junit.After;
 import org.junit.Before;

core/src/test/java/com/google/net/stubby/transport/AbstractBufferTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/AbstractBufferTest.java b/core/src/test/java/com/google/net/stubby/transport/AbstractBufferTest.java
similarity index 96%
rename from core/src/test/java/com/google/net/stubby/newtransport/AbstractBufferTest.java
rename to core/src/test/java/com/google/net/stubby/transport/AbstractBufferTest.java
index 7628695..36c9569 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/AbstractBufferTest.java
+++ b/core/src/test/java/com/google/net/stubby/transport/AbstractBufferTest.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
@@ -11,7 +11,6 @@
 import org.mockito.MockitoAnnotations;
 import org.mockito.stubbing.OngoingStubbing;
 
-
 /**
  * Tests for {@link AbstractBuffer}.
  */

core/src/test/java/com/google/net/stubby/transport/BufferTestBase.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/BufferTestBase.java b/core/src/test/java/com/google/net/stubby/transport/BufferTestBase.java
similarity index 98%
rename from core/src/test/java/com/google/net/stubby/newtransport/BufferTestBase.java
rename to core/src/test/java/com/google/net/stubby/transport/BufferTestBase.java
index dbb78c3..13a8b27 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/BufferTestBase.java
+++ b/core/src/test/java/com/google/net/stubby/transport/BufferTestBase.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;

core/src/test/java/com/google/net/stubby/transport/BuffersArrayTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/BuffersArrayTest.java b/core/src/test/java/com/google/net/stubby/transport/BuffersArrayTest.java
similarity index 89%
rename from core/src/test/java/com/google/net/stubby/newtransport/BuffersArrayTest.java
rename to core/src/test/java/com/google/net/stubby/transport/BuffersArrayTest.java
index a6314c3..42cfc8d 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/BuffersArrayTest.java
+++ b/core/src/test/java/com/google/net/stubby/transport/BuffersArrayTest.java
@@ -1,7 +1,7 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static com.google.common.base.Charsets.UTF_8;
-import static com.google.net.stubby.newtransport.Buffers.wrap;
+import static com.google.net.stubby.transport.Buffers.wrap;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;

core/src/test/java/com/google/net/stubby/transport/BuffersByteBufferTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/BuffersByteBufferTest.java b/core/src/test/java/com/google/net/stubby/transport/BuffersByteBufferTest.java
similarity index 88%
rename from core/src/test/java/com/google/net/stubby/newtransport/BuffersByteBufferTest.java
rename to core/src/test/java/com/google/net/stubby/transport/BuffersByteBufferTest.java
index 09df5ae..b458435 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/BuffersByteBufferTest.java
+++ b/core/src/test/java/com/google/net/stubby/transport/BuffersByteBufferTest.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static com.google.common.base.Charsets.UTF_8;
 

core/src/test/java/com/google/net/stubby/transport/CompositeBufferTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/CompositeBufferTest.java b/core/src/test/java/com/google/net/stubby/transport/CompositeBufferTest.java
similarity index 98%
rename from core/src/test/java/com/google/net/stubby/newtransport/CompositeBufferTest.java
rename to core/src/test/java/com/google/net/stubby/transport/CompositeBufferTest.java
index 9e1210f..0761852 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/CompositeBufferTest.java
+++ b/core/src/test/java/com/google/net/stubby/transport/CompositeBufferTest.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;

core/src/test/java/com/google/net/stubby/transport/CompressionFramerTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/CompressionFramerTest.java b/core/src/test/java/com/google/net/stubby/transport/CompressionFramerTest.java
similarity index 98%
rename from core/src/test/java/com/google/net/stubby/newtransport/CompressionFramerTest.java
rename to core/src/test/java/com/google/net/stubby/transport/CompressionFramerTest.java
index b93875a..8c6d8fe 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/CompressionFramerTest.java
+++ b/core/src/test/java/com/google/net/stubby/transport/CompressionFramerTest.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;

core/src/test/java/com/google/net/stubby/transport/GrpcDeframerTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/GrpcDeframerTest.java b/core/src/test/java/com/google/net/stubby/transport/GrpcDeframerTest.java
similarity index 96%
rename from core/src/test/java/com/google/net/stubby/newtransport/GrpcDeframerTest.java
rename to core/src/test/java/com/google/net/stubby/transport/GrpcDeframerTest.java
index 7ced3a5..07fe07b 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/GrpcDeframerTest.java
+++ b/core/src/test/java/com/google/net/stubby/transport/GrpcDeframerTest.java
@@ -1,7 +1,7 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
-import static com.google.net.stubby.newtransport.TransportFrameUtil.PAYLOAD_FRAME;
-import static com.google.net.stubby.newtransport.TransportFrameUtil.STATUS_FRAME;
+import static com.google.net.stubby.transport.TransportFrameUtil.PAYLOAD_FRAME;
+import static com.google.net.stubby.transport.TransportFrameUtil.STATUS_FRAME;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;

core/src/test/java/com/google/net/stubby/transport/MessageDeframer2Test.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/MessageDeframer2Test.java b/core/src/test/java/com/google/net/stubby/transport/MessageDeframer2Test.java
similarity index 98%
rename from core/src/test/java/com/google/net/stubby/newtransport/MessageDeframer2Test.java
rename to core/src/test/java/com/google/net/stubby/transport/MessageDeframer2Test.java
index f66724b..768c097 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/MessageDeframer2Test.java
+++ b/core/src/test/java/com/google/net/stubby/transport/MessageDeframer2Test.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -13,7 +13,7 @@
 import com.google.common.primitives.Bytes;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
-import com.google.net.stubby.newtransport.MessageDeframer2.Sink;
+import com.google.net.stubby.transport.MessageDeframer2.Sink;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

core/src/test/java/com/google/net/stubby/transport/MessageFramer2Test.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/MessageFramer2Test.java b/core/src/test/java/com/google/net/stubby/transport/MessageFramer2Test.java
similarity index 98%
rename from core/src/test/java/com/google/net/stubby/newtransport/MessageFramer2Test.java
rename to core/src/test/java/com/google/net/stubby/transport/MessageFramer2Test.java
index 8f74123..f4b112e 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/MessageFramer2Test.java
+++ b/core/src/test/java/com/google/net/stubby/transport/MessageFramer2Test.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;

core/src/test/java/com/google/net/stubby/transport/MessageFramerTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/MessageFramerTest.java b/core/src/test/java/com/google/net/stubby/transport/MessageFramerTest.java
similarity index 98%
rename from core/src/test/java/com/google/net/stubby/newtransport/MessageFramerTest.java
rename to core/src/test/java/com/google/net/stubby/transport/MessageFramerTest.java
index e8a7659..368c8bb 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/MessageFramerTest.java
+++ b/core/src/test/java/com/google/net/stubby/transport/MessageFramerTest.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport;
+package com.google.net.stubby.transport;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;

integration-testing/src/main/java/com/google/net/stubby/testing/integration/ClientBootstrap.java

diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/ClientBootstrap.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/ClientBootstrap.java
index dca71a7..3d07417 100644
--- a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/ClientBootstrap.java
+++ b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/ClientBootstrap.java
@@ -4,9 +4,9 @@
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.net.stubby.Channel;
 import com.google.net.stubby.ChannelImpl;
-import com.google.net.stubby.newtransport.ClientTransportFactory;
-import com.google.net.stubby.newtransport.netty.NettyClientTransportFactory;
-import com.google.net.stubby.newtransport.okhttp.OkHttpClientTransportFactory;
+import com.google.net.stubby.transport.ClientTransportFactory;
+import com.google.net.stubby.transport.netty.NettyClientTransportFactory;
+import com.google.net.stubby.transport.okhttp.OkHttpClientTransportFactory;
 
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;

integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java

diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java
index 2fc8a58..407fa6a 100644
--- a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java
+++ b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceClient.java
@@ -176,7 +176,7 @@
     String serverHost = getServerHost(argMap);
     int serverPort = getPort(argMap);
 
-    com.google.net.stubby.newtransport.AbstractStream.GRPC_V2_PROTOCOL =
+    com.google.net.stubby.transport.AbstractStream.GRPC_V2_PROTOCOL =
         getGrpcVersion(argMap) == 2; 
     switch (stubType) {
       case BLOCKING:

integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java

diff --git a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java
index 5861641..ed9183e 100644
--- a/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java
+++ b/integration-testing/src/main/java/com/google/net/stubby/testing/integration/TestServiceServer.java
@@ -5,8 +5,8 @@
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.net.stubby.ServerImpl;
 import com.google.net.stubby.ServerInterceptors;
-import com.google.net.stubby.newtransport.netty.NettyServerBuilder;
 import com.google.net.stubby.testing.TestUtils;
+import com.google.net.stubby.transport.netty.NettyServerBuilder;
 
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.util.SelfSignedCertificate;
@@ -95,7 +95,7 @@
     Transport transport = getTransport(argMap);
     int port = getPort(RPC_PORT_ARG, argMap);
 
-    com.google.net.stubby.newtransport.AbstractStream.GRPC_V2_PROTOCOL =
+    com.google.net.stubby.transport.AbstractStream.GRPC_V2_PROTOCOL =
         getGrpcVersion(argMap) == 2;
 
     final TestServiceServer server = new TestServiceServer(transport, port);

netty/src/main/java/com/google/net/stubby/transport/netty/CancelStreamCommand.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/CancelStreamCommand.java b/netty/src/main/java/com/google/net/stubby/transport/netty/CancelStreamCommand.java
similarity index 88%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/CancelStreamCommand.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/CancelStreamCommand.java
index ae42c75..3cfd109 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/CancelStreamCommand.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/CancelStreamCommand.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.base.Preconditions;
 

netty/src/main/java/com/google/net/stubby/transport/netty/CreateStreamCommand.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/CreateStreamCommand.java b/netty/src/main/java/com/google/net/stubby/transport/netty/CreateStreamCommand.java
similarity index 93%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/CreateStreamCommand.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/CreateStreamCommand.java
index 7e965a3..830d958 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/CreateStreamCommand.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/CreateStreamCommand.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.base.Preconditions;
 

netty/src/main/java/com/google/net/stubby/transport/netty/Http2Negotiator.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/Http2Negotiator.java b/netty/src/main/java/com/google/net/stubby/transport/netty/Http2Negotiator.java
similarity index 99%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/Http2Negotiator.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/Http2Negotiator.java
index 4ffa744..f3b02ec 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/Http2Negotiator.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/Http2Negotiator.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyBuffer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyBuffer.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyBuffer.java
similarity index 92%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyBuffer.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyBuffer.java
index 22a53b8..0b5defd 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyBuffer.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyBuffer.java
@@ -1,9 +1,9 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
-import com.google.net.stubby.newtransport.AbstractBuffer;
-import com.google.net.stubby.newtransport.Buffer;
+import com.google.net.stubby.transport.AbstractBuffer;
+import com.google.net.stubby.transport.Buffer;
 
 import io.netty.buffer.ByteBuf;
 

netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyChannelBuilder.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java
similarity index 91%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyChannelBuilder.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java
index d7c3823..829fb98 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyChannelBuilder.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyChannelBuilder.java
@@ -1,9 +1,9 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.util.concurrent.Service;
 import com.google.net.stubby.AbstractChannelBuilder;
-import com.google.net.stubby.newtransport.ClientTransportFactory;
-import com.google.net.stubby.newtransport.netty.NettyClientTransportFactory.NegotiationType;
+import com.google.net.stubby.transport.ClientTransportFactory;
+import com.google.net.stubby.transport.netty.NettyClientTransportFactory.NegotiationType;
 
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientHandler.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientHandler.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientHandler.java
similarity index 98%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientHandler.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientHandler.java
index e281567..a4646d5 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientHandler.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientHandler.java
@@ -1,6 +1,6 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
-import static com.google.net.stubby.newtransport.netty.NettyClientStream.PENDING_STREAM_ID;
+import static com.google.net.stubby.transport.netty.NettyClientStream.PENDING_STREAM_ID;
 
 import com.google.common.base.Preconditions;
 import com.google.net.stubby.Metadata;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientStream.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientStream.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientStream.java
similarity index 91%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientStream.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientStream.java
index bbcc8fb..fdf4e80 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientStream.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientStream.java
@@ -1,21 +1,21 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
-import static com.google.net.stubby.newtransport.StreamState.CLOSED;
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER;
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC;
-import static com.google.net.stubby.newtransport.netty.Utils.GRPC_STATUS_HEADER;
+import static com.google.net.stubby.transport.StreamState.CLOSED;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER;
+import static com.google.net.stubby.transport.netty.Utils.GRPC_STATUS_HEADER;
 import static io.netty.util.CharsetUtil.UTF_8;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.newtransport.AbstractClientStream;
-import com.google.net.stubby.newtransport.Buffers;
-import com.google.net.stubby.newtransport.ClientStreamListener;
-import com.google.net.stubby.newtransport.GrpcDeframer;
-import com.google.net.stubby.newtransport.HttpUtil;
-import com.google.net.stubby.newtransport.MessageDeframer2;
+import com.google.net.stubby.transport.AbstractClientStream;
+import com.google.net.stubby.transport.Buffers;
+import com.google.net.stubby.transport.ClientStreamListener;
+import com.google.net.stubby.transport.GrpcDeframer;
+import com.google.net.stubby.transport.HttpUtil;
+import com.google.net.stubby.transport.MessageDeframer2;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransport.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java
similarity index 94%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransport.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java
index 28368b1..820cefc 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransport.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransport.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import static io.netty.channel.ChannelOption.SO_KEEPALIVE;
 
@@ -8,11 +8,11 @@
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.MethodDescriptor;
-import com.google.net.stubby.newtransport.AbstractClientTransport;
-import com.google.net.stubby.newtransport.ClientStream;
-import com.google.net.stubby.newtransport.ClientStreamListener;
-import com.google.net.stubby.newtransport.ClientTransport;
-import com.google.net.stubby.newtransport.netty.NettyClientTransportFactory.NegotiationType;
+import com.google.net.stubby.transport.AbstractClientTransport;
+import com.google.net.stubby.transport.ClientStream;
+import com.google.net.stubby.transport.ClientStreamListener;
+import com.google.net.stubby.transport.ClientTransport;
+import com.google.net.stubby.transport.netty.NettyClientTransportFactory.NegotiationType;
 import com.google.net.stubby.util.ssl.SslContextFactory;
 
 import io.netty.bootstrap.Bootstrap;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransportFactory.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java
similarity index 92%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransportFactory.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java
index 300e833..d6ea95c 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyClientTransportFactory.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyClientTransportFactory.java
@@ -1,12 +1,12 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.base.Preconditions;
-import com.google.net.stubby.newtransport.ClientTransportFactory;
-
-import java.net.InetSocketAddress;
+import com.google.net.stubby.transport.ClientTransportFactory;
 
 import io.netty.channel.EventLoopGroup;
 
+import java.net.InetSocketAddress;
+
 /**
  * Factory that manufactures instances of {@link NettyClientTransport}.
  */

netty/src/main/java/com/google/net/stubby/transport/netty/NettyDecompressor.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyDecompressor.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyDecompressor.java
similarity index 95%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyDecompressor.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyDecompressor.java
index 0331031..f9cdcbb 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyDecompressor.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyDecompressor.java
@@ -1,13 +1,13 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
-import static com.google.net.stubby.newtransport.TransportFrameUtil.COMPRESSION_HEADER_LENGTH;
-import static com.google.net.stubby.newtransport.TransportFrameUtil.isFlateCompressed;
+import static com.google.net.stubby.transport.TransportFrameUtil.COMPRESSION_HEADER_LENGTH;
+import static com.google.net.stubby.transport.TransportFrameUtil.isFlateCompressed;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
 import com.google.common.io.Closeables;
-import com.google.net.stubby.newtransport.Buffer;
-import com.google.net.stubby.newtransport.Decompressor;
+import com.google.net.stubby.transport.Buffer;
+import com.google.net.stubby.transport.Decompressor;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyServer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServer.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServer.java
similarity index 96%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServer.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServer.java
index 8b6a62c..02811d4 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServer.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServer.java
@@ -1,11 +1,11 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import static io.netty.channel.ChannelOption.SO_BACKLOG;
 import static io.netty.channel.ChannelOption.SO_KEEPALIVE;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.AbstractService;
-import com.google.net.stubby.newtransport.ServerListener;
+import com.google.net.stubby.transport.ServerListener;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.Channel;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerBuilder.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerBuilder.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerBuilder.java
similarity index 96%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerBuilder.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerBuilder.java
index 5a03818..e340191 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerBuilder.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerBuilder.java
@@ -1,10 +1,10 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Service;
 import com.google.net.stubby.AbstractServerBuilder;
 import com.google.net.stubby.HandlerRegistry;
-import com.google.net.stubby.newtransport.ServerListener;
+import com.google.net.stubby.transport.ServerListener;
 
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.nio.NioEventLoopGroup;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerHandler.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerHandler.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerHandler.java
similarity index 95%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerHandler.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerHandler.java
index f360d3b..3eb75e2 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerHandler.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerHandler.java
@@ -1,17 +1,17 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC;
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER;
-import static com.google.net.stubby.newtransport.netty.Utils.HTTP_METHOD;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER;
+import static com.google.net.stubby.transport.netty.Utils.HTTP_METHOD;
 import static io.netty.buffer.Unpooled.EMPTY_BUFFER;
 import static io.netty.handler.codec.http2.Http2CodecUtil.toByteBuf;
 import static io.netty.handler.codec.http2.Http2Error.NO_ERROR;
 
 import com.google.common.base.Preconditions;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.newtransport.ServerStreamListener;
-import com.google.net.stubby.newtransport.ServerTransportListener;
-import com.google.net.stubby.newtransport.TransportFrameUtil;
+import com.google.net.stubby.transport.ServerStreamListener;
+import com.google.net.stubby.transport.ServerTransportListener;
+import com.google.net.stubby.transport.TransportFrameUtil;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelFuture;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerStream.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerStream.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerStream.java
similarity index 90%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerStream.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerStream.java
index 148fdd5..84ee894 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerStream.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerStream.java
@@ -1,12 +1,12 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.net.stubby.Metadata;
-import com.google.net.stubby.newtransport.AbstractServerStream;
-import com.google.net.stubby.newtransport.GrpcDeframer;
-import com.google.net.stubby.newtransport.MessageDeframer2;
-import com.google.net.stubby.newtransport.StreamState;
+import com.google.net.stubby.transport.AbstractServerStream;
+import com.google.net.stubby.transport.GrpcDeframer;
+import com.google.net.stubby.transport.MessageDeframer2;
+import com.google.net.stubby.transport.StreamState;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerTransport.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerTransport.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerTransport.java
similarity index 95%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerTransport.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerTransport.java
index d802fa1..d469b50 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyServerTransport.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyServerTransport.java
@@ -1,9 +1,9 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.AbstractService;
-import com.google.net.stubby.newtransport.ServerListener;
-import com.google.net.stubby.newtransport.ServerTransportListener;
+import com.google.net.stubby.transport.ServerListener;
+import com.google.net.stubby.transport.ServerTransportListener;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;

netty/src/main/java/com/google/net/stubby/transport/netty/NettyStream.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyStream.java b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyStream.java
similarity index 83%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/NettyStream.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/NettyStream.java
index a6589b2..8c413f3 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/NettyStream.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/NettyStream.java
@@ -1,6 +1,6 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
-import com.google.net.stubby.newtransport.Stream;
+import com.google.net.stubby.transport.Stream;
 
 import io.netty.buffer.ByteBuf;
 

netty/src/main/java/com/google/net/stubby/transport/netty/SendGrpcFrameCommand.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/SendGrpcFrameCommand.java b/netty/src/main/java/com/google/net/stubby/transport/netty/SendGrpcFrameCommand.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/SendGrpcFrameCommand.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/SendGrpcFrameCommand.java
index 1d31eef..019e4f7 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/SendGrpcFrameCommand.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/SendGrpcFrameCommand.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufHolder;

netty/src/main/java/com/google/net/stubby/transport/netty/SendResponseHeadersCommand.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/SendResponseHeadersCommand.java b/netty/src/main/java/com/google/net/stubby/transport/netty/SendResponseHeadersCommand.java
similarity index 95%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/SendResponseHeadersCommand.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/SendResponseHeadersCommand.java
index f7d5386..ae01332 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/SendResponseHeadersCommand.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/SendResponseHeadersCommand.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.base.Preconditions;
 

netty/src/main/java/com/google/net/stubby/transport/netty/Utils.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/Utils.java b/netty/src/main/java/com/google/net/stubby/transport/netty/Utils.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/Utils.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/Utils.java
index fc75e8b..a09fe39 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/Utils.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/Utils.java
@@ -1,8 +1,8 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import com.google.common.base.Preconditions;
 import com.google.net.stubby.Metadata;
-import com.google.net.stubby.newtransport.HttpUtil;
+import com.google.net.stubby.transport.HttpUtil;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;

netty/src/main/java/com/google/net/stubby/transport/netty/WindowUpdateManager.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/netty/WindowUpdateManager.java b/netty/src/main/java/com/google/net/stubby/transport/netty/WindowUpdateManager.java
similarity index 97%
rename from core/src/main/java/com/google/net/stubby/newtransport/netty/WindowUpdateManager.java
rename to netty/src/main/java/com/google/net/stubby/transport/netty/WindowUpdateManager.java
index d798778..a5a8636 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/netty/WindowUpdateManager.java
+++ b/netty/src/main/java/com/google/net/stubby/transport/netty/WindowUpdateManager.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import static io.netty.handler.codec.http2.DefaultHttp2InboundFlowController.DEFAULT_WINDOW_UPDATE_RATIO;
 import static io.netty.handler.codec.http2.DefaultHttp2InboundFlowController.WINDOW_UPDATE_OFF;
@@ -6,11 +6,11 @@
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.ListenableFuture;
 
-import javax.annotation.Nullable;
-
 import io.netty.channel.Channel;
 import io.netty.handler.codec.http2.DefaultHttp2InboundFlowController;
 
+import javax.annotation.Nullable;
+
 /**
  * An object that manages inbound flow control for a single stream by disabling sending of HTTP/2
  * {@code WINDOW_UPDATE} frames until the previously delivered message completes.

netty/src/test/java/com/google/net/stubby/transport/netty/NettyBufferTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyBufferTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyBufferTest.java
similarity index 84%
rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyBufferTest.java
rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyBufferTest.java
index 766a90c..f42fc05 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyBufferTest.java
+++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyBufferTest.java
@@ -1,18 +1,18 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;
 
-import com.google.net.stubby.newtransport.Buffer;
-import com.google.net.stubby.newtransport.BufferTestBase;
+import com.google.net.stubby.transport.Buffer;
+import com.google.net.stubby.transport.BufferTestBase;
+
+import io.netty.buffer.Unpooled;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import io.netty.buffer.Unpooled;
-
 /**
  * Tests for {@link NettyBuffer}.
  */

netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientHandlerTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientHandlerTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientHandlerTest.java
similarity index 94%
rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientHandlerTest.java
rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientHandlerTest.java
index eb4e285..4d4e018 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientHandlerTest.java
+++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientHandlerTest.java
@@ -1,11 +1,11 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import static com.google.common.base.Charsets.UTF_8;
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC;
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER;
-import static com.google.net.stubby.newtransport.netty.Utils.HTTPS;
-import static com.google.net.stubby.newtransport.netty.Utils.HTTP_METHOD;
-import static com.google.net.stubby.newtransport.netty.Utils.STATUS_OK;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER;
+import static com.google.net.stubby.transport.netty.Utils.HTTPS;
+import static com.google.net.stubby.transport.netty.Utils.HTTP_METHOD;
+import static com.google.net.stubby.transport.netty.Utils.STATUS_OK;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -18,7 +18,7 @@
 
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.newtransport.StreamState;
+import com.google.net.stubby.transport.StreamState;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientStreamTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientStreamTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientStreamTest.java
similarity index 91%
rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientStreamTest.java
rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientStreamTest.java
index 4492027..73c77af 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyClientStreamTest.java
+++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyClientStreamTest.java
@@ -1,10 +1,10 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
-import static com.google.net.stubby.newtransport.netty.NettyTestUtil.messageFrame;
-import static com.google.net.stubby.newtransport.netty.NettyTestUtil.statusFrame;
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC;
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER;
-import static com.google.net.stubby.newtransport.netty.Utils.STATUS_OK;
+import static com.google.net.stubby.transport.netty.NettyTestUtil.messageFrame;
+import static com.google.net.stubby.transport.netty.NettyTestUtil.statusFrame;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER;
+import static com.google.net.stubby.transport.netty.Utils.STATUS_OK;
 import static io.netty.util.CharsetUtil.UTF_8;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
@@ -15,9 +15,14 @@
 
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.newtransport.AbstractStream;
-import com.google.net.stubby.newtransport.ClientStreamListener;
-import com.google.net.stubby.newtransport.StreamState;
+import com.google.net.stubby.transport.AbstractStream;
+import com.google.net.stubby.transport.ClientStreamListener;
+import com.google.net.stubby.transport.StreamState;
+
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.AsciiString;
+import io.netty.handler.codec.http2.DefaultHttp2Headers;
+import io.netty.handler.codec.http2.Http2Headers;
 
 import org.junit.After;
 import org.junit.Assume;
@@ -29,11 +34,6 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
-import io.netty.buffer.Unpooled;
-import io.netty.handler.codec.AsciiString;
-import io.netty.handler.codec.http2.DefaultHttp2Headers;
-import io.netty.handler.codec.http2.Http2Headers;
-
 /**
  * Tests for {@link NettyClientStream}.
  */

netty/src/test/java/com/google/net/stubby/transport/netty/NettyDecompressorTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyDecompressorTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyDecompressorTest.java
similarity index 90%
rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyDecompressorTest.java
rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyDecompressorTest.java
index 5475048..92e9682 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyDecompressorTest.java
+++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyDecompressorTest.java
@@ -1,25 +1,25 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import static com.google.common.base.Charsets.UTF_8;
-import static com.google.net.stubby.newtransport.Buffers.readAsStringUtf8;
-import static com.google.net.stubby.newtransport.TransportFrameUtil.COMPRESSION_HEADER_LENGTH;
-import static com.google.net.stubby.newtransport.TransportFrameUtil.FLATE_FLAG;
-import static com.google.net.stubby.newtransport.TransportFrameUtil.NO_COMPRESS_FLAG;
+import static com.google.net.stubby.transport.Buffers.readAsStringUtf8;
+import static com.google.net.stubby.transport.TransportFrameUtil.COMPRESSION_HEADER_LENGTH;
+import static com.google.net.stubby.transport.TransportFrameUtil.FLATE_FLAG;
+import static com.google.net.stubby.transport.TransportFrameUtil.NO_COMPRESS_FLAG;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import com.google.net.stubby.newtransport.Buffer;
-import com.google.net.stubby.newtransport.Buffers;
-import com.google.net.stubby.newtransport.CompositeBuffer;
+import com.google.net.stubby.transport.Buffer;
+import com.google.net.stubby.transport.Buffers;
+import com.google.net.stubby.transport.CompositeBuffer;
+
+import io.netty.buffer.Unpooled;
+import io.netty.buffer.UnpooledByteBufAllocator;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-import io.netty.buffer.Unpooled;
-import io.netty.buffer.UnpooledByteBufAllocator;
-
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.util.Arrays;

netty/src/test/java/com/google/net/stubby/transport/netty/NettyHandlerTestBase.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyHandlerTestBase.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyHandlerTestBase.java
similarity index 98%
rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyHandlerTestBase.java
rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyHandlerTestBase.java
index e1c224e..183e731 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyHandlerTestBase.java
+++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyHandlerTestBase.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
@@ -6,14 +6,6 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.buffer.UnpooledByteBufAllocator;
@@ -29,6 +21,14 @@
 import io.netty.handler.codec.http2.Http2Headers;
 import io.netty.handler.codec.http2.Http2Settings;
 
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
 /**
  * Base class for Netty handler unit tests.
  */

netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerHandlerTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerHandlerTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerHandlerTest.java
similarity index 94%
rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerHandlerTest.java
rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerHandlerTest.java
index d18c8b3..af82e49 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerHandlerTest.java
+++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerHandlerTest.java
@@ -1,9 +1,9 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import static com.google.common.base.Charsets.UTF_8;
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_GRPC;
-import static com.google.net.stubby.newtransport.netty.Utils.CONTENT_TYPE_HEADER;
-import static com.google.net.stubby.newtransport.netty.Utils.HTTP_METHOD;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_GRPC;
+import static com.google.net.stubby.transport.netty.Utils.CONTENT_TYPE_HEADER;
+import static com.google.net.stubby.transport.netty.Utils.HTTP_METHOD;
 import static io.netty.handler.codec.http2.Http2CodecUtil.toByteBuf;
 import static io.netty.handler.codec.http2.Http2Exception.protocolError;
 import static org.junit.Assert.assertArrayEquals;
@@ -20,19 +20,11 @@
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.Status;
 import com.google.net.stubby.Status.Code;
-import com.google.net.stubby.newtransport.Framer;
-import com.google.net.stubby.newtransport.MessageFramer;
-import com.google.net.stubby.newtransport.ServerStream;
-import com.google.net.stubby.newtransport.ServerStreamListener;
-import com.google.net.stubby.newtransport.ServerTransportListener;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import com.google.net.stubby.transport.Framer;
+import com.google.net.stubby.transport.MessageFramer;
+import com.google.net.stubby.transport.ServerStream;
+import com.google.net.stubby.transport.ServerStreamListener;
+import com.google.net.stubby.transport.ServerTransportListener;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -54,6 +46,14 @@
 import io.netty.handler.codec.http2.Http2OutboundFlowController;
 import io.netty.handler.codec.http2.Http2Settings;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.nio.ByteBuffer;

netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerStreamTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerStreamTest.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerStreamTest.java
similarity index 94%
rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerStreamTest.java
rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerStreamTest.java
index fac0436..2a1b8b8 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyServerStreamTest.java
+++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyServerStreamTest.java
@@ -1,7 +1,7 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
-import static com.google.net.stubby.newtransport.netty.NettyTestUtil.messageFrame;
-import static com.google.net.stubby.newtransport.netty.NettyTestUtil.statusFrame;
+import static com.google.net.stubby.transport.netty.NettyTestUtil.messageFrame;
+import static com.google.net.stubby.transport.netty.NettyTestUtil.statusFrame;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.same;
@@ -12,8 +12,8 @@
 
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.newtransport.ServerStreamListener;
-import com.google.net.stubby.newtransport.StreamState;
+import com.google.net.stubby.transport.ServerStreamListener;
+import com.google.net.stubby.transport.StreamState;
 
 import io.netty.buffer.EmptyByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;

netty/src/test/java/com/google/net/stubby/transport/netty/NettyStreamTestBase.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyStreamTestBase.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyStreamTestBase.java
similarity index 95%
rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyStreamTestBase.java
rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyStreamTestBase.java
index 7fcc8c7..1a6d708 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyStreamTestBase.java
+++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyStreamTestBase.java
@@ -1,6 +1,6 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
-import static com.google.net.stubby.newtransport.netty.NettyTestUtil.messageFrame;
+import static com.google.net.stubby.transport.netty.NettyTestUtil.messageFrame;
 import static io.netty.handler.codec.http2.DefaultHttp2InboundFlowController.DEFAULT_WINDOW_UPDATE_RATIO;
 import static io.netty.handler.codec.http2.DefaultHttp2InboundFlowController.WINDOW_UPDATE_OFF;
 import static io.netty.util.CharsetUtil.UTF_8;
@@ -15,15 +15,7 @@
 import static org.mockito.Mockito.when;
 
 import com.google.common.util.concurrent.SettableFuture;
-import com.google.net.stubby.newtransport.StreamListener;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
+import com.google.net.stubby.transport.StreamListener;
 
 import io.netty.buffer.UnpooledByteBufAllocator;
 import io.netty.channel.Channel;
@@ -35,6 +27,14 @@
 import io.netty.channel.EventLoop;
 import io.netty.handler.codec.http2.DefaultHttp2InboundFlowController;
 
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.concurrent.TimeUnit;

netty/src/test/java/com/google/net/stubby/transport/netty/NettyTestUtil.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyTestUtil.java b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyTestUtil.java
similarity index 94%
rename from core/src/test/java/com/google/net/stubby/newtransport/netty/NettyTestUtil.java
rename to netty/src/test/java/com/google/net/stubby/transport/netty/NettyTestUtil.java
index 2abea48..3095d07 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/netty/NettyTestUtil.java
+++ b/netty/src/test/java/com/google/net/stubby/transport/netty/NettyTestUtil.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.netty;
+package com.google.net.stubby.transport.netty;
 
 import static com.google.net.stubby.GrpcFramingUtil.PAYLOAD_FRAME;
 import static com.google.net.stubby.GrpcFramingUtil.STATUS_FRAME;
@@ -6,7 +6,7 @@
 
 import com.google.common.io.ByteStreams;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.newtransport.AbstractStream;
+import com.google.net.stubby.transport.AbstractStream;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

okhttp/src/main/java/com/google/net/stubby/transport/okhttp/AsyncFrameWriter.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/AsyncFrameWriter.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/AsyncFrameWriter.java
similarity index 98%
rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/AsyncFrameWriter.java
rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/AsyncFrameWriter.java
index 2ef8ddf..b798def 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/AsyncFrameWriter.java
+++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/AsyncFrameWriter.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.okhttp;
+package com.google.net.stubby.transport.okhttp;
 
 import com.google.common.util.concurrent.SettableFuture;
 import com.google.net.stubby.SerializingExecutor;

okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java
similarity index 95%
rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java
rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java
index d00b040..37becb8 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Headers.java
+++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Headers.java
@@ -1,9 +1,9 @@
-package com.google.net.stubby.newtransport.okhttp;
+package com.google.net.stubby.transport.okhttp;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.net.stubby.Metadata;
-import com.google.net.stubby.newtransport.HttpUtil;
+import com.google.net.stubby.transport.HttpUtil;
 
 import com.squareup.okhttp.internal.spdy.Header;
 

okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpBuffer.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpBuffer.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpBuffer.java
similarity index 88%
rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpBuffer.java
rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpBuffer.java
index 25dfd48..313fa9b 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpBuffer.java
+++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpBuffer.java
@@ -1,7 +1,7 @@
-package com.google.net.stubby.newtransport.okhttp;
+package com.google.net.stubby.transport.okhttp;
 
-import com.google.net.stubby.newtransport.AbstractBuffer;
-import com.google.net.stubby.newtransport.Buffer;
+import com.google.net.stubby.transport.AbstractBuffer;
+import com.google.net.stubby.transport.Buffer;
 
 import java.io.EOFException;
 import java.io.IOException;

okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java
similarity index 96%
rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java
rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java
index 88db196..57a831e 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransport.java
+++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransport.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.okhttp;
+package com.google.net.stubby.transport.okhttp;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
@@ -7,14 +7,14 @@
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.MethodDescriptor;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.newtransport.AbstractClientStream;
-import com.google.net.stubby.newtransport.AbstractClientTransport;
-import com.google.net.stubby.newtransport.Buffers;
-import com.google.net.stubby.newtransport.ClientStream;
-import com.google.net.stubby.newtransport.ClientStreamListener;
-import com.google.net.stubby.newtransport.ClientTransport;
-import com.google.net.stubby.newtransport.MessageDeframer2;
-import com.google.net.stubby.newtransport.StreamState;
+import com.google.net.stubby.transport.AbstractClientStream;
+import com.google.net.stubby.transport.AbstractClientTransport;
+import com.google.net.stubby.transport.Buffers;
+import com.google.net.stubby.transport.ClientStream;
+import com.google.net.stubby.transport.ClientStreamListener;
+import com.google.net.stubby.transport.ClientTransport;
+import com.google.net.stubby.transport.MessageDeframer2;
+import com.google.net.stubby.transport.StreamState;
 
 import com.squareup.okhttp.internal.spdy.ErrorCode;
 import com.squareup.okhttp.internal.spdy.FrameReader;

okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportFactory.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportFactory.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportFactory.java
similarity index 80%
rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportFactory.java
rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportFactory.java
index 7ed6a36..a142da0 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportFactory.java
+++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportFactory.java
@@ -1,8 +1,8 @@
-package com.google.net.stubby.newtransport.okhttp;
+package com.google.net.stubby.transport.okhttp;
 
 import com.google.common.base.Preconditions;
-import com.google.net.stubby.newtransport.ClientTransport;
-import com.google.net.stubby.newtransport.ClientTransportFactory;
+import com.google.net.stubby.transport.ClientTransport;
+import com.google.net.stubby.transport.ClientTransportFactory;
 
 import java.net.InetSocketAddress;
 import java.util.concurrent.ExecutorService;

okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Utils.java

diff --git a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Utils.java b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Utils.java
similarity index 94%
rename from core/src/main/java/com/google/net/stubby/newtransport/okhttp/Utils.java
rename to okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Utils.java
index f5b67ee..d5bd225 100644
--- a/core/src/main/java/com/google/net/stubby/newtransport/okhttp/Utils.java
+++ b/okhttp/src/main/java/com/google/net/stubby/transport/okhttp/Utils.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.okhttp;
+package com.google.net.stubby.transport.okhttp;
 
 import com.google.net.stubby.Metadata;
 

okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java

diff --git a/core/src/test/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportTest.java b/okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java
similarity index 97%
rename from core/src/test/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportTest.java
rename to okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java
index f35096c..3cb0a04 100644
--- a/core/src/test/java/com/google/net/stubby/newtransport/okhttp/OkHttpClientTransportTest.java
+++ b/okhttp/src/test/java/com/google/net/stubby/transport/okhttp/OkHttpClientTransportTest.java
@@ -1,4 +1,4 @@
-package com.google.net.stubby.newtransport.okhttp;
+package com.google.net.stubby.transport.okhttp;
 
 import static com.google.common.base.Charsets.UTF_8;
 import static org.junit.Assert.assertEquals;
@@ -20,10 +20,10 @@
 import com.google.net.stubby.Metadata;
 import com.google.net.stubby.MethodDescriptor;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.newtransport.AbstractStream;
-import com.google.net.stubby.newtransport.ClientStreamListener;
-import com.google.net.stubby.newtransport.okhttp.OkHttpClientTransport.ClientFrameHandler;
-import com.google.net.stubby.newtransport.okhttp.OkHttpClientTransport.OkHttpClientStream;
+import com.google.net.stubby.transport.AbstractStream;
+import com.google.net.stubby.transport.ClientStreamListener;
+import com.google.net.stubby.transport.okhttp.OkHttpClientTransport.ClientFrameHandler;
+import com.google.net.stubby.transport.okhttp.OkHttpClientTransport.OkHttpClientStream;
 
 import com.squareup.okhttp.internal.spdy.ErrorCode;
 import com.squareup.okhttp.internal.spdy.FrameReader;

testing/src/main/java/com/google/net/stubby/testing/InProcessUtils.java

diff --git a/testing/src/main/java/com/google/net/stubby/testing/InProcessUtils.java b/testing/src/main/java/com/google/net/stubby/testing/InProcessUtils.java
index 1e452c8..962cce8 100644
--- a/testing/src/main/java/com/google/net/stubby/testing/InProcessUtils.java
+++ b/testing/src/main/java/com/google/net/stubby/testing/InProcessUtils.java
@@ -8,11 +8,11 @@
 import com.google.net.stubby.ServerCall;
 import com.google.net.stubby.ServerMethodDefinition;
 import com.google.net.stubby.Status;
-import com.google.net.stubby.newtransport.ClientStream;
-import com.google.net.stubby.newtransport.ClientStreamListener;
-import com.google.net.stubby.newtransport.ClientTransport;
-import com.google.net.stubby.newtransport.ClientTransportFactory;
-import com.google.net.stubby.newtransport.StreamState;
+import com.google.net.stubby.transport.ClientStream;
+import com.google.net.stubby.transport.ClientStreamListener;
+import com.google.net.stubby.transport.ClientTransport;
+import com.google.net.stubby.transport.ClientTransportFactory;
+import com.google.net.stubby.transport.StreamState;
 
 import java.io.IOException;
 import java.io.InputStream;