diff --git a/docs/proxy-setup.md b/docs/proxy-setup.md
index 339dfb3f3..c7768fee0 100644
--- a/docs/proxy-setup.md
+++ b/docs/proxy-setup.md
@@ -103,13 +103,13 @@ $ gcloud auth application-default login
 Login with the account that has "Project Owner" role of all three projects
 mentioned above.
 
-Navigate to `java/google/registry/proxy/terraform`, create a folder called
+Navigate to `proxy/terraform`, create a folder called
 `envs`, and inside it, create a folder for the environment that proxy is
 deployed to ("alpha" for example). Copy `example_config.tf` to the environment
 folder.
 
 ```bash
-$ cd java/google/registry/proxy/terraform
+$ cd proxy/terraform
 $ mkdir -p envs/alpha
 $ cp example_config.tf envs/alpha/config.tf
 ```
@@ -232,11 +232,11 @@ $ gcloud container clusters get-credentials --project <proxy-project> \
 
 # Deploys environment specific kubernetes objects.
 $ kubectl create -f \
-java/google/registry/proxy/kubernetes/proxy-deployment-<env>.yaml
+proxy/kubernetes/proxy-deployment-<env>.yaml
 
 # Deploys shared kubernetes objects.
 $ kubectl create -f \
-java/google/registry/proxy/kubernetes/proxy-service.yaml
+proxy/kubernetes/proxy-service.yaml
 ```
 
 Repeat this for all three clusters.
@@ -535,7 +535,7 @@ Use `kubectl` to create the deployment and autoscale objects:
 
 ```bash
 $ kubectl create -f \
-java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml
+proxy/kubernetes/proxy-deployment-alpha.yaml
 ```
 
 The kubernetes
@@ -608,7 +608,7 @@ To deploy the NodePort service:
 
 ```bash
 $ kubectl create -f \
-java/google/registry/proxy/kubernetes/proxy-service.yaml
+proxy/kubernetes/proxy-service.yaml
 ```
 
 This service object will open up port 30000 (health check), 30001 (WHOIS) and
diff --git a/proxy/build.gradle b/proxy/build.gradle
index 9ed829df0..dc4957acf 100644
--- a/proxy/build.gradle
+++ b/proxy/build.gradle
@@ -1,14 +1,5 @@
 apply plugin: 'java'
 
-sourceSets {
-  main {
-    resources {
-      exclude "${javaDir}/terraform/"
-      exclude "${javaDir}/kubernetes/"
-    }
-  }
-}
-
 createUberJar('deployJar', 'proxy_server', 'google.registry.proxy.ProxyServer')
 
 project.build.dependsOn deployJar
diff --git a/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml b/proxy/kubernetes/proxy-deployment-alpha.yaml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml
rename to proxy/kubernetes/proxy-deployment-alpha.yaml
diff --git a/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml b/proxy/kubernetes/proxy-deployment-crash-canary.yaml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml
rename to proxy/kubernetes/proxy-deployment-crash-canary.yaml
diff --git a/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml b/proxy/kubernetes/proxy-deployment-crash.yaml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml
rename to proxy/kubernetes/proxy-deployment-crash.yaml
diff --git a/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml b/proxy/kubernetes/proxy-deployment-production-canary.yaml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml
rename to proxy/kubernetes/proxy-deployment-production-canary.yaml
diff --git a/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml b/proxy/kubernetes/proxy-deployment-production.yaml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml
rename to proxy/kubernetes/proxy-deployment-production.yaml
diff --git a/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml b/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml
rename to proxy/kubernetes/proxy-deployment-sandbox-canary.yaml
diff --git a/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml b/proxy/kubernetes/proxy-deployment-sandbox.yaml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml
rename to proxy/kubernetes/proxy-deployment-sandbox.yaml
diff --git a/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml b/proxy/kubernetes/proxy-service-canary.yaml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml
rename to proxy/kubernetes/proxy-service-canary.yaml
diff --git a/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-service.yaml b/proxy/kubernetes/proxy-service.yaml
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/kubernetes/proxy-service.yaml
rename to proxy/kubernetes/proxy-service.yaml
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/example_config.tf b/proxy/terraform/example_config.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/example_config.tf
rename to proxy/terraform/example_config.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/common.tf b/proxy/terraform/modules/common.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/common.tf
rename to proxy/terraform/modules/common.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/gcs.tf b/proxy/terraform/modules/gcs.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/gcs.tf
rename to proxy/terraform/modules/gcs.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/gke.tf b/proxy/terraform/modules/gke.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/gke.tf
rename to proxy/terraform/modules/gke.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/gke/cluster.tf b/proxy/terraform/modules/gke/cluster.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/gke/cluster.tf
rename to proxy/terraform/modules/gke/cluster.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/gke/output.tf b/proxy/terraform/modules/gke/output.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/gke/output.tf
rename to proxy/terraform/modules/gke/output.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/gke/variables.tf b/proxy/terraform/modules/gke/variables.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/gke/variables.tf
rename to proxy/terraform/modules/gke/variables.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/iam.tf b/proxy/terraform/modules/iam.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/iam.tf
rename to proxy/terraform/modules/iam.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/kms.tf b/proxy/terraform/modules/kms.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/kms.tf
rename to proxy/terraform/modules/kms.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/networking.tf b/proxy/terraform/modules/networking.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/networking.tf
rename to proxy/terraform/modules/networking.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/networking/dns.tf b/proxy/terraform/modules/networking/dns.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/networking/dns.tf
rename to proxy/terraform/modules/networking/dns.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/networking/loadbalancer.tf b/proxy/terraform/modules/networking/loadbalancer.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/networking/loadbalancer.tf
rename to proxy/terraform/modules/networking/loadbalancer.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/networking/output.tf b/proxy/terraform/modules/networking/output.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/networking/output.tf
rename to proxy/terraform/modules/networking/output.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/networking/variables.tf b/proxy/terraform/modules/networking/variables.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/networking/variables.tf
rename to proxy/terraform/modules/networking/variables.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/output.tf b/proxy/terraform/modules/output.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/output.tf
rename to proxy/terraform/modules/output.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/modules/variables.tf b/proxy/terraform/modules/variables.tf
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/modules/variables.tf
rename to proxy/terraform/modules/variables.tf
diff --git a/proxy/src/main/java/google/registry/proxy/terraform/update_named_ports.sh b/proxy/terraform/update_named_ports.sh
similarity index 100%
rename from proxy/src/main/java/google/registry/proxy/terraform/update_named_ports.sh
rename to proxy/terraform/update_named_ports.sh
diff --git a/release/cloudbuild-proxy.yaml b/release/cloudbuild-proxy.yaml
index 76fec8d92..0f1ddf9e9 100644
--- a/release/cloudbuild-proxy.yaml
+++ b/release/cloudbuild-proxy.yaml
@@ -55,7 +55,7 @@ artifacts:
     location: 'gs://${PROJECT_ID}-deploy/${TAG_NAME}'
     # This cannot be regexs because of how Spinnaker constructs artifact paths.
     paths:
-    - 'proxy/src/main/java/google/registry/proxy/kubernetes/proxy-*.yaml'
+    - 'proxy/kubernetes/proxy-*.yaml'
     - 'release/cloudbuild-tag.yaml'
 timeout: 3600s
 options:
diff --git a/release/cloudbuild-release.yaml b/release/cloudbuild-release.yaml
index da7424008..c2dcff037 100644
--- a/release/cloudbuild-release.yaml
+++ b/release/cloudbuild-release.yaml
@@ -75,7 +75,7 @@ steps:
     sed -i s%distroless/java%${PROJECT_ID}/base@$base_digest% proxy/Dockerfile
     sed -i s/builder:latest/builder@$builder_digest/g release/cloudbuild-proxy.yaml
     sed -i s/builder:latest/builder@$builder_digest/g release/cloudbuild-nomulus.yaml
-    sed -i s/GCP_PROJECT/${PROJECT_ID}/ proxy/src/main/java/google/registry/proxy/kubernetes/proxy-*.yaml
+    sed -i s/GCP_PROJECT/${PROJECT_ID}/ proxy/kubernetes/proxy-*.yaml
     sed -i s/'$${TAG_NAME}'/${TAG_NAME}/g release/cloudbuild-sync.yaml
 # Upload the gradle binary to GCS if it does not exist and point URL in gradle wrapper to it.
 - name: 'gcr.io/cloud-builders/gsutil'