diff --git a/examples/helloworld/greeter_client/main.go b/examples/helloworld/greeter_client/main.go
index fe882ae6..1e02ab15 100644
--- a/examples/helloworld/greeter_client/main.go
+++ b/examples/helloworld/greeter_client/main.go
@@ -37,7 +37,7 @@ import (
 	"log"
 	"os"
 
-	pb "github.com/grpc/grpc-go/examples/helloworld"
+	pb "google.golang.org/grpc/examples/helloworld/helloworld"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
@@ -49,7 +49,7 @@ const (
 
 func main() {
 	// Set up a connection to the server.
-	conn, err := grpc.Dial(address)
+	conn, err := grpc.Dial(address, grpc.WithInsecure())
 	if err != nil {
 		log.Fatalf("did not connect: %v", err)
 	}
diff --git a/examples/helloworld/greeter_server/main.go b/examples/helloworld/greeter_server/main.go
index 793860e5..ba985df4 100644
--- a/examples/helloworld/greeter_server/main.go
+++ b/examples/helloworld/greeter_server/main.go
@@ -37,7 +37,7 @@ import (
 	"log"
 	"net"
 
-	pb "github.com/grpc/grpc-go/examples/helloworld"
+	pb "google.golang.org/grpc/examples/helloworld/helloworld"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
diff --git a/examples/helloworld/proto/helloworld.pb.go b/examples/helloworld/helloworld/helloworld.pb.go
similarity index 100%
rename from examples/helloworld/proto/helloworld.pb.go
rename to examples/helloworld/helloworld/helloworld.pb.go
diff --git a/examples/helloworld/proto/helloworld.proto b/examples/helloworld/helloworld/helloworld.proto
similarity index 100%
rename from examples/helloworld/proto/helloworld.proto
rename to examples/helloworld/helloworld/helloworld.proto