diff --git a/java/google/registry/proxy/BUILD b/proxy/java/google/registry/proxy/BUILD similarity index 100% rename from java/google/registry/proxy/BUILD rename to proxy/java/google/registry/proxy/BUILD diff --git a/java/google/registry/proxy/CertificateModule.java b/proxy/java/google/registry/proxy/CertificateModule.java similarity index 100% rename from java/google/registry/proxy/CertificateModule.java rename to proxy/java/google/registry/proxy/CertificateModule.java diff --git a/java/google/registry/proxy/EppProtocolModule.java b/proxy/java/google/registry/proxy/EppProtocolModule.java similarity index 100% rename from java/google/registry/proxy/EppProtocolModule.java rename to proxy/java/google/registry/proxy/EppProtocolModule.java diff --git a/java/google/registry/proxy/GcpJsonFormatter.java b/proxy/java/google/registry/proxy/GcpJsonFormatter.java similarity index 100% rename from java/google/registry/proxy/GcpJsonFormatter.java rename to proxy/java/google/registry/proxy/GcpJsonFormatter.java diff --git a/java/google/registry/proxy/HealthCheckProtocolModule.java b/proxy/java/google/registry/proxy/HealthCheckProtocolModule.java similarity index 100% rename from java/google/registry/proxy/HealthCheckProtocolModule.java rename to proxy/java/google/registry/proxy/HealthCheckProtocolModule.java diff --git a/java/google/registry/proxy/HttpsRelayProtocolModule.java b/proxy/java/google/registry/proxy/HttpsRelayProtocolModule.java similarity index 100% rename from java/google/registry/proxy/HttpsRelayProtocolModule.java rename to proxy/java/google/registry/proxy/HttpsRelayProtocolModule.java diff --git a/java/google/registry/proxy/MetricsModule.java b/proxy/java/google/registry/proxy/MetricsModule.java similarity index 100% rename from java/google/registry/proxy/MetricsModule.java rename to proxy/java/google/registry/proxy/MetricsModule.java diff --git a/java/google/registry/proxy/Protocol.java b/proxy/java/google/registry/proxy/Protocol.java similarity index 100% rename from java/google/registry/proxy/Protocol.java rename to proxy/java/google/registry/proxy/Protocol.java diff --git a/java/google/registry/proxy/ProxyConfig.java b/proxy/java/google/registry/proxy/ProxyConfig.java similarity index 100% rename from java/google/registry/proxy/ProxyConfig.java rename to proxy/java/google/registry/proxy/ProxyConfig.java diff --git a/java/google/registry/proxy/ProxyModule.java b/proxy/java/google/registry/proxy/ProxyModule.java similarity index 100% rename from java/google/registry/proxy/ProxyModule.java rename to proxy/java/google/registry/proxy/ProxyModule.java diff --git a/java/google/registry/proxy/ProxyServer.java b/proxy/java/google/registry/proxy/ProxyServer.java similarity index 100% rename from java/google/registry/proxy/ProxyServer.java rename to proxy/java/google/registry/proxy/ProxyServer.java diff --git a/java/google/registry/proxy/WebWhoisProtocolsModule.java b/proxy/java/google/registry/proxy/WebWhoisProtocolsModule.java similarity index 100% rename from java/google/registry/proxy/WebWhoisProtocolsModule.java rename to proxy/java/google/registry/proxy/WebWhoisProtocolsModule.java diff --git a/java/google/registry/proxy/WhoisProtocolModule.java b/proxy/java/google/registry/proxy/WhoisProtocolModule.java similarity index 100% rename from java/google/registry/proxy/WhoisProtocolModule.java rename to proxy/java/google/registry/proxy/WhoisProtocolModule.java diff --git a/java/google/registry/proxy/config/default-config.yaml b/proxy/java/google/registry/proxy/config/default-config.yaml similarity index 100% rename from java/google/registry/proxy/config/default-config.yaml rename to proxy/java/google/registry/proxy/config/default-config.yaml diff --git a/java/google/registry/proxy/config/proxy-config-alpha.yaml b/proxy/java/google/registry/proxy/config/proxy-config-alpha.yaml similarity index 100% rename from java/google/registry/proxy/config/proxy-config-alpha.yaml rename to proxy/java/google/registry/proxy/config/proxy-config-alpha.yaml diff --git a/java/google/registry/proxy/config/proxy-config-local.yaml b/proxy/java/google/registry/proxy/config/proxy-config-local.yaml similarity index 100% rename from java/google/registry/proxy/config/proxy-config-local.yaml rename to proxy/java/google/registry/proxy/config/proxy-config-local.yaml diff --git a/java/google/registry/proxy/config/proxy-config-production-canary.yaml b/proxy/java/google/registry/proxy/config/proxy-config-production-canary.yaml similarity index 100% rename from java/google/registry/proxy/config/proxy-config-production-canary.yaml rename to proxy/java/google/registry/proxy/config/proxy-config-production-canary.yaml diff --git a/java/google/registry/proxy/config/proxy-config-production.yaml b/proxy/java/google/registry/proxy/config/proxy-config-production.yaml similarity index 100% rename from java/google/registry/proxy/config/proxy-config-production.yaml rename to proxy/java/google/registry/proxy/config/proxy-config-production.yaml diff --git a/java/google/registry/proxy/config/proxy-config-sandbox-canary.yaml b/proxy/java/google/registry/proxy/config/proxy-config-sandbox-canary.yaml similarity index 100% rename from java/google/registry/proxy/config/proxy-config-sandbox-canary.yaml rename to proxy/java/google/registry/proxy/config/proxy-config-sandbox-canary.yaml diff --git a/java/google/registry/proxy/config/proxy-config-sandbox.yaml b/proxy/java/google/registry/proxy/config/proxy-config-sandbox.yaml similarity index 100% rename from java/google/registry/proxy/config/proxy-config-sandbox.yaml rename to proxy/java/google/registry/proxy/config/proxy-config-sandbox.yaml diff --git a/java/google/registry/proxy/handler/BackendMetricsHandler.java b/proxy/java/google/registry/proxy/handler/BackendMetricsHandler.java similarity index 100% rename from java/google/registry/proxy/handler/BackendMetricsHandler.java rename to proxy/java/google/registry/proxy/handler/BackendMetricsHandler.java diff --git a/java/google/registry/proxy/handler/EppServiceHandler.java b/proxy/java/google/registry/proxy/handler/EppServiceHandler.java similarity index 100% rename from java/google/registry/proxy/handler/EppServiceHandler.java rename to proxy/java/google/registry/proxy/handler/EppServiceHandler.java diff --git a/java/google/registry/proxy/handler/HealthCheckHandler.java b/proxy/java/google/registry/proxy/handler/HealthCheckHandler.java similarity index 100% rename from java/google/registry/proxy/handler/HealthCheckHandler.java rename to proxy/java/google/registry/proxy/handler/HealthCheckHandler.java diff --git a/java/google/registry/proxy/handler/HttpsRelayServiceHandler.java b/proxy/java/google/registry/proxy/handler/HttpsRelayServiceHandler.java similarity index 100% rename from java/google/registry/proxy/handler/HttpsRelayServiceHandler.java rename to proxy/java/google/registry/proxy/handler/HttpsRelayServiceHandler.java diff --git a/java/google/registry/proxy/handler/ProxyProtocolHandler.java b/proxy/java/google/registry/proxy/handler/ProxyProtocolHandler.java similarity index 100% rename from java/google/registry/proxy/handler/ProxyProtocolHandler.java rename to proxy/java/google/registry/proxy/handler/ProxyProtocolHandler.java diff --git a/java/google/registry/proxy/handler/QuotaHandler.java b/proxy/java/google/registry/proxy/handler/QuotaHandler.java similarity index 100% rename from java/google/registry/proxy/handler/QuotaHandler.java rename to proxy/java/google/registry/proxy/handler/QuotaHandler.java diff --git a/java/google/registry/proxy/handler/RelayHandler.java b/proxy/java/google/registry/proxy/handler/RelayHandler.java similarity index 100% rename from java/google/registry/proxy/handler/RelayHandler.java rename to proxy/java/google/registry/proxy/handler/RelayHandler.java diff --git a/java/google/registry/proxy/handler/SslClientInitializer.java b/proxy/java/google/registry/proxy/handler/SslClientInitializer.java similarity index 100% rename from java/google/registry/proxy/handler/SslClientInitializer.java rename to proxy/java/google/registry/proxy/handler/SslClientInitializer.java diff --git a/java/google/registry/proxy/handler/SslServerInitializer.java b/proxy/java/google/registry/proxy/handler/SslServerInitializer.java similarity index 100% rename from java/google/registry/proxy/handler/SslServerInitializer.java rename to proxy/java/google/registry/proxy/handler/SslServerInitializer.java diff --git a/java/google/registry/proxy/handler/WebWhoisRedirectHandler.java b/proxy/java/google/registry/proxy/handler/WebWhoisRedirectHandler.java similarity index 100% rename from java/google/registry/proxy/handler/WebWhoisRedirectHandler.java rename to proxy/java/google/registry/proxy/handler/WebWhoisRedirectHandler.java diff --git a/java/google/registry/proxy/handler/WhoisServiceHandler.java b/proxy/java/google/registry/proxy/handler/WhoisServiceHandler.java similarity index 100% rename from java/google/registry/proxy/handler/WhoisServiceHandler.java rename to proxy/java/google/registry/proxy/handler/WhoisServiceHandler.java diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml b/proxy/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml similarity index 100% rename from java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml rename to proxy/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml b/proxy/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml similarity index 100% rename from java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml rename to proxy/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml b/proxy/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml similarity index 100% rename from java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml rename to proxy/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml b/proxy/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml similarity index 100% rename from java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml rename to proxy/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml b/proxy/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml similarity index 100% rename from java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml rename to proxy/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml diff --git a/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml b/proxy/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml similarity index 100% rename from java/google/registry/proxy/kubernetes/proxy-service-canary.yaml rename to proxy/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml diff --git a/java/google/registry/proxy/kubernetes/proxy-service.yaml b/proxy/java/google/registry/proxy/kubernetes/proxy-service.yaml similarity index 100% rename from java/google/registry/proxy/kubernetes/proxy-service.yaml rename to proxy/java/google/registry/proxy/kubernetes/proxy-service.yaml diff --git a/java/google/registry/proxy/metric/BackendMetrics.java b/proxy/java/google/registry/proxy/metric/BackendMetrics.java similarity index 100% rename from java/google/registry/proxy/metric/BackendMetrics.java rename to proxy/java/google/registry/proxy/metric/BackendMetrics.java diff --git a/java/google/registry/proxy/metric/FrontendMetrics.java b/proxy/java/google/registry/proxy/metric/FrontendMetrics.java similarity index 100% rename from java/google/registry/proxy/metric/FrontendMetrics.java rename to proxy/java/google/registry/proxy/metric/FrontendMetrics.java diff --git a/java/google/registry/proxy/metric/MetricParameters.java b/proxy/java/google/registry/proxy/metric/MetricParameters.java similarity index 100% rename from java/google/registry/proxy/metric/MetricParameters.java rename to proxy/java/google/registry/proxy/metric/MetricParameters.java diff --git a/java/google/registry/proxy/quota/QuotaConfig.java b/proxy/java/google/registry/proxy/quota/QuotaConfig.java similarity index 100% rename from java/google/registry/proxy/quota/QuotaConfig.java rename to proxy/java/google/registry/proxy/quota/QuotaConfig.java diff --git a/java/google/registry/proxy/quota/QuotaManager.java b/proxy/java/google/registry/proxy/quota/QuotaManager.java similarity index 100% rename from java/google/registry/proxy/quota/QuotaManager.java rename to proxy/java/google/registry/proxy/quota/QuotaManager.java diff --git a/java/google/registry/proxy/quota/TokenStore.java b/proxy/java/google/registry/proxy/quota/TokenStore.java similarity index 100% rename from java/google/registry/proxy/quota/TokenStore.java rename to proxy/java/google/registry/proxy/quota/TokenStore.java diff --git a/java/google/registry/proxy/resources/hello.xml b/proxy/java/google/registry/proxy/resources/hello.xml similarity index 100% rename from java/google/registry/proxy/resources/hello.xml rename to proxy/java/google/registry/proxy/resources/hello.xml diff --git a/java/google/registry/proxy/terraform/example_config.tf b/proxy/java/google/registry/proxy/terraform/example_config.tf similarity index 100% rename from java/google/registry/proxy/terraform/example_config.tf rename to proxy/java/google/registry/proxy/terraform/example_config.tf diff --git a/java/google/registry/proxy/terraform/modules/common.tf b/proxy/java/google/registry/proxy/terraform/modules/common.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/common.tf rename to proxy/java/google/registry/proxy/terraform/modules/common.tf diff --git a/java/google/registry/proxy/terraform/modules/gcs.tf b/proxy/java/google/registry/proxy/terraform/modules/gcs.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/gcs.tf rename to proxy/java/google/registry/proxy/terraform/modules/gcs.tf diff --git a/java/google/registry/proxy/terraform/modules/gke.tf b/proxy/java/google/registry/proxy/terraform/modules/gke.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/gke.tf rename to proxy/java/google/registry/proxy/terraform/modules/gke.tf diff --git a/java/google/registry/proxy/terraform/modules/gke/cluster.tf b/proxy/java/google/registry/proxy/terraform/modules/gke/cluster.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/gke/cluster.tf rename to proxy/java/google/registry/proxy/terraform/modules/gke/cluster.tf diff --git a/java/google/registry/proxy/terraform/modules/gke/input.tf b/proxy/java/google/registry/proxy/terraform/modules/gke/input.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/gke/input.tf rename to proxy/java/google/registry/proxy/terraform/modules/gke/input.tf diff --git a/java/google/registry/proxy/terraform/modules/gke/output.tf b/proxy/java/google/registry/proxy/terraform/modules/gke/output.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/gke/output.tf rename to proxy/java/google/registry/proxy/terraform/modules/gke/output.tf diff --git a/java/google/registry/proxy/terraform/modules/iam.tf b/proxy/java/google/registry/proxy/terraform/modules/iam.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/iam.tf rename to proxy/java/google/registry/proxy/terraform/modules/iam.tf diff --git a/java/google/registry/proxy/terraform/modules/input.tf b/proxy/java/google/registry/proxy/terraform/modules/input.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/input.tf rename to proxy/java/google/registry/proxy/terraform/modules/input.tf diff --git a/java/google/registry/proxy/terraform/modules/kms.tf b/proxy/java/google/registry/proxy/terraform/modules/kms.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/kms.tf rename to proxy/java/google/registry/proxy/terraform/modules/kms.tf diff --git a/java/google/registry/proxy/terraform/modules/networking.tf b/proxy/java/google/registry/proxy/terraform/modules/networking.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/networking.tf rename to proxy/java/google/registry/proxy/terraform/modules/networking.tf diff --git a/java/google/registry/proxy/terraform/modules/output.tf b/proxy/java/google/registry/proxy/terraform/modules/output.tf similarity index 100% rename from java/google/registry/proxy/terraform/modules/output.tf rename to proxy/java/google/registry/proxy/terraform/modules/output.tf diff --git a/java/google/registry/proxy/terraform/update_named_ports.sh b/proxy/java/google/registry/proxy/terraform/update_named_ports.sh similarity index 100% rename from java/google/registry/proxy/terraform/update_named_ports.sh rename to proxy/java/google/registry/proxy/terraform/update_named_ports.sh diff --git a/javatests/google/registry/proxy/BUILD b/proxy/javatests/google/registry/proxy/BUILD similarity index 96% rename from javatests/google/registry/proxy/BUILD rename to proxy/javatests/google/registry/proxy/BUILD index 9ad6375b3..0744cb396 100644 --- a/javatests/google/registry/proxy/BUILD +++ b/proxy/javatests/google/registry/proxy/BUILD @@ -18,9 +18,9 @@ java_library( "@io_netty_tcnative_boringssl_static", ], deps = [ - "//java/google/registry/proxy", "//java/google/registry/util", "//javatests/google/registry/testing", + "//proxy/java/google/registry/proxy", "@com_beust_jcommander", "@com_google_dagger", "@com_google_guava", diff --git a/javatests/google/registry/proxy/CertificateModuleTest.java b/proxy/javatests/google/registry/proxy/CertificateModuleTest.java similarity index 100% rename from javatests/google/registry/proxy/CertificateModuleTest.java rename to proxy/javatests/google/registry/proxy/CertificateModuleTest.java diff --git a/javatests/google/registry/proxy/EppProtocolModuleTest.java b/proxy/javatests/google/registry/proxy/EppProtocolModuleTest.java similarity index 100% rename from javatests/google/registry/proxy/EppProtocolModuleTest.java rename to proxy/javatests/google/registry/proxy/EppProtocolModuleTest.java diff --git a/javatests/google/registry/proxy/GcpJsonFormatterTest.java b/proxy/javatests/google/registry/proxy/GcpJsonFormatterTest.java similarity index 100% rename from javatests/google/registry/proxy/GcpJsonFormatterTest.java rename to proxy/javatests/google/registry/proxy/GcpJsonFormatterTest.java diff --git a/javatests/google/registry/proxy/HealthCheckProtocolModuleTest.java b/proxy/javatests/google/registry/proxy/HealthCheckProtocolModuleTest.java similarity index 100% rename from javatests/google/registry/proxy/HealthCheckProtocolModuleTest.java rename to proxy/javatests/google/registry/proxy/HealthCheckProtocolModuleTest.java diff --git a/javatests/google/registry/proxy/HttpsRelayProtocolModuleTest.java b/proxy/javatests/google/registry/proxy/HttpsRelayProtocolModuleTest.java similarity index 100% rename from javatests/google/registry/proxy/HttpsRelayProtocolModuleTest.java rename to proxy/javatests/google/registry/proxy/HttpsRelayProtocolModuleTest.java diff --git a/javatests/google/registry/proxy/ProtocolModuleTest.java b/proxy/javatests/google/registry/proxy/ProtocolModuleTest.java similarity index 100% rename from javatests/google/registry/proxy/ProtocolModuleTest.java rename to proxy/javatests/google/registry/proxy/ProtocolModuleTest.java diff --git a/javatests/google/registry/proxy/ProxyModuleTest.java b/proxy/javatests/google/registry/proxy/ProxyModuleTest.java similarity index 100% rename from javatests/google/registry/proxy/ProxyModuleTest.java rename to proxy/javatests/google/registry/proxy/ProxyModuleTest.java diff --git a/javatests/google/registry/proxy/TestUtils.java b/proxy/javatests/google/registry/proxy/TestUtils.java similarity index 100% rename from javatests/google/registry/proxy/TestUtils.java rename to proxy/javatests/google/registry/proxy/TestUtils.java diff --git a/javatests/google/registry/proxy/WebWhoisProtocolsModuleTest.java b/proxy/javatests/google/registry/proxy/WebWhoisProtocolsModuleTest.java similarity index 100% rename from javatests/google/registry/proxy/WebWhoisProtocolsModuleTest.java rename to proxy/javatests/google/registry/proxy/WebWhoisProtocolsModuleTest.java diff --git a/javatests/google/registry/proxy/WhoisProtocolModuleTest.java b/proxy/javatests/google/registry/proxy/WhoisProtocolModuleTest.java similarity index 100% rename from javatests/google/registry/proxy/WhoisProtocolModuleTest.java rename to proxy/javatests/google/registry/proxy/WhoisProtocolModuleTest.java diff --git a/javatests/google/registry/proxy/handler/BackendMetricsHandlerTest.java b/proxy/javatests/google/registry/proxy/handler/BackendMetricsHandlerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/BackendMetricsHandlerTest.java rename to proxy/javatests/google/registry/proxy/handler/BackendMetricsHandlerTest.java diff --git a/javatests/google/registry/proxy/handler/EppQuotaHandlerTest.java b/proxy/javatests/google/registry/proxy/handler/EppQuotaHandlerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/EppQuotaHandlerTest.java rename to proxy/javatests/google/registry/proxy/handler/EppQuotaHandlerTest.java diff --git a/javatests/google/registry/proxy/handler/EppServiceHandlerTest.java b/proxy/javatests/google/registry/proxy/handler/EppServiceHandlerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/EppServiceHandlerTest.java rename to proxy/javatests/google/registry/proxy/handler/EppServiceHandlerTest.java diff --git a/javatests/google/registry/proxy/handler/HealthCheckHandlerTest.java b/proxy/javatests/google/registry/proxy/handler/HealthCheckHandlerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/HealthCheckHandlerTest.java rename to proxy/javatests/google/registry/proxy/handler/HealthCheckHandlerTest.java diff --git a/javatests/google/registry/proxy/handler/NettyRule.java b/proxy/javatests/google/registry/proxy/handler/NettyRule.java similarity index 100% rename from javatests/google/registry/proxy/handler/NettyRule.java rename to proxy/javatests/google/registry/proxy/handler/NettyRule.java diff --git a/javatests/google/registry/proxy/handler/ProxyProtocolHandlerTest.java b/proxy/javatests/google/registry/proxy/handler/ProxyProtocolHandlerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/ProxyProtocolHandlerTest.java rename to proxy/javatests/google/registry/proxy/handler/ProxyProtocolHandlerTest.java diff --git a/javatests/google/registry/proxy/handler/RelayHandlerTest.java b/proxy/javatests/google/registry/proxy/handler/RelayHandlerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/RelayHandlerTest.java rename to proxy/javatests/google/registry/proxy/handler/RelayHandlerTest.java diff --git a/javatests/google/registry/proxy/handler/SslClientInitializerTest.java b/proxy/javatests/google/registry/proxy/handler/SslClientInitializerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/SslClientInitializerTest.java rename to proxy/javatests/google/registry/proxy/handler/SslClientInitializerTest.java diff --git a/javatests/google/registry/proxy/handler/SslInitializerTestUtils.java b/proxy/javatests/google/registry/proxy/handler/SslInitializerTestUtils.java similarity index 100% rename from javatests/google/registry/proxy/handler/SslInitializerTestUtils.java rename to proxy/javatests/google/registry/proxy/handler/SslInitializerTestUtils.java diff --git a/javatests/google/registry/proxy/handler/SslServerInitializerTest.java b/proxy/javatests/google/registry/proxy/handler/SslServerInitializerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/SslServerInitializerTest.java rename to proxy/javatests/google/registry/proxy/handler/SslServerInitializerTest.java diff --git a/javatests/google/registry/proxy/handler/WebWhoisRedirectHandlerTest.java b/proxy/javatests/google/registry/proxy/handler/WebWhoisRedirectHandlerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/WebWhoisRedirectHandlerTest.java rename to proxy/javatests/google/registry/proxy/handler/WebWhoisRedirectHandlerTest.java diff --git a/javatests/google/registry/proxy/handler/WhoisQuotaHandlerTest.java b/proxy/javatests/google/registry/proxy/handler/WhoisQuotaHandlerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/WhoisQuotaHandlerTest.java rename to proxy/javatests/google/registry/proxy/handler/WhoisQuotaHandlerTest.java diff --git a/javatests/google/registry/proxy/handler/WhoisServiceHandlerTest.java b/proxy/javatests/google/registry/proxy/handler/WhoisServiceHandlerTest.java similarity index 100% rename from javatests/google/registry/proxy/handler/WhoisServiceHandlerTest.java rename to proxy/javatests/google/registry/proxy/handler/WhoisServiceHandlerTest.java diff --git a/javatests/google/registry/proxy/metric/BackendMetricsTest.java b/proxy/javatests/google/registry/proxy/metric/BackendMetricsTest.java similarity index 100% rename from javatests/google/registry/proxy/metric/BackendMetricsTest.java rename to proxy/javatests/google/registry/proxy/metric/BackendMetricsTest.java diff --git a/javatests/google/registry/proxy/metric/FrontendMetricsTest.java b/proxy/javatests/google/registry/proxy/metric/FrontendMetricsTest.java similarity index 100% rename from javatests/google/registry/proxy/metric/FrontendMetricsTest.java rename to proxy/javatests/google/registry/proxy/metric/FrontendMetricsTest.java diff --git a/javatests/google/registry/proxy/metric/MetricParametersTest.java b/proxy/javatests/google/registry/proxy/metric/MetricParametersTest.java similarity index 100% rename from javatests/google/registry/proxy/metric/MetricParametersTest.java rename to proxy/javatests/google/registry/proxy/metric/MetricParametersTest.java diff --git a/javatests/google/registry/proxy/quota/QuotaConfigTest.java b/proxy/javatests/google/registry/proxy/quota/QuotaConfigTest.java similarity index 100% rename from javatests/google/registry/proxy/quota/QuotaConfigTest.java rename to proxy/javatests/google/registry/proxy/quota/QuotaConfigTest.java diff --git a/javatests/google/registry/proxy/quota/QuotaManagerTest.java b/proxy/javatests/google/registry/proxy/quota/QuotaManagerTest.java similarity index 100% rename from javatests/google/registry/proxy/quota/QuotaManagerTest.java rename to proxy/javatests/google/registry/proxy/quota/QuotaManagerTest.java diff --git a/javatests/google/registry/proxy/quota/TokenStoreTest.java b/proxy/javatests/google/registry/proxy/quota/TokenStoreTest.java similarity index 100% rename from javatests/google/registry/proxy/quota/TokenStoreTest.java rename to proxy/javatests/google/registry/proxy/quota/TokenStoreTest.java diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_default.yaml b/proxy/javatests/google/registry/proxy/quota/testdata/quota_config_default.yaml similarity index 100% rename from javatests/google/registry/proxy/quota/testdata/quota_config_default.yaml rename to proxy/javatests/google/registry/proxy/quota/testdata/quota_config_default.yaml diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml b/proxy/javatests/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml similarity index 100% rename from javatests/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml rename to proxy/javatests/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml b/proxy/javatests/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml similarity index 100% rename from javatests/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml rename to proxy/javatests/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_regular.yaml b/proxy/javatests/google/registry/proxy/quota/testdata/quota_config_regular.yaml similarity index 100% rename from javatests/google/registry/proxy/quota/testdata/quota_config_regular.yaml rename to proxy/javatests/google/registry/proxy/quota/testdata/quota_config_regular.yaml diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml b/proxy/javatests/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml similarity index 100% rename from javatests/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml rename to proxy/javatests/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml diff --git a/javatests/google/registry/proxy/testdata/login.xml b/proxy/javatests/google/registry/proxy/testdata/login.xml similarity index 100% rename from javatests/google/registry/proxy/testdata/login.xml rename to proxy/javatests/google/registry/proxy/testdata/login.xml diff --git a/javatests/google/registry/proxy/testdata/login_response.xml b/proxy/javatests/google/registry/proxy/testdata/login_response.xml similarity index 100% rename from javatests/google/registry/proxy/testdata/login_response.xml rename to proxy/javatests/google/registry/proxy/testdata/login_response.xml diff --git a/javatests/google/registry/proxy/testdata/logout.xml b/proxy/javatests/google/registry/proxy/testdata/logout.xml similarity index 100% rename from javatests/google/registry/proxy/testdata/logout.xml rename to proxy/javatests/google/registry/proxy/testdata/logout.xml diff --git a/javatests/google/registry/proxy/testdata/logout_response.xml b/proxy/javatests/google/registry/proxy/testdata/logout_response.xml similarity index 100% rename from javatests/google/registry/proxy/testdata/logout_response.xml rename to proxy/javatests/google/registry/proxy/testdata/logout_response.xml