diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml
index eab274a3a6f..1fdd625d5f1 100644
--- a/google-cloud-spanner-executor/pom.xml
+++ b/google-cloud-spanner-executor/pom.xml
@@ -93,7 +93,10 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
-      <version>1.4.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>grpc-google-cloud-spanner-executor-v1</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -168,7 +171,7 @@
           </descriptors>
           <archive>
             <manifest>
-              <mainClass>com.google.cloud.executor.spanner.WorkerProxy</mainClass>
+              <mainClass>com.google.cloud.spanner.executor.WorkerProxy</mainClass>
             </manifest>
           </archive>
         </configuration>
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudClientExecutor.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudClientExecutor.java
index ffcf61b96b8..1fb221db1cc 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudClientExecutor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import static com.google.cloud.spanner.TransactionRunner.TransactionCallable;
 
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
index cda9923f392..89138ee4194 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.auth.http.HttpTransportFactory;
-import com.google.cloud.executor.spanner.CloudClientExecutor.ExecutionFlowContext;
+import com.google.cloud.spanner.executor.CloudClientExecutor.ExecutionFlowContext;
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.SpannerExceptionFactory;
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutorImpl.java
similarity index 98%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutorImpl.java
index 548392b5c84..6c9084913f9 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutorImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerExceptionFactory;
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudUtil.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudUtil.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudUtil.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudUtil.java
index 30a4d98a354..71bf4600552 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudUtil.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
index 08809d45887..d6c92462471 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerExceptionFactory;
+
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.protobuf.services.HealthStatusManager;
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index e929635d841..1aabcfa93c1 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -201,7 +201,6 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
-      <version>1.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>