diff --git a/examples/src/main/java/io/grpc/examples/helloworld/HelloJsonClient.java b/examples/src/main/java/io/grpc/examples/advanced/HelloJsonClient.java
similarity index 95%
rename from examples/src/main/java/io/grpc/examples/helloworld/HelloJsonClient.java
rename to examples/src/main/java/io/grpc/examples/advanced/HelloJsonClient.java
index bc2553cbad..0236d48df0 100644
--- a/examples/src/main/java/io/grpc/examples/helloworld/HelloJsonClient.java
+++ b/examples/src/main/java/io/grpc/examples/advanced/HelloJsonClient.java
@@ -29,7 +29,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.examples.helloworld;
+package io.grpc.examples.advanced;
 
 import static io.grpc.stub.ClientCalls.blockingUnaryCall;
 
@@ -39,6 +39,10 @@ import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.MethodDescriptor;
 import io.grpc.StatusRuntimeException;
+import io.grpc.examples.helloworld.GreeterGrpc;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.examples.helloworld.HelloWorldClient;
 import io.grpc.protobuf.ProtoUtils;
 import io.grpc.stub.AbstractStub;
 
diff --git a/examples/src/main/java/io/grpc/examples/helloworld/HelloJsonServer.java b/examples/src/main/java/io/grpc/examples/advanced/HelloJsonServer.java
similarity index 95%
rename from examples/src/main/java/io/grpc/examples/helloworld/HelloJsonServer.java
rename to examples/src/main/java/io/grpc/examples/advanced/HelloJsonServer.java
index fbad4e1e25..d2b5f5d5f1 100644
--- a/examples/src/main/java/io/grpc/examples/helloworld/HelloJsonServer.java
+++ b/examples/src/main/java/io/grpc/examples/advanced/HelloJsonServer.java
@@ -29,14 +29,18 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package io.grpc.examples.helloworld;
+package io.grpc.examples.advanced;
 
 import static io.grpc.stub.ServerCalls.asyncUnaryCall;
 
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.ServerServiceDefinition;
+import io.grpc.examples.helloworld.GreeterGrpc;
 import io.grpc.examples.helloworld.GreeterGrpc.Greeter;
+import io.grpc.examples.helloworld.HelloReply;
+import io.grpc.examples.helloworld.HelloRequest;
+import io.grpc.examples.helloworld.HelloWorldServer;
 import io.grpc.stub.ServerCalls.UnaryMethod;
 import io.grpc.stub.StreamObserver;