diff --git a/java/com/google/domain/registry/BUILD b/java/google/registry/BUILD
similarity index 100%
rename from java/com/google/domain/registry/BUILD
rename to java/google/registry/BUILD
diff --git a/java/com/google/domain/registry/backup/BUILD b/java/google/registry/backup/BUILD
similarity index 100%
rename from java/com/google/domain/registry/backup/BUILD
rename to java/google/registry/backup/BUILD
diff --git a/java/com/google/domain/registry/backup/BackupModule.java b/java/google/registry/backup/BackupModule.java
similarity index 100%
rename from java/com/google/domain/registry/backup/BackupModule.java
rename to java/google/registry/backup/BackupModule.java
diff --git a/java/com/google/domain/registry/backup/BackupUtils.java b/java/google/registry/backup/BackupUtils.java
similarity index 100%
rename from java/com/google/domain/registry/backup/BackupUtils.java
rename to java/google/registry/backup/BackupUtils.java
diff --git a/java/com/google/domain/registry/backup/CommitLogCheckpointAction.java b/java/google/registry/backup/CommitLogCheckpointAction.java
similarity index 100%
rename from java/com/google/domain/registry/backup/CommitLogCheckpointAction.java
rename to java/google/registry/backup/CommitLogCheckpointAction.java
diff --git a/java/com/google/domain/registry/backup/CommitLogCheckpointStrategy.java b/java/google/registry/backup/CommitLogCheckpointStrategy.java
similarity index 100%
rename from java/com/google/domain/registry/backup/CommitLogCheckpointStrategy.java
rename to java/google/registry/backup/CommitLogCheckpointStrategy.java
diff --git a/java/com/google/domain/registry/backup/DeleteOldCommitLogsAction.java b/java/google/registry/backup/DeleteOldCommitLogsAction.java
similarity index 100%
rename from java/com/google/domain/registry/backup/DeleteOldCommitLogsAction.java
rename to java/google/registry/backup/DeleteOldCommitLogsAction.java
diff --git a/java/com/google/domain/registry/backup/ExportCommitLogDiffAction.java b/java/google/registry/backup/ExportCommitLogDiffAction.java
similarity index 100%
rename from java/com/google/domain/registry/backup/ExportCommitLogDiffAction.java
rename to java/google/registry/backup/ExportCommitLogDiffAction.java
diff --git a/java/com/google/domain/registry/backup/GcsDiffFileLister.java b/java/google/registry/backup/GcsDiffFileLister.java
similarity index 100%
rename from java/com/google/domain/registry/backup/GcsDiffFileLister.java
rename to java/google/registry/backup/GcsDiffFileLister.java
diff --git a/java/com/google/domain/registry/backup/RestoreCommitLogsAction.java b/java/google/registry/backup/RestoreCommitLogsAction.java
similarity index 100%
rename from java/com/google/domain/registry/backup/RestoreCommitLogsAction.java
rename to java/google/registry/backup/RestoreCommitLogsAction.java
diff --git a/java/com/google/domain/registry/backup/package-info.java b/java/google/registry/backup/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/backup/package-info.java
rename to java/google/registry/backup/package-info.java
diff --git a/java/com/google/domain/registry/bigquery/BUILD b/java/google/registry/bigquery/BUILD
similarity index 100%
rename from java/com/google/domain/registry/bigquery/BUILD
rename to java/google/registry/bigquery/BUILD
diff --git a/java/com/google/domain/registry/bigquery/BigqueryConnection.java b/java/google/registry/bigquery/BigqueryConnection.java
similarity index 100%
rename from java/com/google/domain/registry/bigquery/BigqueryConnection.java
rename to java/google/registry/bigquery/BigqueryConnection.java
diff --git a/java/com/google/domain/registry/bigquery/BigqueryFactory.java b/java/google/registry/bigquery/BigqueryFactory.java
similarity index 100%
rename from java/com/google/domain/registry/bigquery/BigqueryFactory.java
rename to java/google/registry/bigquery/BigqueryFactory.java
diff --git a/java/com/google/domain/registry/bigquery/BigqueryJobFailureException.java b/java/google/registry/bigquery/BigqueryJobFailureException.java
similarity index 100%
rename from java/com/google/domain/registry/bigquery/BigqueryJobFailureException.java
rename to java/google/registry/bigquery/BigqueryJobFailureException.java
diff --git a/java/com/google/domain/registry/bigquery/BigqueryModule.java b/java/google/registry/bigquery/BigqueryModule.java
similarity index 100%
rename from java/com/google/domain/registry/bigquery/BigqueryModule.java
rename to java/google/registry/bigquery/BigqueryModule.java
diff --git a/java/com/google/domain/registry/bigquery/BigqueryUtils.java b/java/google/registry/bigquery/BigqueryUtils.java
similarity index 100%
rename from java/com/google/domain/registry/bigquery/BigqueryUtils.java
rename to java/google/registry/bigquery/BigqueryUtils.java
diff --git a/java/com/google/domain/registry/bigquery/package-info.java b/java/google/registry/bigquery/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/bigquery/package-info.java
rename to java/google/registry/bigquery/package-info.java
diff --git a/java/com/google/domain/registry/braintree/BUILD b/java/google/registry/braintree/BUILD
similarity index 100%
rename from java/com/google/domain/registry/braintree/BUILD
rename to java/google/registry/braintree/BUILD
diff --git a/java/com/google/domain/registry/braintree/BraintreeModule.java b/java/google/registry/braintree/BraintreeModule.java
similarity index 100%
rename from java/com/google/domain/registry/braintree/BraintreeModule.java
rename to java/google/registry/braintree/BraintreeModule.java
diff --git a/java/com/google/domain/registry/braintree/BraintreeRegistrarSyncer.java b/java/google/registry/braintree/BraintreeRegistrarSyncer.java
similarity index 100%
rename from java/com/google/domain/registry/braintree/BraintreeRegistrarSyncer.java
rename to java/google/registry/braintree/BraintreeRegistrarSyncer.java
diff --git a/java/com/google/domain/registry/braintree/package-info.java b/java/google/registry/braintree/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/braintree/package-info.java
rename to java/google/registry/braintree/package-info.java
diff --git a/java/com/google/domain/registry/config/BUILD b/java/google/registry/config/BUILD
similarity index 100%
rename from java/com/google/domain/registry/config/BUILD
rename to java/google/registry/config/BUILD
diff --git a/java/com/google/domain/registry/config/ConfigModule.java b/java/google/registry/config/ConfigModule.java
similarity index 100%
rename from java/com/google/domain/registry/config/ConfigModule.java
rename to java/google/registry/config/ConfigModule.java
diff --git a/java/com/google/domain/registry/config/ConfigUtils.java b/java/google/registry/config/ConfigUtils.java
similarity index 100%
rename from java/com/google/domain/registry/config/ConfigUtils.java
rename to java/google/registry/config/ConfigUtils.java
diff --git a/java/com/google/domain/registry/config/RegistryConfig.java b/java/google/registry/config/RegistryConfig.java
similarity index 100%
rename from java/com/google/domain/registry/config/RegistryConfig.java
rename to java/google/registry/config/RegistryConfig.java
diff --git a/java/com/google/domain/registry/config/RegistryEnvironment.java b/java/google/registry/config/RegistryEnvironment.java
similarity index 100%
rename from java/com/google/domain/registry/config/RegistryEnvironment.java
rename to java/google/registry/config/RegistryEnvironment.java
diff --git a/java/com/google/domain/registry/config/TestRegistryConfig.java b/java/google/registry/config/TestRegistryConfig.java
similarity index 100%
rename from java/com/google/domain/registry/config/TestRegistryConfig.java
rename to java/google/registry/config/TestRegistryConfig.java
diff --git a/java/com/google/domain/registry/config/package-info.java b/java/google/registry/config/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/config/package-info.java
rename to java/google/registry/config/package-info.java
diff --git a/java/com/google/domain/registry/cron/BUILD b/java/google/registry/cron/BUILD
similarity index 100%
rename from java/com/google/domain/registry/cron/BUILD
rename to java/google/registry/cron/BUILD
diff --git a/java/com/google/domain/registry/cron/CommitLogFanoutAction.java b/java/google/registry/cron/CommitLogFanoutAction.java
similarity index 100%
rename from java/com/google/domain/registry/cron/CommitLogFanoutAction.java
rename to java/google/registry/cron/CommitLogFanoutAction.java
diff --git a/java/com/google/domain/registry/cron/CronModule.java b/java/google/registry/cron/CronModule.java
similarity index 100%
rename from java/com/google/domain/registry/cron/CronModule.java
rename to java/google/registry/cron/CronModule.java
diff --git a/java/com/google/domain/registry/cron/TldFanoutAction.java b/java/google/registry/cron/TldFanoutAction.java
similarity index 100%
rename from java/com/google/domain/registry/cron/TldFanoutAction.java
rename to java/google/registry/cron/TldFanoutAction.java
diff --git a/java/com/google/domain/registry/cron/package-info.java b/java/google/registry/cron/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/cron/package-info.java
rename to java/google/registry/cron/package-info.java
diff --git a/java/com/google/domain/registry/dns/BUILD b/java/google/registry/dns/BUILD
similarity index 100%
rename from java/com/google/domain/registry/dns/BUILD
rename to java/google/registry/dns/BUILD
diff --git a/java/com/google/domain/registry/dns/DnsConstants.java b/java/google/registry/dns/DnsConstants.java
similarity index 100%
rename from java/com/google/domain/registry/dns/DnsConstants.java
rename to java/google/registry/dns/DnsConstants.java
diff --git a/java/com/google/domain/registry/dns/DnsModule.java b/java/google/registry/dns/DnsModule.java
similarity index 100%
rename from java/com/google/domain/registry/dns/DnsModule.java
rename to java/google/registry/dns/DnsModule.java
diff --git a/java/com/google/domain/registry/dns/DnsQueue.java b/java/google/registry/dns/DnsQueue.java
similarity index 100%
rename from java/com/google/domain/registry/dns/DnsQueue.java
rename to java/google/registry/dns/DnsQueue.java
diff --git a/java/com/google/domain/registry/dns/PublishDnsUpdatesAction.java b/java/google/registry/dns/PublishDnsUpdatesAction.java
similarity index 100%
rename from java/com/google/domain/registry/dns/PublishDnsUpdatesAction.java
rename to java/google/registry/dns/PublishDnsUpdatesAction.java
diff --git a/java/com/google/domain/registry/dns/ReadDnsQueueAction.java b/java/google/registry/dns/ReadDnsQueueAction.java
similarity index 100%
rename from java/com/google/domain/registry/dns/ReadDnsQueueAction.java
rename to java/google/registry/dns/ReadDnsQueueAction.java
diff --git a/java/com/google/domain/registry/dns/RefreshDnsAction.java b/java/google/registry/dns/RefreshDnsAction.java
similarity index 100%
rename from java/com/google/domain/registry/dns/RefreshDnsAction.java
rename to java/google/registry/dns/RefreshDnsAction.java
diff --git a/java/com/google/domain/registry/dns/WriteDnsAction.java b/java/google/registry/dns/WriteDnsAction.java
similarity index 100%
rename from java/com/google/domain/registry/dns/WriteDnsAction.java
rename to java/google/registry/dns/WriteDnsAction.java
diff --git a/java/com/google/domain/registry/dns/writer/api/BUILD b/java/google/registry/dns/writer/api/BUILD
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/api/BUILD
rename to java/google/registry/dns/writer/api/BUILD
diff --git a/java/com/google/domain/registry/dns/writer/api/DnsWriter.java b/java/google/registry/dns/writer/api/DnsWriter.java
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/api/DnsWriter.java
rename to java/google/registry/dns/writer/api/DnsWriter.java
diff --git a/java/com/google/domain/registry/dns/writer/api/DnsWriterZone.java b/java/google/registry/dns/writer/api/DnsWriterZone.java
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/api/DnsWriterZone.java
rename to java/google/registry/dns/writer/api/DnsWriterZone.java
diff --git a/java/com/google/domain/registry/dns/writer/api/VoidDnsWriter.java b/java/google/registry/dns/writer/api/VoidDnsWriter.java
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/api/VoidDnsWriter.java
rename to java/google/registry/dns/writer/api/VoidDnsWriter.java
diff --git a/java/com/google/domain/registry/dns/writer/api/VoidDnsWriterModule.java b/java/google/registry/dns/writer/api/VoidDnsWriterModule.java
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/api/VoidDnsWriterModule.java
rename to java/google/registry/dns/writer/api/VoidDnsWriterModule.java
diff --git a/java/com/google/domain/registry/dns/writer/dnsupdate/BUILD b/java/google/registry/dns/writer/dnsupdate/BUILD
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/dnsupdate/BUILD
rename to java/google/registry/dns/writer/dnsupdate/BUILD
diff --git a/java/com/google/domain/registry/dns/writer/dnsupdate/DnsMessageTransport.java b/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/dnsupdate/DnsMessageTransport.java
rename to java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java
diff --git a/java/com/google/domain/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java
rename to java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java
diff --git a/java/com/google/domain/registry/dns/writer/dnsupdate/DnsUpdateWriter.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
rename to java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
diff --git a/java/com/google/domain/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java
similarity index 100%
rename from java/com/google/domain/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java
rename to java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java
diff --git a/java/com/google/domain/registry/eclipse/BUILD b/java/google/registry/eclipse/BUILD
similarity index 100%
rename from java/com/google/domain/registry/eclipse/BUILD
rename to java/google/registry/eclipse/BUILD
diff --git a/java/com/google/domain/registry/env/BUILD b/java/google/registry/env/BUILD
similarity index 100%
rename from java/com/google/domain/registry/env/BUILD
rename to java/google/registry/env/BUILD
diff --git a/java/com/google/domain/registry/env/common/BUILD b/java/google/registry/env/common/BUILD
similarity index 100%
rename from java/com/google/domain/registry/env/common/BUILD
rename to java/google/registry/env/common/BUILD
diff --git a/java/com/google/domain/registry/env/common/META-INF/appengine-application.xml b/java/google/registry/env/common/META-INF/appengine-application.xml
similarity index 100%
rename from java/com/google/domain/registry/env/common/META-INF/appengine-application.xml
rename to java/google/registry/env/common/META-INF/appengine-application.xml
diff --git a/java/com/google/domain/registry/env/common/META-INF/application.xml b/java/google/registry/env/common/META-INF/application.xml
similarity index 100%
rename from java/com/google/domain/registry/env/common/META-INF/application.xml
rename to java/google/registry/env/common/META-INF/application.xml
diff --git a/java/com/google/domain/registry/env/common/backend/BUILD b/java/google/registry/env/common/backend/BUILD
similarity index 100%
rename from java/com/google/domain/registry/env/common/backend/BUILD
rename to java/google/registry/env/common/backend/BUILD
diff --git a/java/com/google/domain/registry/env/common/backend/WEB-INF/logging.properties b/java/google/registry/env/common/backend/WEB-INF/logging.properties
similarity index 100%
rename from java/com/google/domain/registry/env/common/backend/WEB-INF/logging.properties
rename to java/google/registry/env/common/backend/WEB-INF/logging.properties
diff --git a/java/com/google/domain/registry/env/common/backend/WEB-INF/web.xml b/java/google/registry/env/common/backend/WEB-INF/web.xml
similarity index 100%
rename from java/com/google/domain/registry/env/common/backend/WEB-INF/web.xml
rename to java/google/registry/env/common/backend/WEB-INF/web.xml
diff --git a/java/com/google/domain/registry/env/common/default/BUILD b/java/google/registry/env/common/default/BUILD
similarity index 100%
rename from java/com/google/domain/registry/env/common/default/BUILD
rename to java/google/registry/env/common/default/BUILD
diff --git a/java/com/google/domain/registry/env/common/default/WEB-INF/datastore-indexes.xml b/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
similarity index 100%
rename from java/com/google/domain/registry/env/common/default/WEB-INF/datastore-indexes.xml
rename to java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
diff --git a/java/com/google/domain/registry/env/common/default/WEB-INF/dos.xml b/java/google/registry/env/common/default/WEB-INF/dos.xml
similarity index 100%
rename from java/com/google/domain/registry/env/common/default/WEB-INF/dos.xml
rename to java/google/registry/env/common/default/WEB-INF/dos.xml
diff --git a/java/com/google/domain/registry/env/common/default/WEB-INF/logging.properties b/java/google/registry/env/common/default/WEB-INF/logging.properties
similarity index 100%
rename from java/com/google/domain/registry/env/common/default/WEB-INF/logging.properties
rename to java/google/registry/env/common/default/WEB-INF/logging.properties
diff --git a/java/com/google/domain/registry/env/common/default/WEB-INF/queue.xml b/java/google/registry/env/common/default/WEB-INF/queue.xml
similarity index 100%
rename from java/com/google/domain/registry/env/common/default/WEB-INF/queue.xml
rename to java/google/registry/env/common/default/WEB-INF/queue.xml
diff --git a/java/com/google/domain/registry/env/common/default/WEB-INF/web.xml b/java/google/registry/env/common/default/WEB-INF/web.xml
similarity index 100%
rename from java/com/google/domain/registry/env/common/default/WEB-INF/web.xml
rename to java/google/registry/env/common/default/WEB-INF/web.xml
diff --git a/java/com/google/domain/registry/env/common/tools/BUILD b/java/google/registry/env/common/tools/BUILD
similarity index 100%
rename from java/com/google/domain/registry/env/common/tools/BUILD
rename to java/google/registry/env/common/tools/BUILD
diff --git a/java/com/google/domain/registry/env/common/tools/WEB-INF/logging.properties b/java/google/registry/env/common/tools/WEB-INF/logging.properties
similarity index 100%
rename from java/com/google/domain/registry/env/common/tools/WEB-INF/logging.properties
rename to java/google/registry/env/common/tools/WEB-INF/logging.properties
diff --git a/java/com/google/domain/registry/env/common/tools/WEB-INF/web.xml b/java/google/registry/env/common/tools/WEB-INF/web.xml
similarity index 100%
rename from java/com/google/domain/registry/env/common/tools/WEB-INF/web.xml
rename to java/google/registry/env/common/tools/WEB-INF/web.xml
diff --git a/java/com/google/domain/registry/env/production/BUILD b/java/google/registry/env/production/BUILD
similarity index 100%
rename from java/com/google/domain/registry/env/production/BUILD
rename to java/google/registry/env/production/BUILD
diff --git a/java/com/google/domain/registry/env/production/backend/BUILD b/java/google/registry/env/production/backend/BUILD
similarity index 100%
rename from java/com/google/domain/registry/env/production/backend/BUILD
rename to java/google/registry/env/production/backend/BUILD
diff --git a/java/com/google/domain/registry/env/production/backend/WEB-INF/appengine-web.xml b/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/com/google/domain/registry/env/production/backend/WEB-INF/appengine-web.xml
rename to java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
diff --git a/java/com/google/domain/registry/env/production/default/BUILD b/java/google/registry/env/production/default/BUILD
similarity index 100%
rename from java/com/google/domain/registry/env/production/default/BUILD
rename to java/google/registry/env/production/default/BUILD
diff --git a/java/com/google/domain/registry/env/production/default/WEB-INF/appengine-web.xml b/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/com/google/domain/registry/env/production/default/WEB-INF/appengine-web.xml
rename to java/google/registry/env/production/default/WEB-INF/appengine-web.xml
diff --git a/java/com/google/domain/registry/env/production/default/WEB-INF/cron.xml b/java/google/registry/env/production/default/WEB-INF/cron.xml
similarity index 100%
rename from java/com/google/domain/registry/env/production/default/WEB-INF/cron.xml
rename to java/google/registry/env/production/default/WEB-INF/cron.xml
diff --git a/java/com/google/domain/registry/env/production/tools/BUILD b/java/google/registry/env/production/tools/BUILD
similarity index 100%
rename from java/com/google/domain/registry/env/production/tools/BUILD
rename to java/google/registry/env/production/tools/BUILD
diff --git a/java/com/google/domain/registry/env/production/tools/WEB-INF/appengine-web.xml b/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/com/google/domain/registry/env/production/tools/WEB-INF/appengine-web.xml
rename to java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
diff --git a/java/com/google/domain/registry/export/BUILD b/java/google/registry/export/BUILD
similarity index 100%
rename from java/com/google/domain/registry/export/BUILD
rename to java/google/registry/export/BUILD
diff --git a/java/com/google/domain/registry/export/BigqueryPollJobAction.java b/java/google/registry/export/BigqueryPollJobAction.java
similarity index 100%
rename from java/com/google/domain/registry/export/BigqueryPollJobAction.java
rename to java/google/registry/export/BigqueryPollJobAction.java
diff --git a/java/com/google/domain/registry/export/CheckSnapshotServlet.java b/java/google/registry/export/CheckSnapshotServlet.java
similarity index 100%
rename from java/com/google/domain/registry/export/CheckSnapshotServlet.java
rename to java/google/registry/export/CheckSnapshotServlet.java
diff --git a/java/com/google/domain/registry/export/DatastoreBackupInfo.java b/java/google/registry/export/DatastoreBackupInfo.java
similarity index 100%
rename from java/com/google/domain/registry/export/DatastoreBackupInfo.java
rename to java/google/registry/export/DatastoreBackupInfo.java
diff --git a/java/com/google/domain/registry/export/DatastoreBackupService.java b/java/google/registry/export/DatastoreBackupService.java
similarity index 100%
rename from java/com/google/domain/registry/export/DatastoreBackupService.java
rename to java/google/registry/export/DatastoreBackupService.java
diff --git a/java/com/google/domain/registry/export/DriveModule.java b/java/google/registry/export/DriveModule.java
similarity index 100%
rename from java/com/google/domain/registry/export/DriveModule.java
rename to java/google/registry/export/DriveModule.java
diff --git a/java/com/google/domain/registry/export/ExportConstants.java b/java/google/registry/export/ExportConstants.java
similarity index 100%
rename from java/com/google/domain/registry/export/ExportConstants.java
rename to java/google/registry/export/ExportConstants.java
diff --git a/java/com/google/domain/registry/export/ExportDomainListsAction.java b/java/google/registry/export/ExportDomainListsAction.java
similarity index 100%
rename from java/com/google/domain/registry/export/ExportDomainListsAction.java
rename to java/google/registry/export/ExportDomainListsAction.java
diff --git a/java/com/google/domain/registry/export/ExportRequestModule.java b/java/google/registry/export/ExportRequestModule.java
similarity index 100%
rename from java/com/google/domain/registry/export/ExportRequestModule.java
rename to java/google/registry/export/ExportRequestModule.java
diff --git a/java/com/google/domain/registry/export/ExportReservedTermsAction.java b/java/google/registry/export/ExportReservedTermsAction.java
similarity index 100%
rename from java/com/google/domain/registry/export/ExportReservedTermsAction.java
rename to java/google/registry/export/ExportReservedTermsAction.java
diff --git a/java/com/google/domain/registry/export/ExportSnapshotServlet.java b/java/google/registry/export/ExportSnapshotServlet.java
similarity index 100%
rename from java/com/google/domain/registry/export/ExportSnapshotServlet.java
rename to java/google/registry/export/ExportSnapshotServlet.java
diff --git a/java/com/google/domain/registry/export/ExportUtils.java b/java/google/registry/export/ExportUtils.java
similarity index 100%
rename from java/com/google/domain/registry/export/ExportUtils.java
rename to java/google/registry/export/ExportUtils.java
diff --git a/java/com/google/domain/registry/export/LoadSnapshotAction.java b/java/google/registry/export/LoadSnapshotAction.java
similarity index 100%
rename from java/com/google/domain/registry/export/LoadSnapshotAction.java
rename to java/google/registry/export/LoadSnapshotAction.java
diff --git a/java/com/google/domain/registry/export/PublishDetailReportAction.java b/java/google/registry/export/PublishDetailReportAction.java
similarity index 100%
rename from java/com/google/domain/registry/export/PublishDetailReportAction.java
rename to java/google/registry/export/PublishDetailReportAction.java
diff --git a/java/com/google/domain/registry/export/SyncGroupMembersAction.java b/java/google/registry/export/SyncGroupMembersAction.java
similarity index 100%
rename from java/com/google/domain/registry/export/SyncGroupMembersAction.java
rename to java/google/registry/export/SyncGroupMembersAction.java
diff --git a/java/com/google/domain/registry/export/UpdateSnapshotViewAction.java b/java/google/registry/export/UpdateSnapshotViewAction.java
similarity index 100%
rename from java/com/google/domain/registry/export/UpdateSnapshotViewAction.java
rename to java/google/registry/export/UpdateSnapshotViewAction.java
diff --git a/java/com/google/domain/registry/export/package-info.java b/java/google/registry/export/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/export/package-info.java
rename to java/google/registry/export/package-info.java
diff --git a/java/com/google/domain/registry/export/sheet/BUILD b/java/google/registry/export/sheet/BUILD
similarity index 100%
rename from java/com/google/domain/registry/export/sheet/BUILD
rename to java/google/registry/export/sheet/BUILD
diff --git a/java/com/google/domain/registry/export/sheet/SheetModule.java b/java/google/registry/export/sheet/SheetModule.java
similarity index 100%
rename from java/com/google/domain/registry/export/sheet/SheetModule.java
rename to java/google/registry/export/sheet/SheetModule.java
diff --git a/java/com/google/domain/registry/export/sheet/SheetSynchronizer.java b/java/google/registry/export/sheet/SheetSynchronizer.java
similarity index 100%
rename from java/com/google/domain/registry/export/sheet/SheetSynchronizer.java
rename to java/google/registry/export/sheet/SheetSynchronizer.java
diff --git a/java/com/google/domain/registry/export/sheet/SpreadsheetServiceModule.java b/java/google/registry/export/sheet/SpreadsheetServiceModule.java
similarity index 100%
rename from java/com/google/domain/registry/export/sheet/SpreadsheetServiceModule.java
rename to java/google/registry/export/sheet/SpreadsheetServiceModule.java
diff --git a/java/com/google/domain/registry/export/sheet/SyncRegistrarsSheet.java b/java/google/registry/export/sheet/SyncRegistrarsSheet.java
similarity index 100%
rename from java/com/google/domain/registry/export/sheet/SyncRegistrarsSheet.java
rename to java/google/registry/export/sheet/SyncRegistrarsSheet.java
diff --git a/java/com/google/domain/registry/export/sheet/SyncRegistrarsSheetAction.java b/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java
similarity index 100%
rename from java/com/google/domain/registry/export/sheet/SyncRegistrarsSheetAction.java
rename to java/google/registry/export/sheet/SyncRegistrarsSheetAction.java
diff --git a/java/com/google/domain/registry/export/sheet/package-info.java b/java/google/registry/export/sheet/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/export/sheet/package-info.java
rename to java/google/registry/export/sheet/package-info.java
diff --git a/java/com/google/domain/registry/flows/BUILD b/java/google/registry/flows/BUILD
similarity index 100%
rename from java/com/google/domain/registry/flows/BUILD
rename to java/google/registry/flows/BUILD
diff --git a/java/com/google/domain/registry/flows/EppConsoleServlet.java b/java/google/registry/flows/EppConsoleServlet.java
similarity index 100%
rename from java/com/google/domain/registry/flows/EppConsoleServlet.java
rename to java/google/registry/flows/EppConsoleServlet.java
diff --git a/java/com/google/domain/registry/flows/EppController.java b/java/google/registry/flows/EppController.java
similarity index 100%
rename from java/com/google/domain/registry/flows/EppController.java
rename to java/google/registry/flows/EppController.java
diff --git a/java/com/google/domain/registry/flows/EppException.java b/java/google/registry/flows/EppException.java
similarity index 100%
rename from java/com/google/domain/registry/flows/EppException.java
rename to java/google/registry/flows/EppException.java
diff --git a/java/com/google/domain/registry/flows/EppServletUtils.java b/java/google/registry/flows/EppServletUtils.java
similarity index 100%
rename from java/com/google/domain/registry/flows/EppServletUtils.java
rename to java/google/registry/flows/EppServletUtils.java
diff --git a/java/com/google/domain/registry/flows/EppTlsServlet.java b/java/google/registry/flows/EppTlsServlet.java
similarity index 100%
rename from java/com/google/domain/registry/flows/EppTlsServlet.java
rename to java/google/registry/flows/EppTlsServlet.java
diff --git a/java/com/google/domain/registry/flows/EppToolServlet.java b/java/google/registry/flows/EppToolServlet.java
similarity index 100%
rename from java/com/google/domain/registry/flows/EppToolServlet.java
rename to java/google/registry/flows/EppToolServlet.java
diff --git a/java/com/google/domain/registry/flows/EppXmlTransformer.java b/java/google/registry/flows/EppXmlTransformer.java
similarity index 100%
rename from java/com/google/domain/registry/flows/EppXmlTransformer.java
rename to java/google/registry/flows/EppXmlTransformer.java
diff --git a/java/com/google/domain/registry/flows/Flow.java b/java/google/registry/flows/Flow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/Flow.java
rename to java/google/registry/flows/Flow.java
diff --git a/java/com/google/domain/registry/flows/FlowRegistry.java b/java/google/registry/flows/FlowRegistry.java
similarity index 100%
rename from java/com/google/domain/registry/flows/FlowRegistry.java
rename to java/google/registry/flows/FlowRegistry.java
diff --git a/java/com/google/domain/registry/flows/FlowRunner.java b/java/google/registry/flows/FlowRunner.java
similarity index 100%
rename from java/com/google/domain/registry/flows/FlowRunner.java
rename to java/google/registry/flows/FlowRunner.java
diff --git a/java/com/google/domain/registry/flows/HttpSessionMetadata.java b/java/google/registry/flows/HttpSessionMetadata.java
similarity index 100%
rename from java/com/google/domain/registry/flows/HttpSessionMetadata.java
rename to java/google/registry/flows/HttpSessionMetadata.java
diff --git a/java/com/google/domain/registry/flows/LoggedInFlow.java b/java/google/registry/flows/LoggedInFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/LoggedInFlow.java
rename to java/google/registry/flows/LoggedInFlow.java
diff --git a/java/com/google/domain/registry/flows/OwnedResourceMutateFlow.java b/java/google/registry/flows/OwnedResourceMutateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/OwnedResourceMutateFlow.java
rename to java/google/registry/flows/OwnedResourceMutateFlow.java
diff --git a/java/com/google/domain/registry/flows/OwnedResourceMutatePendingTransferFlow.java b/java/google/registry/flows/OwnedResourceMutatePendingTransferFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/OwnedResourceMutatePendingTransferFlow.java
rename to java/google/registry/flows/OwnedResourceMutatePendingTransferFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceAsyncDeleteFlow.java b/java/google/registry/flows/ResourceAsyncDeleteFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceAsyncDeleteFlow.java
rename to java/google/registry/flows/ResourceAsyncDeleteFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceCheckFlow.java b/java/google/registry/flows/ResourceCheckFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceCheckFlow.java
rename to java/google/registry/flows/ResourceCheckFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceCreateFlow.java b/java/google/registry/flows/ResourceCreateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceCreateFlow.java
rename to java/google/registry/flows/ResourceCreateFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceCreateOrMutateFlow.java b/java/google/registry/flows/ResourceCreateOrMutateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceCreateOrMutateFlow.java
rename to java/google/registry/flows/ResourceCreateOrMutateFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceDeleteFlow.java b/java/google/registry/flows/ResourceDeleteFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceDeleteFlow.java
rename to java/google/registry/flows/ResourceDeleteFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceFlow.java b/java/google/registry/flows/ResourceFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceFlow.java
rename to java/google/registry/flows/ResourceFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceFlowUtils.java b/java/google/registry/flows/ResourceFlowUtils.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceFlowUtils.java
rename to java/google/registry/flows/ResourceFlowUtils.java
diff --git a/java/com/google/domain/registry/flows/ResourceInfoFlow.java b/java/google/registry/flows/ResourceInfoFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceInfoFlow.java
rename to java/google/registry/flows/ResourceInfoFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceMutateFlow.java b/java/google/registry/flows/ResourceMutateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceMutateFlow.java
rename to java/google/registry/flows/ResourceMutateFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceMutatePendingTransferFlow.java b/java/google/registry/flows/ResourceMutatePendingTransferFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceMutatePendingTransferFlow.java
rename to java/google/registry/flows/ResourceMutatePendingTransferFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceQueryFlow.java b/java/google/registry/flows/ResourceQueryFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceQueryFlow.java
rename to java/google/registry/flows/ResourceQueryFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceSyncDeleteFlow.java b/java/google/registry/flows/ResourceSyncDeleteFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceSyncDeleteFlow.java
rename to java/google/registry/flows/ResourceSyncDeleteFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceTransferApproveFlow.java b/java/google/registry/flows/ResourceTransferApproveFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceTransferApproveFlow.java
rename to java/google/registry/flows/ResourceTransferApproveFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceTransferCancelFlow.java b/java/google/registry/flows/ResourceTransferCancelFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceTransferCancelFlow.java
rename to java/google/registry/flows/ResourceTransferCancelFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceTransferFlow.java b/java/google/registry/flows/ResourceTransferFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceTransferFlow.java
rename to java/google/registry/flows/ResourceTransferFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceTransferQueryFlow.java b/java/google/registry/flows/ResourceTransferQueryFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceTransferQueryFlow.java
rename to java/google/registry/flows/ResourceTransferQueryFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceTransferRejectFlow.java b/java/google/registry/flows/ResourceTransferRejectFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceTransferRejectFlow.java
rename to java/google/registry/flows/ResourceTransferRejectFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceTransferRequestFlow.java b/java/google/registry/flows/ResourceTransferRequestFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceTransferRequestFlow.java
rename to java/google/registry/flows/ResourceTransferRequestFlow.java
diff --git a/java/com/google/domain/registry/flows/ResourceUpdateFlow.java b/java/google/registry/flows/ResourceUpdateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/ResourceUpdateFlow.java
rename to java/google/registry/flows/ResourceUpdateFlow.java
diff --git a/java/com/google/domain/registry/flows/SessionMetadata.java b/java/google/registry/flows/SessionMetadata.java
similarity index 100%
rename from java/com/google/domain/registry/flows/SessionMetadata.java
rename to java/google/registry/flows/SessionMetadata.java
diff --git a/java/com/google/domain/registry/flows/SingleResourceFlow.java b/java/google/registry/flows/SingleResourceFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/SingleResourceFlow.java
rename to java/google/registry/flows/SingleResourceFlow.java
diff --git a/java/com/google/domain/registry/flows/StatelessRequestSessionMetadata.java b/java/google/registry/flows/StatelessRequestSessionMetadata.java
similarity index 100%
rename from java/com/google/domain/registry/flows/StatelessRequestSessionMetadata.java
rename to java/google/registry/flows/StatelessRequestSessionMetadata.java
diff --git a/java/com/google/domain/registry/flows/TlsCredentials.java b/java/google/registry/flows/TlsCredentials.java
similarity index 100%
rename from java/com/google/domain/registry/flows/TlsCredentials.java
rename to java/google/registry/flows/TlsCredentials.java
diff --git a/java/com/google/domain/registry/flows/TransactionalFlow.java b/java/google/registry/flows/TransactionalFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/TransactionalFlow.java
rename to java/google/registry/flows/TransactionalFlow.java
diff --git a/java/com/google/domain/registry/flows/TransportCredentials.java b/java/google/registry/flows/TransportCredentials.java
similarity index 100%
rename from java/com/google/domain/registry/flows/TransportCredentials.java
rename to java/google/registry/flows/TransportCredentials.java
diff --git a/java/com/google/domain/registry/flows/async/AsyncFlowUtils.java b/java/google/registry/flows/async/AsyncFlowUtils.java
similarity index 100%
rename from java/com/google/domain/registry/flows/async/AsyncFlowUtils.java
rename to java/google/registry/flows/async/AsyncFlowUtils.java
diff --git a/java/com/google/domain/registry/flows/async/AsyncFlowsModule.java b/java/google/registry/flows/async/AsyncFlowsModule.java
similarity index 100%
rename from java/com/google/domain/registry/flows/async/AsyncFlowsModule.java
rename to java/google/registry/flows/async/AsyncFlowsModule.java
diff --git a/java/com/google/domain/registry/flows/async/DeleteContactResourceAction.java b/java/google/registry/flows/async/DeleteContactResourceAction.java
similarity index 100%
rename from java/com/google/domain/registry/flows/async/DeleteContactResourceAction.java
rename to java/google/registry/flows/async/DeleteContactResourceAction.java
diff --git a/java/com/google/domain/registry/flows/async/DeleteEppResourceAction.java b/java/google/registry/flows/async/DeleteEppResourceAction.java
similarity index 100%
rename from java/com/google/domain/registry/flows/async/DeleteEppResourceAction.java
rename to java/google/registry/flows/async/DeleteEppResourceAction.java
diff --git a/java/com/google/domain/registry/flows/async/DeleteHostResourceAction.java b/java/google/registry/flows/async/DeleteHostResourceAction.java
similarity index 100%
rename from java/com/google/domain/registry/flows/async/DeleteHostResourceAction.java
rename to java/google/registry/flows/async/DeleteHostResourceAction.java
diff --git a/java/com/google/domain/registry/flows/async/DnsRefreshForHostRenameAction.java b/java/google/registry/flows/async/DnsRefreshForHostRenameAction.java
similarity index 100%
rename from java/com/google/domain/registry/flows/async/DnsRefreshForHostRenameAction.java
rename to java/google/registry/flows/async/DnsRefreshForHostRenameAction.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactCheckFlow.java b/java/google/registry/flows/contact/ContactCheckFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactCheckFlow.java
rename to java/google/registry/flows/contact/ContactCheckFlow.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactCreateFlow.java b/java/google/registry/flows/contact/ContactCreateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactCreateFlow.java
rename to java/google/registry/flows/contact/ContactCreateFlow.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactDeleteFlow.java b/java/google/registry/flows/contact/ContactDeleteFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactDeleteFlow.java
rename to java/google/registry/flows/contact/ContactDeleteFlow.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactFlowUtils.java b/java/google/registry/flows/contact/ContactFlowUtils.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactFlowUtils.java
rename to java/google/registry/flows/contact/ContactFlowUtils.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactInfoFlow.java b/java/google/registry/flows/contact/ContactInfoFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactInfoFlow.java
rename to java/google/registry/flows/contact/ContactInfoFlow.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactTransferApproveFlow.java b/java/google/registry/flows/contact/ContactTransferApproveFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactTransferApproveFlow.java
rename to java/google/registry/flows/contact/ContactTransferApproveFlow.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactTransferCancelFlow.java b/java/google/registry/flows/contact/ContactTransferCancelFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactTransferCancelFlow.java
rename to java/google/registry/flows/contact/ContactTransferCancelFlow.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactTransferQueryFlow.java b/java/google/registry/flows/contact/ContactTransferQueryFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactTransferQueryFlow.java
rename to java/google/registry/flows/contact/ContactTransferQueryFlow.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactTransferRejectFlow.java b/java/google/registry/flows/contact/ContactTransferRejectFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactTransferRejectFlow.java
rename to java/google/registry/flows/contact/ContactTransferRejectFlow.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactTransferRequestFlow.java b/java/google/registry/flows/contact/ContactTransferRequestFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactTransferRequestFlow.java
rename to java/google/registry/flows/contact/ContactTransferRequestFlow.java
diff --git a/java/com/google/domain/registry/flows/contact/ContactUpdateFlow.java b/java/google/registry/flows/contact/ContactUpdateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/contact/ContactUpdateFlow.java
rename to java/google/registry/flows/contact/ContactUpdateFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/BaseDomainCheckFlow.java b/java/google/registry/flows/domain/BaseDomainCheckFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/BaseDomainCheckFlow.java
rename to java/google/registry/flows/domain/BaseDomainCheckFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/BaseDomainCreateFlow.java b/java/google/registry/flows/domain/BaseDomainCreateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/BaseDomainCreateFlow.java
rename to java/google/registry/flows/domain/BaseDomainCreateFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/BaseDomainInfoFlow.java b/java/google/registry/flows/domain/BaseDomainInfoFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/BaseDomainInfoFlow.java
rename to java/google/registry/flows/domain/BaseDomainInfoFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/BaseDomainUpdateFlow.java b/java/google/registry/flows/domain/BaseDomainUpdateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/BaseDomainUpdateFlow.java
rename to java/google/registry/flows/domain/BaseDomainUpdateFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/ClaimsCheckFlow.java b/java/google/registry/flows/domain/ClaimsCheckFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/ClaimsCheckFlow.java
rename to java/google/registry/flows/domain/ClaimsCheckFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainAllocateFlow.java b/java/google/registry/flows/domain/DomainAllocateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainAllocateFlow.java
rename to java/google/registry/flows/domain/DomainAllocateFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainApplicationCreateFlow.java b/java/google/registry/flows/domain/DomainApplicationCreateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainApplicationCreateFlow.java
rename to java/google/registry/flows/domain/DomainApplicationCreateFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainApplicationDeleteFlow.java b/java/google/registry/flows/domain/DomainApplicationDeleteFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainApplicationDeleteFlow.java
rename to java/google/registry/flows/domain/DomainApplicationDeleteFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainApplicationInfoFlow.java b/java/google/registry/flows/domain/DomainApplicationInfoFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainApplicationInfoFlow.java
rename to java/google/registry/flows/domain/DomainApplicationInfoFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainApplicationUpdateFlow.java b/java/google/registry/flows/domain/DomainApplicationUpdateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainApplicationUpdateFlow.java
rename to java/google/registry/flows/domain/DomainApplicationUpdateFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainCheckFlow.java b/java/google/registry/flows/domain/DomainCheckFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainCheckFlow.java
rename to java/google/registry/flows/domain/DomainCheckFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainCreateFlow.java b/java/google/registry/flows/domain/DomainCreateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainCreateFlow.java
rename to java/google/registry/flows/domain/DomainCreateFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainCreateOrAllocateFlow.java b/java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainCreateOrAllocateFlow.java
rename to java/google/registry/flows/domain/DomainCreateOrAllocateFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainDeleteFlow.java b/java/google/registry/flows/domain/DomainDeleteFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainDeleteFlow.java
rename to java/google/registry/flows/domain/DomainDeleteFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainFlowUtils.java b/java/google/registry/flows/domain/DomainFlowUtils.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainFlowUtils.java
rename to java/google/registry/flows/domain/DomainFlowUtils.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainInfoFlow.java b/java/google/registry/flows/domain/DomainInfoFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainInfoFlow.java
rename to java/google/registry/flows/domain/DomainInfoFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainRenewFlow.java b/java/google/registry/flows/domain/DomainRenewFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainRenewFlow.java
rename to java/google/registry/flows/domain/DomainRenewFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainRestoreRequestFlow.java b/java/google/registry/flows/domain/DomainRestoreRequestFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainRestoreRequestFlow.java
rename to java/google/registry/flows/domain/DomainRestoreRequestFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainTransferApproveFlow.java b/java/google/registry/flows/domain/DomainTransferApproveFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainTransferApproveFlow.java
rename to java/google/registry/flows/domain/DomainTransferApproveFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainTransferCancelFlow.java b/java/google/registry/flows/domain/DomainTransferCancelFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainTransferCancelFlow.java
rename to java/google/registry/flows/domain/DomainTransferCancelFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainTransferQueryFlow.java b/java/google/registry/flows/domain/DomainTransferQueryFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainTransferQueryFlow.java
rename to java/google/registry/flows/domain/DomainTransferQueryFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainTransferRejectFlow.java b/java/google/registry/flows/domain/DomainTransferRejectFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainTransferRejectFlow.java
rename to java/google/registry/flows/domain/DomainTransferRejectFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainTransferRequestFlow.java b/java/google/registry/flows/domain/DomainTransferRequestFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainTransferRequestFlow.java
rename to java/google/registry/flows/domain/DomainTransferRequestFlow.java
diff --git a/java/com/google/domain/registry/flows/domain/DomainUpdateFlow.java b/java/google/registry/flows/domain/DomainUpdateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/domain/DomainUpdateFlow.java
rename to java/google/registry/flows/domain/DomainUpdateFlow.java
diff --git a/java/com/google/domain/registry/flows/host/HostCheckFlow.java b/java/google/registry/flows/host/HostCheckFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/host/HostCheckFlow.java
rename to java/google/registry/flows/host/HostCheckFlow.java
diff --git a/java/com/google/domain/registry/flows/host/HostCreateFlow.java b/java/google/registry/flows/host/HostCreateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/host/HostCreateFlow.java
rename to java/google/registry/flows/host/HostCreateFlow.java
diff --git a/java/com/google/domain/registry/flows/host/HostDeleteFlow.java b/java/google/registry/flows/host/HostDeleteFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/host/HostDeleteFlow.java
rename to java/google/registry/flows/host/HostDeleteFlow.java
diff --git a/java/com/google/domain/registry/flows/host/HostFlowUtils.java b/java/google/registry/flows/host/HostFlowUtils.java
similarity index 100%
rename from java/com/google/domain/registry/flows/host/HostFlowUtils.java
rename to java/google/registry/flows/host/HostFlowUtils.java
diff --git a/java/com/google/domain/registry/flows/host/HostInfoFlow.java b/java/google/registry/flows/host/HostInfoFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/host/HostInfoFlow.java
rename to java/google/registry/flows/host/HostInfoFlow.java
diff --git a/java/com/google/domain/registry/flows/host/HostUpdateFlow.java b/java/google/registry/flows/host/HostUpdateFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/host/HostUpdateFlow.java
rename to java/google/registry/flows/host/HostUpdateFlow.java
diff --git a/java/com/google/domain/registry/flows/poll/PollAckFlow.java b/java/google/registry/flows/poll/PollAckFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/poll/PollAckFlow.java
rename to java/google/registry/flows/poll/PollAckFlow.java
diff --git a/java/com/google/domain/registry/flows/poll/PollFlow.java b/java/google/registry/flows/poll/PollFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/poll/PollFlow.java
rename to java/google/registry/flows/poll/PollFlow.java
diff --git a/java/com/google/domain/registry/flows/poll/PollRequestFlow.java b/java/google/registry/flows/poll/PollRequestFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/poll/PollRequestFlow.java
rename to java/google/registry/flows/poll/PollRequestFlow.java
diff --git a/java/com/google/domain/registry/flows/session/HelloFlow.java b/java/google/registry/flows/session/HelloFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/session/HelloFlow.java
rename to java/google/registry/flows/session/HelloFlow.java
diff --git a/java/com/google/domain/registry/flows/session/LoginFlow.java b/java/google/registry/flows/session/LoginFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/session/LoginFlow.java
rename to java/google/registry/flows/session/LoginFlow.java
diff --git a/java/com/google/domain/registry/flows/session/LogoutFlow.java b/java/google/registry/flows/session/LogoutFlow.java
similarity index 100%
rename from java/com/google/domain/registry/flows/session/LogoutFlow.java
rename to java/google/registry/flows/session/LogoutFlow.java
diff --git a/java/com/google/domain/registry/gcs/BUILD b/java/google/registry/gcs/BUILD
similarity index 100%
rename from java/com/google/domain/registry/gcs/BUILD
rename to java/google/registry/gcs/BUILD
diff --git a/java/com/google/domain/registry/gcs/GcsServiceModule.java b/java/google/registry/gcs/GcsServiceModule.java
similarity index 100%
rename from java/com/google/domain/registry/gcs/GcsServiceModule.java
rename to java/google/registry/gcs/GcsServiceModule.java
diff --git a/java/com/google/domain/registry/gcs/GcsUtils.java b/java/google/registry/gcs/GcsUtils.java
similarity index 100%
rename from java/com/google/domain/registry/gcs/GcsUtils.java
rename to java/google/registry/gcs/GcsUtils.java
diff --git a/java/com/google/domain/registry/groups/BUILD b/java/google/registry/groups/BUILD
similarity index 100%
rename from java/com/google/domain/registry/groups/BUILD
rename to java/google/registry/groups/BUILD
diff --git a/java/com/google/domain/registry/groups/DirectoryGroupsConnection.java b/java/google/registry/groups/DirectoryGroupsConnection.java
similarity index 100%
rename from java/com/google/domain/registry/groups/DirectoryGroupsConnection.java
rename to java/google/registry/groups/DirectoryGroupsConnection.java
diff --git a/java/com/google/domain/registry/groups/DirectoryModule.java b/java/google/registry/groups/DirectoryModule.java
similarity index 100%
rename from java/com/google/domain/registry/groups/DirectoryModule.java
rename to java/google/registry/groups/DirectoryModule.java
diff --git a/java/com/google/domain/registry/groups/GroupsConnection.java b/java/google/registry/groups/GroupsConnection.java
similarity index 100%
rename from java/com/google/domain/registry/groups/GroupsConnection.java
rename to java/google/registry/groups/GroupsConnection.java
diff --git a/java/com/google/domain/registry/groups/GroupsModule.java b/java/google/registry/groups/GroupsModule.java
similarity index 100%
rename from java/com/google/domain/registry/groups/GroupsModule.java
rename to java/google/registry/groups/GroupsModule.java
diff --git a/java/com/google/domain/registry/groups/GroupssettingsModule.java b/java/google/registry/groups/GroupssettingsModule.java
similarity index 100%
rename from java/com/google/domain/registry/groups/GroupssettingsModule.java
rename to java/google/registry/groups/GroupssettingsModule.java
diff --git a/java/com/google/domain/registry/idn/Arabic-IDN.txt b/java/google/registry/idn/Arabic-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Arabic-IDN.txt
rename to java/google/registry/idn/Arabic-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Armenian-IDN.txt b/java/google/registry/idn/Armenian-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Armenian-IDN.txt
rename to java/google/registry/idn/Armenian-IDN.txt
diff --git a/java/com/google/domain/registry/idn/BUILD b/java/google/registry/idn/BUILD
similarity index 100%
rename from java/com/google/domain/registry/idn/BUILD
rename to java/google/registry/idn/BUILD
diff --git a/java/com/google/domain/registry/idn/Bengali-IDN.txt b/java/google/registry/idn/Bengali-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Bengali-IDN.txt
rename to java/google/registry/idn/Bengali-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Chinese-IDN.txt b/java/google/registry/idn/Chinese-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Chinese-IDN.txt
rename to java/google/registry/idn/Chinese-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Cyrillic-IDN.txt b/java/google/registry/idn/Cyrillic-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Cyrillic-IDN.txt
rename to java/google/registry/idn/Cyrillic-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Devanagari-IDN.txt b/java/google/registry/idn/Devanagari-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Devanagari-IDN.txt
rename to java/google/registry/idn/Devanagari-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Ethiopic-IDN.txt b/java/google/registry/idn/Ethiopic-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Ethiopic-IDN.txt
rename to java/google/registry/idn/Ethiopic-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Georgian-IDN.txt b/java/google/registry/idn/Georgian-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Georgian-IDN.txt
rename to java/google/registry/idn/Georgian-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Greek-IDN.txt b/java/google/registry/idn/Greek-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Greek-IDN.txt
rename to java/google/registry/idn/Greek-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Gurmukhi-IDN.txt b/java/google/registry/idn/Gurmukhi-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Gurmukhi-IDN.txt
rename to java/google/registry/idn/Gurmukhi-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Hebrew-IDN.txt b/java/google/registry/idn/Hebrew-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Hebrew-IDN.txt
rename to java/google/registry/idn/Hebrew-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Japanese-IDN.txt b/java/google/registry/idn/Japanese-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Japanese-IDN.txt
rename to java/google/registry/idn/Japanese-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Kannada-IDN.txt b/java/google/registry/idn/Kannada-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Kannada-IDN.txt
rename to java/google/registry/idn/Kannada-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Khmer-IDN.txt b/java/google/registry/idn/Khmer-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Khmer-IDN.txt
rename to java/google/registry/idn/Khmer-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Korean-IDN.txt b/java/google/registry/idn/Korean-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Korean-IDN.txt
rename to java/google/registry/idn/Korean-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Latin-IDN.txt b/java/google/registry/idn/Latin-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Latin-IDN.txt
rename to java/google/registry/idn/Latin-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Malayalam-IDN.txt b/java/google/registry/idn/Malayalam-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Malayalam-IDN.txt
rename to java/google/registry/idn/Malayalam-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Myanmar-IDN.txt b/java/google/registry/idn/Myanmar-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Myanmar-IDN.txt
rename to java/google/registry/idn/Myanmar-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Oriya-IDN.txt b/java/google/registry/idn/Oriya-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Oriya-IDN.txt
rename to java/google/registry/idn/Oriya-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Sinhala-IDN.txt b/java/google/registry/idn/Sinhala-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Sinhala-IDN.txt
rename to java/google/registry/idn/Sinhala-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Tamil-IDN.txt b/java/google/registry/idn/Tamil-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Tamil-IDN.txt
rename to java/google/registry/idn/Tamil-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Telugu-IDN.txt b/java/google/registry/idn/Telugu-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Telugu-IDN.txt
rename to java/google/registry/idn/Telugu-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Thai-IDN.txt b/java/google/registry/idn/Thai-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Thai-IDN.txt
rename to java/google/registry/idn/Thai-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Tibetan-IDN.txt b/java/google/registry/idn/Tibetan-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Tibetan-IDN.txt
rename to java/google/registry/idn/Tibetan-IDN.txt
diff --git a/java/com/google/domain/registry/idn/Traditional-Chinese-IDN.txt b/java/google/registry/idn/Traditional-Chinese-IDN.txt
similarity index 100%
rename from java/com/google/domain/registry/idn/Traditional-Chinese-IDN.txt
rename to java/google/registry/idn/Traditional-Chinese-IDN.txt
diff --git a/java/com/google/domain/registry/keyring/api/BUILD b/java/google/registry/keyring/api/BUILD
similarity index 100%
rename from java/com/google/domain/registry/keyring/api/BUILD
rename to java/google/registry/keyring/api/BUILD
diff --git a/java/com/google/domain/registry/keyring/api/KeyModule.java b/java/google/registry/keyring/api/KeyModule.java
similarity index 100%
rename from java/com/google/domain/registry/keyring/api/KeyModule.java
rename to java/google/registry/keyring/api/KeyModule.java
diff --git a/java/com/google/domain/registry/keyring/api/Keyring.java b/java/google/registry/keyring/api/Keyring.java
similarity index 100%
rename from java/com/google/domain/registry/keyring/api/Keyring.java
rename to java/google/registry/keyring/api/Keyring.java
diff --git a/java/com/google/domain/registry/keyring/api/PgpHelper.java b/java/google/registry/keyring/api/PgpHelper.java
similarity index 100%
rename from java/com/google/domain/registry/keyring/api/PgpHelper.java
rename to java/google/registry/keyring/api/PgpHelper.java
diff --git a/java/com/google/domain/registry/keyring/api/VoidKeyring.java b/java/google/registry/keyring/api/VoidKeyring.java
similarity index 100%
rename from java/com/google/domain/registry/keyring/api/VoidKeyring.java
rename to java/google/registry/keyring/api/VoidKeyring.java
diff --git a/java/com/google/domain/registry/keyring/api/VoidKeyringModule.java b/java/google/registry/keyring/api/VoidKeyringModule.java
similarity index 100%
rename from java/com/google/domain/registry/keyring/api/VoidKeyringModule.java
rename to java/google/registry/keyring/api/VoidKeyringModule.java
diff --git a/java/com/google/domain/registry/keyring/api/package-info.java b/java/google/registry/keyring/api/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/keyring/api/package-info.java
rename to java/google/registry/keyring/api/package-info.java
diff --git a/java/com/google/domain/registry/loadtest/BUILD b/java/google/registry/loadtest/BUILD
similarity index 100%
rename from java/com/google/domain/registry/loadtest/BUILD
rename to java/google/registry/loadtest/BUILD
diff --git a/java/com/google/domain/registry/loadtest/LoadTask.java b/java/google/registry/loadtest/LoadTask.java
similarity index 100%
rename from java/com/google/domain/registry/loadtest/LoadTask.java
rename to java/google/registry/loadtest/LoadTask.java
diff --git a/java/com/google/domain/registry/loadtest/LoadTestAction.java b/java/google/registry/loadtest/LoadTestAction.java
similarity index 100%
rename from java/com/google/domain/registry/loadtest/LoadTestAction.java
rename to java/google/registry/loadtest/LoadTestAction.java
diff --git a/java/com/google/domain/registry/loadtest/LoadTestModule.java b/java/google/registry/loadtest/LoadTestModule.java
similarity index 100%
rename from java/com/google/domain/registry/loadtest/LoadTestModule.java
rename to java/google/registry/loadtest/LoadTestModule.java
diff --git a/java/com/google/domain/registry/loadtest/templates/contact_create.xml b/java/google/registry/loadtest/templates/contact_create.xml
similarity index 100%
rename from java/com/google/domain/registry/loadtest/templates/contact_create.xml
rename to java/google/registry/loadtest/templates/contact_create.xml
diff --git a/java/com/google/domain/registry/loadtest/templates/contact_info.xml b/java/google/registry/loadtest/templates/contact_info.xml
similarity index 100%
rename from java/com/google/domain/registry/loadtest/templates/contact_info.xml
rename to java/google/registry/loadtest/templates/contact_info.xml
diff --git a/java/com/google/domain/registry/loadtest/templates/domain_check.xml b/java/google/registry/loadtest/templates/domain_check.xml
similarity index 100%
rename from java/com/google/domain/registry/loadtest/templates/domain_check.xml
rename to java/google/registry/loadtest/templates/domain_check.xml
diff --git a/java/com/google/domain/registry/loadtest/templates/domain_create.xml b/java/google/registry/loadtest/templates/domain_create.xml
similarity index 100%
rename from java/com/google/domain/registry/loadtest/templates/domain_create.xml
rename to java/google/registry/loadtest/templates/domain_create.xml
diff --git a/java/com/google/domain/registry/loadtest/templates/domain_info.xml b/java/google/registry/loadtest/templates/domain_info.xml
similarity index 100%
rename from java/com/google/domain/registry/loadtest/templates/domain_info.xml
rename to java/google/registry/loadtest/templates/domain_info.xml
diff --git a/java/com/google/domain/registry/loadtest/templates/host_create.xml b/java/google/registry/loadtest/templates/host_create.xml
similarity index 100%
rename from java/com/google/domain/registry/loadtest/templates/host_create.xml
rename to java/google/registry/loadtest/templates/host_create.xml
diff --git a/java/com/google/domain/registry/loadtest/templates/host_info.xml b/java/google/registry/loadtest/templates/host_info.xml
similarity index 100%
rename from java/com/google/domain/registry/loadtest/templates/host_info.xml
rename to java/google/registry/loadtest/templates/host_info.xml
diff --git a/java/com/google/domain/registry/mapreduce/BUILD b/java/google/registry/mapreduce/BUILD
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/BUILD
rename to java/google/registry/mapreduce/BUILD
diff --git a/java/com/google/domain/registry/mapreduce/MapreduceAction.java b/java/google/registry/mapreduce/MapreduceAction.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/MapreduceAction.java
rename to java/google/registry/mapreduce/MapreduceAction.java
diff --git a/java/com/google/domain/registry/mapreduce/MapreduceModule.java b/java/google/registry/mapreduce/MapreduceModule.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/MapreduceModule.java
rename to java/google/registry/mapreduce/MapreduceModule.java
diff --git a/java/com/google/domain/registry/mapreduce/MapreduceRunner.java b/java/google/registry/mapreduce/MapreduceRunner.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/MapreduceRunner.java
rename to java/google/registry/mapreduce/MapreduceRunner.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/BUILD b/java/google/registry/mapreduce/inputs/BUILD
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/BUILD
rename to java/google/registry/mapreduce/inputs/BUILD
diff --git a/java/com/google/domain/registry/mapreduce/inputs/ChildEntityInput.java b/java/google/registry/mapreduce/inputs/ChildEntityInput.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/ChildEntityInput.java
rename to java/google/registry/mapreduce/inputs/ChildEntityInput.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/ChildEntityReader.java b/java/google/registry/mapreduce/inputs/ChildEntityReader.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/ChildEntityReader.java
rename to java/google/registry/mapreduce/inputs/ChildEntityReader.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/ChunkingKeyInput.java b/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/ChunkingKeyInput.java
rename to java/google/registry/mapreduce/inputs/ChunkingKeyInput.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/ConcatenatingInput.java b/java/google/registry/mapreduce/inputs/ConcatenatingInput.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/ConcatenatingInput.java
rename to java/google/registry/mapreduce/inputs/ConcatenatingInput.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/EppResourceBaseInput.java b/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/EppResourceBaseInput.java
rename to java/google/registry/mapreduce/inputs/EppResourceBaseInput.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/EppResourceBaseReader.java b/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/EppResourceBaseReader.java
rename to java/google/registry/mapreduce/inputs/EppResourceBaseReader.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/EppResourceEntityInput.java b/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/EppResourceEntityInput.java
rename to java/google/registry/mapreduce/inputs/EppResourceEntityInput.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/EppResourceEntityReader.java b/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/EppResourceEntityReader.java
rename to java/google/registry/mapreduce/inputs/EppResourceEntityReader.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/EppResourceIndexInput.java b/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/EppResourceIndexInput.java
rename to java/google/registry/mapreduce/inputs/EppResourceIndexInput.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/EppResourceIndexReader.java b/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/EppResourceIndexReader.java
rename to java/google/registry/mapreduce/inputs/EppResourceIndexReader.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/EppResourceInputs.java b/java/google/registry/mapreduce/inputs/EppResourceInputs.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/EppResourceInputs.java
rename to java/google/registry/mapreduce/inputs/EppResourceInputs.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/EppResourceKeyInput.java b/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/EppResourceKeyInput.java
rename to java/google/registry/mapreduce/inputs/EppResourceKeyInput.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/EppResourceKeyReader.java b/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/EppResourceKeyReader.java
rename to java/google/registry/mapreduce/inputs/EppResourceKeyReader.java
diff --git a/java/com/google/domain/registry/mapreduce/inputs/NullInput.java b/java/google/registry/mapreduce/inputs/NullInput.java
similarity index 100%
rename from java/com/google/domain/registry/mapreduce/inputs/NullInput.java
rename to java/google/registry/mapreduce/inputs/NullInput.java
diff --git a/java/com/google/domain/registry/model/AbstractFieldExposer.java b/java/google/registry/model/AbstractFieldExposer.java
similarity index 100%
rename from java/com/google/domain/registry/model/AbstractFieldExposer.java
rename to java/google/registry/model/AbstractFieldExposer.java
diff --git a/java/com/google/domain/registry/model/BUILD b/java/google/registry/model/BUILD
similarity index 100%
rename from java/com/google/domain/registry/model/BUILD
rename to java/google/registry/model/BUILD
diff --git a/java/com/google/domain/registry/model/BackupGroupRoot.java b/java/google/registry/model/BackupGroupRoot.java
similarity index 100%
rename from java/com/google/domain/registry/model/BackupGroupRoot.java
rename to java/google/registry/model/BackupGroupRoot.java
diff --git a/java/com/google/domain/registry/model/Buildable.java b/java/google/registry/model/Buildable.java
similarity index 100%
rename from java/com/google/domain/registry/model/Buildable.java
rename to java/google/registry/model/Buildable.java
diff --git a/java/com/google/domain/registry/model/CreateAutoTimestamp.java b/java/google/registry/model/CreateAutoTimestamp.java
similarity index 100%
rename from java/com/google/domain/registry/model/CreateAutoTimestamp.java
rename to java/google/registry/model/CreateAutoTimestamp.java
diff --git a/java/com/google/domain/registry/model/EntityClasses.java b/java/google/registry/model/EntityClasses.java
similarity index 100%
rename from java/com/google/domain/registry/model/EntityClasses.java
rename to java/google/registry/model/EntityClasses.java
diff --git a/java/com/google/domain/registry/model/EppResource.java b/java/google/registry/model/EppResource.java
similarity index 100%
rename from java/com/google/domain/registry/model/EppResource.java
rename to java/google/registry/model/EppResource.java
diff --git a/java/com/google/domain/registry/model/EppResourceUtils.java b/java/google/registry/model/EppResourceUtils.java
similarity index 100%
rename from java/com/google/domain/registry/model/EppResourceUtils.java
rename to java/google/registry/model/EppResourceUtils.java
diff --git a/java/com/google/domain/registry/model/ImmutableObject.java b/java/google/registry/model/ImmutableObject.java
similarity index 100%
rename from java/com/google/domain/registry/model/ImmutableObject.java
rename to java/google/registry/model/ImmutableObject.java
diff --git a/java/com/google/domain/registry/model/JsonMapBuilder.java b/java/google/registry/model/JsonMapBuilder.java
similarity index 100%
rename from java/com/google/domain/registry/model/JsonMapBuilder.java
rename to java/google/registry/model/JsonMapBuilder.java
diff --git a/java/com/google/domain/registry/model/Jsonifiable.java b/java/google/registry/model/Jsonifiable.java
similarity index 100%
rename from java/com/google/domain/registry/model/Jsonifiable.java
rename to java/google/registry/model/Jsonifiable.java
diff --git a/java/com/google/domain/registry/model/ModelUtils.java b/java/google/registry/model/ModelUtils.java
similarity index 100%
rename from java/com/google/domain/registry/model/ModelUtils.java
rename to java/google/registry/model/ModelUtils.java
diff --git a/java/com/google/domain/registry/model/RoidSuffixes.java b/java/google/registry/model/RoidSuffixes.java
similarity index 100%
rename from java/com/google/domain/registry/model/RoidSuffixes.java
rename to java/google/registry/model/RoidSuffixes.java
diff --git a/java/com/google/domain/registry/model/SchemaVersion.java b/java/google/registry/model/SchemaVersion.java
similarity index 100%
rename from java/com/google/domain/registry/model/SchemaVersion.java
rename to java/google/registry/model/SchemaVersion.java
diff --git a/java/com/google/domain/registry/model/UpdateAutoTimestamp.java b/java/google/registry/model/UpdateAutoTimestamp.java
similarity index 100%
rename from java/com/google/domain/registry/model/UpdateAutoTimestamp.java
rename to java/google/registry/model/UpdateAutoTimestamp.java
diff --git a/java/com/google/domain/registry/model/annotations/ExternalMessagingName.java b/java/google/registry/model/annotations/ExternalMessagingName.java
similarity index 100%
rename from java/com/google/domain/registry/model/annotations/ExternalMessagingName.java
rename to java/google/registry/model/annotations/ExternalMessagingName.java
diff --git a/java/com/google/domain/registry/model/annotations/NotBackedUp.java b/java/google/registry/model/annotations/NotBackedUp.java
similarity index 100%
rename from java/com/google/domain/registry/model/annotations/NotBackedUp.java
rename to java/google/registry/model/annotations/NotBackedUp.java
diff --git a/java/com/google/domain/registry/model/annotations/VirtualEntity.java b/java/google/registry/model/annotations/VirtualEntity.java
similarity index 100%
rename from java/com/google/domain/registry/model/annotations/VirtualEntity.java
rename to java/google/registry/model/annotations/VirtualEntity.java
diff --git a/java/com/google/domain/registry/model/billing/BillingEvent.java b/java/google/registry/model/billing/BillingEvent.java
similarity index 100%
rename from java/com/google/domain/registry/model/billing/BillingEvent.java
rename to java/google/registry/model/billing/BillingEvent.java
diff --git a/java/com/google/domain/registry/model/billing/RegistrarBillingEntry.java b/java/google/registry/model/billing/RegistrarBillingEntry.java
similarity index 100%
rename from java/com/google/domain/registry/model/billing/RegistrarBillingEntry.java
rename to java/google/registry/model/billing/RegistrarBillingEntry.java
diff --git a/java/com/google/domain/registry/model/billing/RegistrarBillingUtils.java b/java/google/registry/model/billing/RegistrarBillingUtils.java
similarity index 100%
rename from java/com/google/domain/registry/model/billing/RegistrarBillingUtils.java
rename to java/google/registry/model/billing/RegistrarBillingUtils.java
diff --git a/java/com/google/domain/registry/model/billing/RegistrarCredit.java b/java/google/registry/model/billing/RegistrarCredit.java
similarity index 100%
rename from java/com/google/domain/registry/model/billing/RegistrarCredit.java
rename to java/google/registry/model/billing/RegistrarCredit.java
diff --git a/java/com/google/domain/registry/model/billing/RegistrarCreditBalance.java b/java/google/registry/model/billing/RegistrarCreditBalance.java
similarity index 100%
rename from java/com/google/domain/registry/model/billing/RegistrarCreditBalance.java
rename to java/google/registry/model/billing/RegistrarCreditBalance.java
diff --git a/java/com/google/domain/registry/model/common/CrossTldSingleton.java b/java/google/registry/model/common/CrossTldSingleton.java
similarity index 100%
rename from java/com/google/domain/registry/model/common/CrossTldSingleton.java
rename to java/google/registry/model/common/CrossTldSingleton.java
diff --git a/java/com/google/domain/registry/model/common/EntityGroupRoot.java b/java/google/registry/model/common/EntityGroupRoot.java
similarity index 100%
rename from java/com/google/domain/registry/model/common/EntityGroupRoot.java
rename to java/google/registry/model/common/EntityGroupRoot.java
diff --git a/java/com/google/domain/registry/model/common/GaeUserIdConverter.java b/java/google/registry/model/common/GaeUserIdConverter.java
similarity index 100%
rename from java/com/google/domain/registry/model/common/GaeUserIdConverter.java
rename to java/google/registry/model/common/GaeUserIdConverter.java
diff --git a/java/com/google/domain/registry/model/common/PersistedRangeLong.java b/java/google/registry/model/common/PersistedRangeLong.java
similarity index 100%
rename from java/com/google/domain/registry/model/common/PersistedRangeLong.java
rename to java/google/registry/model/common/PersistedRangeLong.java
diff --git a/java/com/google/domain/registry/model/common/TimeOfYear.java b/java/google/registry/model/common/TimeOfYear.java
similarity index 100%
rename from java/com/google/domain/registry/model/common/TimeOfYear.java
rename to java/google/registry/model/common/TimeOfYear.java
diff --git a/java/com/google/domain/registry/model/common/TimedTransitionProperty.java b/java/google/registry/model/common/TimedTransitionProperty.java
similarity index 100%
rename from java/com/google/domain/registry/model/common/TimedTransitionProperty.java
rename to java/google/registry/model/common/TimedTransitionProperty.java
diff --git a/java/com/google/domain/registry/model/contact/ContactAddress.java b/java/google/registry/model/contact/ContactAddress.java
similarity index 100%
rename from java/com/google/domain/registry/model/contact/ContactAddress.java
rename to java/google/registry/model/contact/ContactAddress.java
diff --git a/java/com/google/domain/registry/model/contact/ContactAuthInfo.java b/java/google/registry/model/contact/ContactAuthInfo.java
similarity index 100%
rename from java/com/google/domain/registry/model/contact/ContactAuthInfo.java
rename to java/google/registry/model/contact/ContactAuthInfo.java
diff --git a/java/com/google/domain/registry/model/contact/ContactCommand.java b/java/google/registry/model/contact/ContactCommand.java
similarity index 100%
rename from java/com/google/domain/registry/model/contact/ContactCommand.java
rename to java/google/registry/model/contact/ContactCommand.java
diff --git a/java/com/google/domain/registry/model/contact/ContactPhoneNumber.java b/java/google/registry/model/contact/ContactPhoneNumber.java
similarity index 100%
rename from java/com/google/domain/registry/model/contact/ContactPhoneNumber.java
rename to java/google/registry/model/contact/ContactPhoneNumber.java
diff --git a/java/com/google/domain/registry/model/contact/ContactResource.java b/java/google/registry/model/contact/ContactResource.java
similarity index 100%
rename from java/com/google/domain/registry/model/contact/ContactResource.java
rename to java/google/registry/model/contact/ContactResource.java
diff --git a/java/com/google/domain/registry/model/contact/Disclose.java b/java/google/registry/model/contact/Disclose.java
similarity index 100%
rename from java/com/google/domain/registry/model/contact/Disclose.java
rename to java/google/registry/model/contact/Disclose.java
diff --git a/java/com/google/domain/registry/model/contact/PostalInfo.java b/java/google/registry/model/contact/PostalInfo.java
similarity index 100%
rename from java/com/google/domain/registry/model/contact/PostalInfo.java
rename to java/google/registry/model/contact/PostalInfo.java
diff --git a/java/com/google/domain/registry/model/contact/package-info.java b/java/google/registry/model/contact/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/contact/package-info.java
rename to java/google/registry/model/contact/package-info.java
diff --git a/java/com/google/domain/registry/model/domain/DesignatedContact.java b/java/google/registry/model/domain/DesignatedContact.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/DesignatedContact.java
rename to java/google/registry/model/domain/DesignatedContact.java
diff --git a/java/com/google/domain/registry/model/domain/DomainApplication.java b/java/google/registry/model/domain/DomainApplication.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/DomainApplication.java
rename to java/google/registry/model/domain/DomainApplication.java
diff --git a/java/com/google/domain/registry/model/domain/DomainAuthInfo.java b/java/google/registry/model/domain/DomainAuthInfo.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/DomainAuthInfo.java
rename to java/google/registry/model/domain/DomainAuthInfo.java
diff --git a/java/com/google/domain/registry/model/domain/DomainBase.java b/java/google/registry/model/domain/DomainBase.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/DomainBase.java
rename to java/google/registry/model/domain/DomainBase.java
diff --git a/java/com/google/domain/registry/model/domain/DomainCommand.java b/java/google/registry/model/domain/DomainCommand.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/DomainCommand.java
rename to java/google/registry/model/domain/DomainCommand.java
diff --git a/java/com/google/domain/registry/model/domain/DomainRenewData.java b/java/google/registry/model/domain/DomainRenewData.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/DomainRenewData.java
rename to java/google/registry/model/domain/DomainRenewData.java
diff --git a/java/com/google/domain/registry/model/domain/DomainResource.java b/java/google/registry/model/domain/DomainResource.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/DomainResource.java
rename to java/google/registry/model/domain/DomainResource.java
diff --git a/java/com/google/domain/registry/model/domain/GracePeriod.java b/java/google/registry/model/domain/GracePeriod.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/GracePeriod.java
rename to java/google/registry/model/domain/GracePeriod.java
diff --git a/java/com/google/domain/registry/model/domain/Period.java b/java/google/registry/model/domain/Period.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/Period.java
rename to java/google/registry/model/domain/Period.java
diff --git a/java/com/google/domain/registry/model/domain/ReferenceUnion.java b/java/google/registry/model/domain/ReferenceUnion.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/ReferenceUnion.java
rename to java/google/registry/model/domain/ReferenceUnion.java
diff --git a/java/com/google/domain/registry/model/domain/allocate/AllocateCreateExtension.java b/java/google/registry/model/domain/allocate/AllocateCreateExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/allocate/AllocateCreateExtension.java
rename to java/google/registry/model/domain/allocate/AllocateCreateExtension.java
diff --git a/java/com/google/domain/registry/model/domain/allocate/package-info.java b/java/google/registry/model/domain/allocate/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/allocate/package-info.java
rename to java/google/registry/model/domain/allocate/package-info.java
diff --git a/java/com/google/domain/registry/model/domain/fee/BaseFee.java b/java/google/registry/model/domain/fee/BaseFee.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/BaseFee.java
rename to java/google/registry/model/domain/fee/BaseFee.java
diff --git a/java/com/google/domain/registry/model/domain/fee/BaseFeeCommand.java b/java/google/registry/model/domain/fee/BaseFeeCommand.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/BaseFeeCommand.java
rename to java/google/registry/model/domain/fee/BaseFeeCommand.java
diff --git a/java/com/google/domain/registry/model/domain/fee/BaseFeeCommandResponse.java b/java/google/registry/model/domain/fee/BaseFeeCommandResponse.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/BaseFeeCommandResponse.java
rename to java/google/registry/model/domain/fee/BaseFeeCommandResponse.java
diff --git a/java/com/google/domain/registry/model/domain/fee/BaseFeeRequest.java b/java/google/registry/model/domain/fee/BaseFeeRequest.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/BaseFeeRequest.java
rename to java/google/registry/model/domain/fee/BaseFeeRequest.java
diff --git a/java/com/google/domain/registry/model/domain/fee/BaseFeeResponse.java b/java/google/registry/model/domain/fee/BaseFeeResponse.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/BaseFeeResponse.java
rename to java/google/registry/model/domain/fee/BaseFeeResponse.java
diff --git a/java/com/google/domain/registry/model/domain/fee/Credit.java b/java/google/registry/model/domain/fee/Credit.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/Credit.java
rename to java/google/registry/model/domain/fee/Credit.java
diff --git a/java/com/google/domain/registry/model/domain/fee/Fee.java b/java/google/registry/model/domain/fee/Fee.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/Fee.java
rename to java/google/registry/model/domain/fee/Fee.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeCheckExtension.java b/java/google/registry/model/domain/fee/FeeCheckExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeCheckExtension.java
rename to java/google/registry/model/domain/fee/FeeCheckExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeCheckResponseExtension.java b/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeCheckResponseExtension.java
rename to java/google/registry/model/domain/fee/FeeCheckResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeCommandDescriptor.java b/java/google/registry/model/domain/fee/FeeCommandDescriptor.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeCommandDescriptor.java
rename to java/google/registry/model/domain/fee/FeeCommandDescriptor.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeCreateExtension.java b/java/google/registry/model/domain/fee/FeeCreateExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeCreateExtension.java
rename to java/google/registry/model/domain/fee/FeeCreateExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeCreateResponseExtension.java b/java/google/registry/model/domain/fee/FeeCreateResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeCreateResponseExtension.java
rename to java/google/registry/model/domain/fee/FeeCreateResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeDeleteResponseExtension.java b/java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeDeleteResponseExtension.java
rename to java/google/registry/model/domain/fee/FeeDeleteResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeInfoExtension.java b/java/google/registry/model/domain/fee/FeeInfoExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeInfoExtension.java
rename to java/google/registry/model/domain/fee/FeeInfoExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeInfoResponseExtension.java b/java/google/registry/model/domain/fee/FeeInfoResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeInfoResponseExtension.java
rename to java/google/registry/model/domain/fee/FeeInfoResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeRenewExtension.java b/java/google/registry/model/domain/fee/FeeRenewExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeRenewExtension.java
rename to java/google/registry/model/domain/fee/FeeRenewExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeRenewResponseExtension.java b/java/google/registry/model/domain/fee/FeeRenewResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeRenewResponseExtension.java
rename to java/google/registry/model/domain/fee/FeeRenewResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeTransferExtension.java b/java/google/registry/model/domain/fee/FeeTransferExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeTransferExtension.java
rename to java/google/registry/model/domain/fee/FeeTransferExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeTransferResponseExtension.java b/java/google/registry/model/domain/fee/FeeTransferResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeTransferResponseExtension.java
rename to java/google/registry/model/domain/fee/FeeTransferResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeUpdateExtension.java b/java/google/registry/model/domain/fee/FeeUpdateExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeUpdateExtension.java
rename to java/google/registry/model/domain/fee/FeeUpdateExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/FeeUpdateResponseExtension.java b/java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/FeeUpdateResponseExtension.java
rename to java/google/registry/model/domain/fee/FeeUpdateResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/fee/package-info.java b/java/google/registry/model/domain/fee/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/fee/package-info.java
rename to java/google/registry/model/domain/fee/package-info.java
diff --git a/java/com/google/domain/registry/model/domain/launch/ApplicationIdTargetExtension.java b/java/google/registry/model/domain/launch/ApplicationIdTargetExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/ApplicationIdTargetExtension.java
rename to java/google/registry/model/domain/launch/ApplicationIdTargetExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/ApplicationStatus.java b/java/google/registry/model/domain/launch/ApplicationStatus.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/ApplicationStatus.java
rename to java/google/registry/model/domain/launch/ApplicationStatus.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchCheckExtension.java b/java/google/registry/model/domain/launch/LaunchCheckExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchCheckExtension.java
rename to java/google/registry/model/domain/launch/LaunchCheckExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchCheckResponseExtension.java b/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchCheckResponseExtension.java
rename to java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchCreateExtension.java b/java/google/registry/model/domain/launch/LaunchCreateExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchCreateExtension.java
rename to java/google/registry/model/domain/launch/LaunchCreateExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchCreateResponseExtension.java b/java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchCreateResponseExtension.java
rename to java/google/registry/model/domain/launch/LaunchCreateResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchDeleteExtension.java b/java/google/registry/model/domain/launch/LaunchDeleteExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchDeleteExtension.java
rename to java/google/registry/model/domain/launch/LaunchDeleteExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchExtension.java b/java/google/registry/model/domain/launch/LaunchExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchExtension.java
rename to java/google/registry/model/domain/launch/LaunchExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchInfoExtension.java b/java/google/registry/model/domain/launch/LaunchInfoExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchInfoExtension.java
rename to java/google/registry/model/domain/launch/LaunchInfoExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchInfoResponseExtension.java b/java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchInfoResponseExtension.java
rename to java/google/registry/model/domain/launch/LaunchInfoResponseExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchNotice.java b/java/google/registry/model/domain/launch/LaunchNotice.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchNotice.java
rename to java/google/registry/model/domain/launch/LaunchNotice.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchPhase.java b/java/google/registry/model/domain/launch/LaunchPhase.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchPhase.java
rename to java/google/registry/model/domain/launch/LaunchPhase.java
diff --git a/java/com/google/domain/registry/model/domain/launch/LaunchUpdateExtension.java b/java/google/registry/model/domain/launch/LaunchUpdateExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/LaunchUpdateExtension.java
rename to java/google/registry/model/domain/launch/LaunchUpdateExtension.java
diff --git a/java/com/google/domain/registry/model/domain/launch/package-info.java b/java/google/registry/model/domain/launch/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/launch/package-info.java
rename to java/google/registry/model/domain/launch/package-info.java
diff --git a/java/com/google/domain/registry/model/domain/metadata/MetadataExtension.java b/java/google/registry/model/domain/metadata/MetadataExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/metadata/MetadataExtension.java
rename to java/google/registry/model/domain/metadata/MetadataExtension.java
diff --git a/java/com/google/domain/registry/model/domain/metadata/package-info.java b/java/google/registry/model/domain/metadata/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/metadata/package-info.java
rename to java/google/registry/model/domain/metadata/package-info.java
diff --git a/java/com/google/domain/registry/model/domain/package-info.java b/java/google/registry/model/domain/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/package-info.java
rename to java/google/registry/model/domain/package-info.java
diff --git a/java/com/google/domain/registry/model/domain/rgp/GracePeriodStatus.java b/java/google/registry/model/domain/rgp/GracePeriodStatus.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/rgp/GracePeriodStatus.java
rename to java/google/registry/model/domain/rgp/GracePeriodStatus.java
diff --git a/java/com/google/domain/registry/model/domain/rgp/RestoreCommand.java b/java/google/registry/model/domain/rgp/RestoreCommand.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/rgp/RestoreCommand.java
rename to java/google/registry/model/domain/rgp/RestoreCommand.java
diff --git a/java/com/google/domain/registry/model/domain/rgp/RgpInfoExtension.java b/java/google/registry/model/domain/rgp/RgpInfoExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/rgp/RgpInfoExtension.java
rename to java/google/registry/model/domain/rgp/RgpInfoExtension.java
diff --git a/java/com/google/domain/registry/model/domain/rgp/RgpUpdateExtension.java b/java/google/registry/model/domain/rgp/RgpUpdateExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/rgp/RgpUpdateExtension.java
rename to java/google/registry/model/domain/rgp/RgpUpdateExtension.java
diff --git a/java/com/google/domain/registry/model/domain/rgp/package-info.java b/java/google/registry/model/domain/rgp/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/rgp/package-info.java
rename to java/google/registry/model/domain/rgp/package-info.java
diff --git a/java/com/google/domain/registry/model/domain/secdns/DelegationSignerData.java b/java/google/registry/model/domain/secdns/DelegationSignerData.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/secdns/DelegationSignerData.java
rename to java/google/registry/model/domain/secdns/DelegationSignerData.java
diff --git a/java/com/google/domain/registry/model/domain/secdns/SecDnsCreateExtension.java b/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/secdns/SecDnsCreateExtension.java
rename to java/google/registry/model/domain/secdns/SecDnsCreateExtension.java
diff --git a/java/com/google/domain/registry/model/domain/secdns/SecDnsInfoExtension.java b/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/secdns/SecDnsInfoExtension.java
rename to java/google/registry/model/domain/secdns/SecDnsInfoExtension.java
diff --git a/java/com/google/domain/registry/model/domain/secdns/SecDnsUpdateExtension.java b/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/secdns/SecDnsUpdateExtension.java
rename to java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java
diff --git a/java/com/google/domain/registry/model/domain/secdns/package-info.java b/java/google/registry/model/domain/secdns/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/domain/secdns/package-info.java
rename to java/google/registry/model/domain/secdns/package-info.java
diff --git a/java/com/google/domain/registry/model/eppcommon/Address.java b/java/google/registry/model/eppcommon/Address.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppcommon/Address.java
rename to java/google/registry/model/eppcommon/Address.java
diff --git a/java/com/google/domain/registry/model/eppcommon/AuthInfo.java b/java/google/registry/model/eppcommon/AuthInfo.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppcommon/AuthInfo.java
rename to java/google/registry/model/eppcommon/AuthInfo.java
diff --git a/java/com/google/domain/registry/model/eppcommon/PhoneNumber.java b/java/google/registry/model/eppcommon/PhoneNumber.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppcommon/PhoneNumber.java
rename to java/google/registry/model/eppcommon/PhoneNumber.java
diff --git a/java/com/google/domain/registry/model/eppcommon/PresenceMarker.java b/java/google/registry/model/eppcommon/PresenceMarker.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppcommon/PresenceMarker.java
rename to java/google/registry/model/eppcommon/PresenceMarker.java
diff --git a/java/com/google/domain/registry/model/eppcommon/ProtocolDefinition.java b/java/google/registry/model/eppcommon/ProtocolDefinition.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppcommon/ProtocolDefinition.java
rename to java/google/registry/model/eppcommon/ProtocolDefinition.java
diff --git a/java/com/google/domain/registry/model/eppcommon/StatusValue.java b/java/google/registry/model/eppcommon/StatusValue.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppcommon/StatusValue.java
rename to java/google/registry/model/eppcommon/StatusValue.java
diff --git a/java/com/google/domain/registry/model/eppcommon/Trid.java b/java/google/registry/model/eppcommon/Trid.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppcommon/Trid.java
rename to java/google/registry/model/eppcommon/Trid.java
diff --git a/java/com/google/domain/registry/model/eppcommon/package-info.java b/java/google/registry/model/eppcommon/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppcommon/package-info.java
rename to java/google/registry/model/eppcommon/package-info.java
diff --git a/java/com/google/domain/registry/model/eppinput/EppInput.java b/java/google/registry/model/eppinput/EppInput.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppinput/EppInput.java
rename to java/google/registry/model/eppinput/EppInput.java
diff --git a/java/com/google/domain/registry/model/eppinput/ResourceCommand.java b/java/google/registry/model/eppinput/ResourceCommand.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppinput/ResourceCommand.java
rename to java/google/registry/model/eppinput/ResourceCommand.java
diff --git a/java/com/google/domain/registry/model/eppinput/package-info.java b/java/google/registry/model/eppinput/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppinput/package-info.java
rename to java/google/registry/model/eppinput/package-info.java
diff --git a/java/com/google/domain/registry/model/eppoutput/CheckData.java b/java/google/registry/model/eppoutput/CheckData.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppoutput/CheckData.java
rename to java/google/registry/model/eppoutput/CheckData.java
diff --git a/java/com/google/domain/registry/model/eppoutput/CreateData.java b/java/google/registry/model/eppoutput/CreateData.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppoutput/CreateData.java
rename to java/google/registry/model/eppoutput/CreateData.java
diff --git a/java/com/google/domain/registry/model/eppoutput/EppOutput.java b/java/google/registry/model/eppoutput/EppOutput.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppoutput/EppOutput.java
rename to java/google/registry/model/eppoutput/EppOutput.java
diff --git a/java/com/google/domain/registry/model/eppoutput/Greeting.java b/java/google/registry/model/eppoutput/Greeting.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppoutput/Greeting.java
rename to java/google/registry/model/eppoutput/Greeting.java
diff --git a/java/com/google/domain/registry/model/eppoutput/Response.java b/java/google/registry/model/eppoutput/Response.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppoutput/Response.java
rename to java/google/registry/model/eppoutput/Response.java
diff --git a/java/com/google/domain/registry/model/eppoutput/Result.java b/java/google/registry/model/eppoutput/Result.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppoutput/Result.java
rename to java/google/registry/model/eppoutput/Result.java
diff --git a/java/com/google/domain/registry/model/eppoutput/package-info.java b/java/google/registry/model/eppoutput/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/eppoutput/package-info.java
rename to java/google/registry/model/eppoutput/package-info.java
diff --git a/java/com/google/domain/registry/model/export/LogsExportCursor.java b/java/google/registry/model/export/LogsExportCursor.java
similarity index 100%
rename from java/com/google/domain/registry/model/export/LogsExportCursor.java
rename to java/google/registry/model/export/LogsExportCursor.java
diff --git a/java/com/google/domain/registry/model/generate_field_exposer.sh b/java/google/registry/model/generate_field_exposer.sh
similarity index 100%
rename from java/com/google/domain/registry/model/generate_field_exposer.sh
rename to java/google/registry/model/generate_field_exposer.sh
diff --git a/java/com/google/domain/registry/model/generate_field_exposer_registry.sh b/java/google/registry/model/generate_field_exposer_registry.sh
similarity index 100%
rename from java/com/google/domain/registry/model/generate_field_exposer_registry.sh
rename to java/google/registry/model/generate_field_exposer_registry.sh
diff --git a/java/com/google/domain/registry/model/host/HostCommand.java b/java/google/registry/model/host/HostCommand.java
similarity index 100%
rename from java/com/google/domain/registry/model/host/HostCommand.java
rename to java/google/registry/model/host/HostCommand.java
diff --git a/java/com/google/domain/registry/model/host/HostResource.java b/java/google/registry/model/host/HostResource.java
similarity index 100%
rename from java/com/google/domain/registry/model/host/HostResource.java
rename to java/google/registry/model/host/HostResource.java
diff --git a/java/com/google/domain/registry/model/host/InetAddressAdapter.java b/java/google/registry/model/host/InetAddressAdapter.java
similarity index 100%
rename from java/com/google/domain/registry/model/host/InetAddressAdapter.java
rename to java/google/registry/model/host/InetAddressAdapter.java
diff --git a/java/com/google/domain/registry/model/host/package-info.java b/java/google/registry/model/host/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/host/package-info.java
rename to java/google/registry/model/host/package-info.java
diff --git a/java/com/google/domain/registry/model/index/DomainApplicationIndex.java b/java/google/registry/model/index/DomainApplicationIndex.java
similarity index 100%
rename from java/com/google/domain/registry/model/index/DomainApplicationIndex.java
rename to java/google/registry/model/index/DomainApplicationIndex.java
diff --git a/java/com/google/domain/registry/model/index/EppResourceIndex.java b/java/google/registry/model/index/EppResourceIndex.java
similarity index 100%
rename from java/com/google/domain/registry/model/index/EppResourceIndex.java
rename to java/google/registry/model/index/EppResourceIndex.java
diff --git a/java/com/google/domain/registry/model/index/EppResourceIndexBucket.java b/java/google/registry/model/index/EppResourceIndexBucket.java
similarity index 100%
rename from java/com/google/domain/registry/model/index/EppResourceIndexBucket.java
rename to java/google/registry/model/index/EppResourceIndexBucket.java
diff --git a/java/com/google/domain/registry/model/index/ForeignKeyIndex.java b/java/google/registry/model/index/ForeignKeyIndex.java
similarity index 100%
rename from java/com/google/domain/registry/model/index/ForeignKeyIndex.java
rename to java/google/registry/model/index/ForeignKeyIndex.java
diff --git a/java/com/google/domain/registry/model/mark/CommonMarkContactFields.java b/java/google/registry/model/mark/CommonMarkContactFields.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/CommonMarkContactFields.java
rename to java/google/registry/model/mark/CommonMarkContactFields.java
diff --git a/java/com/google/domain/registry/model/mark/CommonMarkFields.java b/java/google/registry/model/mark/CommonMarkFields.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/CommonMarkFields.java
rename to java/google/registry/model/mark/CommonMarkFields.java
diff --git a/java/com/google/domain/registry/model/mark/CourtMark.java b/java/google/registry/model/mark/CourtMark.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/CourtMark.java
rename to java/google/registry/model/mark/CourtMark.java
diff --git a/java/com/google/domain/registry/model/mark/Mark.java b/java/google/registry/model/mark/Mark.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/Mark.java
rename to java/google/registry/model/mark/Mark.java
diff --git a/java/com/google/domain/registry/model/mark/MarkAddress.java b/java/google/registry/model/mark/MarkAddress.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/MarkAddress.java
rename to java/google/registry/model/mark/MarkAddress.java
diff --git a/java/com/google/domain/registry/model/mark/MarkContact.java b/java/google/registry/model/mark/MarkContact.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/MarkContact.java
rename to java/google/registry/model/mark/MarkContact.java
diff --git a/java/com/google/domain/registry/model/mark/MarkHolder.java b/java/google/registry/model/mark/MarkHolder.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/MarkHolder.java
rename to java/google/registry/model/mark/MarkHolder.java
diff --git a/java/com/google/domain/registry/model/mark/MarkPhoneNumber.java b/java/google/registry/model/mark/MarkPhoneNumber.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/MarkPhoneNumber.java
rename to java/google/registry/model/mark/MarkPhoneNumber.java
diff --git a/java/com/google/domain/registry/model/mark/MarkProtection.java b/java/google/registry/model/mark/MarkProtection.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/MarkProtection.java
rename to java/google/registry/model/mark/MarkProtection.java
diff --git a/java/com/google/domain/registry/model/mark/ProtectedMark.java b/java/google/registry/model/mark/ProtectedMark.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/ProtectedMark.java
rename to java/google/registry/model/mark/ProtectedMark.java
diff --git a/java/com/google/domain/registry/model/mark/Trademark.java b/java/google/registry/model/mark/Trademark.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/Trademark.java
rename to java/google/registry/model/mark/Trademark.java
diff --git a/java/com/google/domain/registry/model/mark/TreatyOrStatuteMark.java b/java/google/registry/model/mark/TreatyOrStatuteMark.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/TreatyOrStatuteMark.java
rename to java/google/registry/model/mark/TreatyOrStatuteMark.java
diff --git a/java/com/google/domain/registry/model/mark/package-info.java b/java/google/registry/model/mark/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/mark/package-info.java
rename to java/google/registry/model/mark/package-info.java
diff --git a/java/com/google/domain/registry/model/ofy/AugmentedDeleter.java b/java/google/registry/model/ofy/AugmentedDeleter.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/AugmentedDeleter.java
rename to java/google/registry/model/ofy/AugmentedDeleter.java
diff --git a/java/com/google/domain/registry/model/ofy/AugmentedSaver.java b/java/google/registry/model/ofy/AugmentedSaver.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/AugmentedSaver.java
rename to java/google/registry/model/ofy/AugmentedSaver.java
diff --git a/java/com/google/domain/registry/model/ofy/CommitLogBucket.java b/java/google/registry/model/ofy/CommitLogBucket.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/CommitLogBucket.java
rename to java/google/registry/model/ofy/CommitLogBucket.java
diff --git a/java/com/google/domain/registry/model/ofy/CommitLogCheckpoint.java b/java/google/registry/model/ofy/CommitLogCheckpoint.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/CommitLogCheckpoint.java
rename to java/google/registry/model/ofy/CommitLogCheckpoint.java
diff --git a/java/com/google/domain/registry/model/ofy/CommitLogCheckpointRoot.java b/java/google/registry/model/ofy/CommitLogCheckpointRoot.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/CommitLogCheckpointRoot.java
rename to java/google/registry/model/ofy/CommitLogCheckpointRoot.java
diff --git a/java/com/google/domain/registry/model/ofy/CommitLogManifest.java b/java/google/registry/model/ofy/CommitLogManifest.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/CommitLogManifest.java
rename to java/google/registry/model/ofy/CommitLogManifest.java
diff --git a/java/com/google/domain/registry/model/ofy/CommitLogMutation.java b/java/google/registry/model/ofy/CommitLogMutation.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/CommitLogMutation.java
rename to java/google/registry/model/ofy/CommitLogMutation.java
diff --git a/java/com/google/domain/registry/model/ofy/CommitLoggedWork.java b/java/google/registry/model/ofy/CommitLoggedWork.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/CommitLoggedWork.java
rename to java/google/registry/model/ofy/CommitLoggedWork.java
diff --git a/java/com/google/domain/registry/model/ofy/ObjectifyService.java b/java/google/registry/model/ofy/ObjectifyService.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/ObjectifyService.java
rename to java/google/registry/model/ofy/ObjectifyService.java
diff --git a/java/com/google/domain/registry/model/ofy/Ofy.java b/java/google/registry/model/ofy/Ofy.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/Ofy.java
rename to java/google/registry/model/ofy/Ofy.java
diff --git a/java/com/google/domain/registry/model/ofy/OfyFilter.java b/java/google/registry/model/ofy/OfyFilter.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/OfyFilter.java
rename to java/google/registry/model/ofy/OfyFilter.java
diff --git a/java/com/google/domain/registry/model/ofy/ReadOnlyWork.java b/java/google/registry/model/ofy/ReadOnlyWork.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/ReadOnlyWork.java
rename to java/google/registry/model/ofy/ReadOnlyWork.java
diff --git a/java/com/google/domain/registry/model/ofy/SessionKeyExposingObjectify.java b/java/google/registry/model/ofy/SessionKeyExposingObjectify.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/SessionKeyExposingObjectify.java
rename to java/google/registry/model/ofy/SessionKeyExposingObjectify.java
diff --git a/java/com/google/domain/registry/model/ofy/TimestampInversionException.java b/java/google/registry/model/ofy/TimestampInversionException.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/TimestampInversionException.java
rename to java/google/registry/model/ofy/TimestampInversionException.java
diff --git a/java/com/google/domain/registry/model/ofy/TransactionInfo.java b/java/google/registry/model/ofy/TransactionInfo.java
similarity index 100%
rename from java/com/google/domain/registry/model/ofy/TransactionInfo.java
rename to java/google/registry/model/ofy/TransactionInfo.java
diff --git a/java/com/google/domain/registry/model/package-info.java b/java/google/registry/model/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/package-info.java
rename to java/google/registry/model/package-info.java
diff --git a/java/com/google/domain/registry/model/poll/MessageQueueInfo.java b/java/google/registry/model/poll/MessageQueueInfo.java
similarity index 100%
rename from java/com/google/domain/registry/model/poll/MessageQueueInfo.java
rename to java/google/registry/model/poll/MessageQueueInfo.java
diff --git a/java/com/google/domain/registry/model/poll/PendingActionNotificationResponse.java b/java/google/registry/model/poll/PendingActionNotificationResponse.java
similarity index 100%
rename from java/com/google/domain/registry/model/poll/PendingActionNotificationResponse.java
rename to java/google/registry/model/poll/PendingActionNotificationResponse.java
diff --git a/java/com/google/domain/registry/model/poll/PollMessage.java b/java/google/registry/model/poll/PollMessage.java
similarity index 100%
rename from java/com/google/domain/registry/model/poll/PollMessage.java
rename to java/google/registry/model/poll/PollMessage.java
diff --git a/java/com/google/domain/registry/model/poll/PollMessageExternalKeyConverter.java b/java/google/registry/model/poll/PollMessageExternalKeyConverter.java
similarity index 100%
rename from java/com/google/domain/registry/model/poll/PollMessageExternalKeyConverter.java
rename to java/google/registry/model/poll/PollMessageExternalKeyConverter.java
diff --git a/java/com/google/domain/registry/model/poll/package-info.java b/java/google/registry/model/poll/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/poll/package-info.java
rename to java/google/registry/model/poll/package-info.java
diff --git a/java/com/google/domain/registry/model/rde/RdeMode.java b/java/google/registry/model/rde/RdeMode.java
similarity index 100%
rename from java/com/google/domain/registry/model/rde/RdeMode.java
rename to java/google/registry/model/rde/RdeMode.java
diff --git a/java/com/google/domain/registry/model/rde/RdeNamingUtils.java b/java/google/registry/model/rde/RdeNamingUtils.java
similarity index 100%
rename from java/com/google/domain/registry/model/rde/RdeNamingUtils.java
rename to java/google/registry/model/rde/RdeNamingUtils.java
diff --git a/java/com/google/domain/registry/model/rde/RdeRevision.java b/java/google/registry/model/rde/RdeRevision.java
similarity index 100%
rename from java/com/google/domain/registry/model/rde/RdeRevision.java
rename to java/google/registry/model/rde/RdeRevision.java
diff --git a/java/com/google/domain/registry/model/registrar/Registrar.java b/java/google/registry/model/registrar/Registrar.java
similarity index 100%
rename from java/com/google/domain/registry/model/registrar/Registrar.java
rename to java/google/registry/model/registrar/Registrar.java
diff --git a/java/com/google/domain/registry/model/registrar/RegistrarAddress.java b/java/google/registry/model/registrar/RegistrarAddress.java
similarity index 100%
rename from java/com/google/domain/registry/model/registrar/RegistrarAddress.java
rename to java/google/registry/model/registrar/RegistrarAddress.java
diff --git a/java/com/google/domain/registry/model/registrar/RegistrarContact.java b/java/google/registry/model/registrar/RegistrarContact.java
similarity index 100%
rename from java/com/google/domain/registry/model/registrar/RegistrarContact.java
rename to java/google/registry/model/registrar/RegistrarContact.java
diff --git a/java/com/google/domain/registry/model/registry/Registries.java b/java/google/registry/model/registry/Registries.java
similarity index 100%
rename from java/com/google/domain/registry/model/registry/Registries.java
rename to java/google/registry/model/registry/Registries.java
diff --git a/java/com/google/domain/registry/model/registry/Registry.java b/java/google/registry/model/registry/Registry.java
similarity index 100%
rename from java/com/google/domain/registry/model/registry/Registry.java
rename to java/google/registry/model/registry/Registry.java
diff --git a/java/com/google/domain/registry/model/registry/RegistryCursor.java b/java/google/registry/model/registry/RegistryCursor.java
similarity index 100%
rename from java/com/google/domain/registry/model/registry/RegistryCursor.java
rename to java/google/registry/model/registry/RegistryCursor.java
diff --git a/java/com/google/domain/registry/model/registry/label/BaseDomainLabelList.java b/java/google/registry/model/registry/label/BaseDomainLabelList.java
similarity index 100%
rename from java/com/google/domain/registry/model/registry/label/BaseDomainLabelList.java
rename to java/google/registry/model/registry/label/BaseDomainLabelList.java
diff --git a/java/com/google/domain/registry/model/registry/label/DomainLabelEntry.java b/java/google/registry/model/registry/label/DomainLabelEntry.java
similarity index 100%
rename from java/com/google/domain/registry/model/registry/label/DomainLabelEntry.java
rename to java/google/registry/model/registry/label/DomainLabelEntry.java
diff --git a/java/com/google/domain/registry/model/registry/label/PremiumList.java b/java/google/registry/model/registry/label/PremiumList.java
similarity index 100%
rename from java/com/google/domain/registry/model/registry/label/PremiumList.java
rename to java/google/registry/model/registry/label/PremiumList.java
diff --git a/java/com/google/domain/registry/model/registry/label/ReservationType.java b/java/google/registry/model/registry/label/ReservationType.java
similarity index 100%
rename from java/com/google/domain/registry/model/registry/label/ReservationType.java
rename to java/google/registry/model/registry/label/ReservationType.java
diff --git a/java/com/google/domain/registry/model/registry/label/ReservedList.java b/java/google/registry/model/registry/label/ReservedList.java
similarity index 100%
rename from java/com/google/domain/registry/model/registry/label/ReservedList.java
rename to java/google/registry/model/registry/label/ReservedList.java
diff --git a/java/com/google/domain/registry/model/registry/label/package-info.java b/java/google/registry/model/registry/label/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/registry/label/package-info.java
rename to java/google/registry/model/registry/label/package-info.java
diff --git a/java/com/google/domain/registry/model/reporting/HistoryEntry.java b/java/google/registry/model/reporting/HistoryEntry.java
similarity index 100%
rename from java/com/google/domain/registry/model/reporting/HistoryEntry.java
rename to java/google/registry/model/reporting/HistoryEntry.java
diff --git a/java/com/google/domain/registry/model/server/Lock.java b/java/google/registry/model/server/Lock.java
similarity index 100%
rename from java/com/google/domain/registry/model/server/Lock.java
rename to java/google/registry/model/server/Lock.java
diff --git a/java/com/google/domain/registry/model/server/ServerSecret.java b/java/google/registry/model/server/ServerSecret.java
similarity index 100%
rename from java/com/google/domain/registry/model/server/ServerSecret.java
rename to java/google/registry/model/server/ServerSecret.java
diff --git a/java/com/google/domain/registry/model/smd/AbstractSignedMark.java b/java/google/registry/model/smd/AbstractSignedMark.java
similarity index 100%
rename from java/com/google/domain/registry/model/smd/AbstractSignedMark.java
rename to java/google/registry/model/smd/AbstractSignedMark.java
diff --git a/java/com/google/domain/registry/model/smd/EncodedSignedMark.java b/java/google/registry/model/smd/EncodedSignedMark.java
similarity index 100%
rename from java/com/google/domain/registry/model/smd/EncodedSignedMark.java
rename to java/google/registry/model/smd/EncodedSignedMark.java
diff --git a/java/com/google/domain/registry/model/smd/IssuerInfo.java b/java/google/registry/model/smd/IssuerInfo.java
similarity index 100%
rename from java/com/google/domain/registry/model/smd/IssuerInfo.java
rename to java/google/registry/model/smd/IssuerInfo.java
diff --git a/java/com/google/domain/registry/model/smd/RemoveWhitespaceTextAdapter.java b/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java
similarity index 100%
rename from java/com/google/domain/registry/model/smd/RemoveWhitespaceTextAdapter.java
rename to java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java
diff --git a/java/com/google/domain/registry/model/smd/SignedMark.java b/java/google/registry/model/smd/SignedMark.java
similarity index 100%
rename from java/com/google/domain/registry/model/smd/SignedMark.java
rename to java/google/registry/model/smd/SignedMark.java
diff --git a/java/com/google/domain/registry/model/smd/SignedMarkRevocationList.java b/java/google/registry/model/smd/SignedMarkRevocationList.java
similarity index 100%
rename from java/com/google/domain/registry/model/smd/SignedMarkRevocationList.java
rename to java/google/registry/model/smd/SignedMarkRevocationList.java
diff --git a/java/com/google/domain/registry/model/smd/package-info.java b/java/google/registry/model/smd/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/smd/package-info.java
rename to java/google/registry/model/smd/package-info.java
diff --git a/java/com/google/domain/registry/model/tmch/ClaimsListShard.java b/java/google/registry/model/tmch/ClaimsListShard.java
similarity index 100%
rename from java/com/google/domain/registry/model/tmch/ClaimsListShard.java
rename to java/google/registry/model/tmch/ClaimsListShard.java
diff --git a/java/com/google/domain/registry/model/tmch/TmchCrl.java b/java/google/registry/model/tmch/TmchCrl.java
similarity index 100%
rename from java/com/google/domain/registry/model/tmch/TmchCrl.java
rename to java/google/registry/model/tmch/TmchCrl.java
diff --git a/java/com/google/domain/registry/model/transfer/BaseTransferObject.java b/java/google/registry/model/transfer/BaseTransferObject.java
similarity index 100%
rename from java/com/google/domain/registry/model/transfer/BaseTransferObject.java
rename to java/google/registry/model/transfer/BaseTransferObject.java
diff --git a/java/com/google/domain/registry/model/transfer/TransferData.java b/java/google/registry/model/transfer/TransferData.java
similarity index 100%
rename from java/com/google/domain/registry/model/transfer/TransferData.java
rename to java/google/registry/model/transfer/TransferData.java
diff --git a/java/com/google/domain/registry/model/transfer/TransferResponse.java b/java/google/registry/model/transfer/TransferResponse.java
similarity index 100%
rename from java/com/google/domain/registry/model/transfer/TransferResponse.java
rename to java/google/registry/model/transfer/TransferResponse.java
diff --git a/java/com/google/domain/registry/model/transfer/TransferStatus.java b/java/google/registry/model/transfer/TransferStatus.java
similarity index 100%
rename from java/com/google/domain/registry/model/transfer/TransferStatus.java
rename to java/google/registry/model/transfer/TransferStatus.java
diff --git a/java/com/google/domain/registry/model/transfer/package-info.java b/java/google/registry/model/transfer/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/model/transfer/package-info.java
rename to java/google/registry/model/transfer/package-info.java
diff --git a/java/com/google/domain/registry/model/translators/AbstractSimpleTranslatorFactory.java b/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/AbstractSimpleTranslatorFactory.java
rename to java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java
diff --git a/java/com/google/domain/registry/model/translators/CidrAddressBlockTranslatorFactory.java b/java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/CidrAddressBlockTranslatorFactory.java
rename to java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java
diff --git a/java/com/google/domain/registry/model/translators/CommitLogRevisionsTranslatorFactory.java b/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/CommitLogRevisionsTranslatorFactory.java
rename to java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java
diff --git a/java/com/google/domain/registry/model/translators/CreateAutoTimestampTranslatorFactory.java b/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/CreateAutoTimestampTranslatorFactory.java
rename to java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java
diff --git a/java/com/google/domain/registry/model/translators/CurrencyUnitAdapter.java b/java/google/registry/model/translators/CurrencyUnitAdapter.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/CurrencyUnitAdapter.java
rename to java/google/registry/model/translators/CurrencyUnitAdapter.java
diff --git a/java/com/google/domain/registry/model/translators/CurrencyUnitTranslatorFactory.java b/java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/CurrencyUnitTranslatorFactory.java
rename to java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java
diff --git a/java/com/google/domain/registry/model/translators/DurationTranslatorFactory.java b/java/google/registry/model/translators/DurationTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/DurationTranslatorFactory.java
rename to java/google/registry/model/translators/DurationTranslatorFactory.java
diff --git a/java/com/google/domain/registry/model/translators/EnumToAttributeAdapter.java b/java/google/registry/model/translators/EnumToAttributeAdapter.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/EnumToAttributeAdapter.java
rename to java/google/registry/model/translators/EnumToAttributeAdapter.java
diff --git a/java/com/google/domain/registry/model/translators/ImmutableSortedMapTranslatorFactory.java b/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/ImmutableSortedMapTranslatorFactory.java
rename to java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java
diff --git a/java/com/google/domain/registry/model/translators/InetAddressTranslatorFactory.java b/java/google/registry/model/translators/InetAddressTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/InetAddressTranslatorFactory.java
rename to java/google/registry/model/translators/InetAddressTranslatorFactory.java
diff --git a/java/com/google/domain/registry/model/translators/ReadableInstantUtcTranslatorFactory.java b/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/ReadableInstantUtcTranslatorFactory.java
rename to java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java
diff --git a/java/com/google/domain/registry/model/translators/StatusValueAdapter.java b/java/google/registry/model/translators/StatusValueAdapter.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/StatusValueAdapter.java
rename to java/google/registry/model/translators/StatusValueAdapter.java
diff --git a/java/com/google/domain/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java b/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java
similarity index 100%
rename from java/com/google/domain/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java
rename to java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java
diff --git a/java/com/google/domain/registry/module/backend/BUILD b/java/google/registry/module/backend/BUILD
similarity index 100%
rename from java/com/google/domain/registry/module/backend/BUILD
rename to java/google/registry/module/backend/BUILD
diff --git a/java/com/google/domain/registry/module/backend/BackendComponent.java b/java/google/registry/module/backend/BackendComponent.java
similarity index 100%
rename from java/com/google/domain/registry/module/backend/BackendComponent.java
rename to java/google/registry/module/backend/BackendComponent.java
diff --git a/java/com/google/domain/registry/module/backend/BackendModule.java b/java/google/registry/module/backend/BackendModule.java
similarity index 100%
rename from java/com/google/domain/registry/module/backend/BackendModule.java
rename to java/google/registry/module/backend/BackendModule.java
diff --git a/java/com/google/domain/registry/module/backend/BackendRequestComponent.java b/java/google/registry/module/backend/BackendRequestComponent.java
similarity index 100%
rename from java/com/google/domain/registry/module/backend/BackendRequestComponent.java
rename to java/google/registry/module/backend/BackendRequestComponent.java
diff --git a/java/com/google/domain/registry/module/backend/BackendServlet.java b/java/google/registry/module/backend/BackendServlet.java
similarity index 100%
rename from java/com/google/domain/registry/module/backend/BackendServlet.java
rename to java/google/registry/module/backend/BackendServlet.java
diff --git a/java/com/google/domain/registry/module/backend/package-info.java b/java/google/registry/module/backend/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/module/backend/package-info.java
rename to java/google/registry/module/backend/package-info.java
diff --git a/java/com/google/domain/registry/module/frontend/BUILD b/java/google/registry/module/frontend/BUILD
similarity index 100%
rename from java/com/google/domain/registry/module/frontend/BUILD
rename to java/google/registry/module/frontend/BUILD
diff --git a/java/com/google/domain/registry/module/frontend/FrontendComponent.java b/java/google/registry/module/frontend/FrontendComponent.java
similarity index 100%
rename from java/com/google/domain/registry/module/frontend/FrontendComponent.java
rename to java/google/registry/module/frontend/FrontendComponent.java
diff --git a/java/com/google/domain/registry/module/frontend/FrontendRequestComponent.java b/java/google/registry/module/frontend/FrontendRequestComponent.java
similarity index 100%
rename from java/com/google/domain/registry/module/frontend/FrontendRequestComponent.java
rename to java/google/registry/module/frontend/FrontendRequestComponent.java
diff --git a/java/com/google/domain/registry/module/frontend/FrontendServlet.java b/java/google/registry/module/frontend/FrontendServlet.java
similarity index 100%
rename from java/com/google/domain/registry/module/frontend/FrontendServlet.java
rename to java/google/registry/module/frontend/FrontendServlet.java
diff --git a/java/com/google/domain/registry/module/frontend/package-info.java b/java/google/registry/module/frontend/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/module/frontend/package-info.java
rename to java/google/registry/module/frontend/package-info.java
diff --git a/java/com/google/domain/registry/module/tools/BUILD b/java/google/registry/module/tools/BUILD
similarity index 100%
rename from java/com/google/domain/registry/module/tools/BUILD
rename to java/google/registry/module/tools/BUILD
diff --git a/java/com/google/domain/registry/module/tools/ToolsComponent.java b/java/google/registry/module/tools/ToolsComponent.java
similarity index 100%
rename from java/com/google/domain/registry/module/tools/ToolsComponent.java
rename to java/google/registry/module/tools/ToolsComponent.java
diff --git a/java/com/google/domain/registry/module/tools/ToolsRequestComponent.java b/java/google/registry/module/tools/ToolsRequestComponent.java
similarity index 100%
rename from java/com/google/domain/registry/module/tools/ToolsRequestComponent.java
rename to java/google/registry/module/tools/ToolsRequestComponent.java
diff --git a/java/com/google/domain/registry/module/tools/ToolsServlet.java b/java/google/registry/module/tools/ToolsServlet.java
similarity index 100%
rename from java/com/google/domain/registry/module/tools/ToolsServlet.java
rename to java/google/registry/module/tools/ToolsServlet.java
diff --git a/java/com/google/domain/registry/monitoring/whitebox/BUILD b/java/google/registry/monitoring/whitebox/BUILD
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/BUILD
rename to java/google/registry/monitoring/whitebox/BUILD
diff --git a/java/com/google/domain/registry/monitoring/whitebox/EntityIntegrityAlertsSchema.java b/java/google/registry/monitoring/whitebox/EntityIntegrityAlertsSchema.java
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/EntityIntegrityAlertsSchema.java
rename to java/google/registry/monitoring/whitebox/EntityIntegrityAlertsSchema.java
diff --git a/java/com/google/domain/registry/monitoring/whitebox/EppMetrics.java b/java/google/registry/monitoring/whitebox/EppMetrics.java
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/EppMetrics.java
rename to java/google/registry/monitoring/whitebox/EppMetrics.java
diff --git a/java/com/google/domain/registry/monitoring/whitebox/Metrics.java b/java/google/registry/monitoring/whitebox/Metrics.java
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/Metrics.java
rename to java/google/registry/monitoring/whitebox/Metrics.java
diff --git a/java/com/google/domain/registry/monitoring/whitebox/MetricsExportAction.java b/java/google/registry/monitoring/whitebox/MetricsExportAction.java
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/MetricsExportAction.java
rename to java/google/registry/monitoring/whitebox/MetricsExportAction.java
diff --git a/java/com/google/domain/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java
rename to java/google/registry/monitoring/whitebox/VerifyEntityIntegrityAction.java
diff --git a/java/com/google/domain/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java b/java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java
rename to java/google/registry/monitoring/whitebox/VerifyEntityIntegrityStreamer.java
diff --git a/java/com/google/domain/registry/monitoring/whitebox/WhiteboxComponent.java b/java/google/registry/monitoring/whitebox/WhiteboxComponent.java
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/WhiteboxComponent.java
rename to java/google/registry/monitoring/whitebox/WhiteboxComponent.java
diff --git a/java/com/google/domain/registry/monitoring/whitebox/WhiteboxModule.java b/java/google/registry/monitoring/whitebox/WhiteboxModule.java
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/WhiteboxModule.java
rename to java/google/registry/monitoring/whitebox/WhiteboxModule.java
diff --git a/java/com/google/domain/registry/monitoring/whitebox/package-info.java b/java/google/registry/monitoring/whitebox/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/monitoring/whitebox/package-info.java
rename to java/google/registry/monitoring/whitebox/package-info.java
diff --git a/java/com/google/domain/registry/rdap/BUILD b/java/google/registry/rdap/BUILD
similarity index 100%
rename from java/com/google/domain/registry/rdap/BUILD
rename to java/google/registry/rdap/BUILD
diff --git a/java/com/google/domain/registry/rdap/RdapActionBase.java b/java/google/registry/rdap/RdapActionBase.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapActionBase.java
rename to java/google/registry/rdap/RdapActionBase.java
diff --git a/java/com/google/domain/registry/rdap/RdapAutnumAction.java b/java/google/registry/rdap/RdapAutnumAction.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapAutnumAction.java
rename to java/google/registry/rdap/RdapAutnumAction.java
diff --git a/java/com/google/domain/registry/rdap/RdapDomainAction.java b/java/google/registry/rdap/RdapDomainAction.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapDomainAction.java
rename to java/google/registry/rdap/RdapDomainAction.java
diff --git a/java/com/google/domain/registry/rdap/RdapDomainSearchAction.java b/java/google/registry/rdap/RdapDomainSearchAction.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapDomainSearchAction.java
rename to java/google/registry/rdap/RdapDomainSearchAction.java
diff --git a/java/com/google/domain/registry/rdap/RdapEntityAction.java b/java/google/registry/rdap/RdapEntityAction.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapEntityAction.java
rename to java/google/registry/rdap/RdapEntityAction.java
diff --git a/java/com/google/domain/registry/rdap/RdapEntitySearchAction.java b/java/google/registry/rdap/RdapEntitySearchAction.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapEntitySearchAction.java
rename to java/google/registry/rdap/RdapEntitySearchAction.java
diff --git a/java/com/google/domain/registry/rdap/RdapHelpAction.java b/java/google/registry/rdap/RdapHelpAction.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapHelpAction.java
rename to java/google/registry/rdap/RdapHelpAction.java
diff --git a/java/com/google/domain/registry/rdap/RdapIcannStandardInformation.java b/java/google/registry/rdap/RdapIcannStandardInformation.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapIcannStandardInformation.java
rename to java/google/registry/rdap/RdapIcannStandardInformation.java
diff --git a/java/com/google/domain/registry/rdap/RdapIpAction.java b/java/google/registry/rdap/RdapIpAction.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapIpAction.java
rename to java/google/registry/rdap/RdapIpAction.java
diff --git a/java/com/google/domain/registry/rdap/RdapJsonFormatter.java b/java/google/registry/rdap/RdapJsonFormatter.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapJsonFormatter.java
rename to java/google/registry/rdap/RdapJsonFormatter.java
diff --git a/java/com/google/domain/registry/rdap/RdapModule.java b/java/google/registry/rdap/RdapModule.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapModule.java
rename to java/google/registry/rdap/RdapModule.java
diff --git a/java/com/google/domain/registry/rdap/RdapNameserverAction.java b/java/google/registry/rdap/RdapNameserverAction.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapNameserverAction.java
rename to java/google/registry/rdap/RdapNameserverAction.java
diff --git a/java/com/google/domain/registry/rdap/RdapNameserverSearchAction.java b/java/google/registry/rdap/RdapNameserverSearchAction.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapNameserverSearchAction.java
rename to java/google/registry/rdap/RdapNameserverSearchAction.java
diff --git a/java/com/google/domain/registry/rdap/RdapSearchPattern.java b/java/google/registry/rdap/RdapSearchPattern.java
similarity index 100%
rename from java/com/google/domain/registry/rdap/RdapSearchPattern.java
rename to java/google/registry/rdap/RdapSearchPattern.java
diff --git a/java/com/google/domain/registry/rde/BUILD b/java/google/registry/rde/BUILD
similarity index 100%
rename from java/com/google/domain/registry/rde/BUILD
rename to java/google/registry/rde/BUILD
diff --git a/java/com/google/domain/registry/rde/BrdaCopyAction.java b/java/google/registry/rde/BrdaCopyAction.java
similarity index 100%
rename from java/com/google/domain/registry/rde/BrdaCopyAction.java
rename to java/google/registry/rde/BrdaCopyAction.java
diff --git a/java/com/google/domain/registry/rde/ContactResourceToXjcConverter.java b/java/google/registry/rde/ContactResourceToXjcConverter.java
similarity index 100%
rename from java/com/google/domain/registry/rde/ContactResourceToXjcConverter.java
rename to java/google/registry/rde/ContactResourceToXjcConverter.java
diff --git a/java/com/google/domain/registry/rde/DepositFragment.java b/java/google/registry/rde/DepositFragment.java
similarity index 100%
rename from java/com/google/domain/registry/rde/DepositFragment.java
rename to java/google/registry/rde/DepositFragment.java
diff --git a/java/com/google/domain/registry/rde/DomainResourceToXjcConverter.java b/java/google/registry/rde/DomainResourceToXjcConverter.java
similarity index 100%
rename from java/com/google/domain/registry/rde/DomainResourceToXjcConverter.java
rename to java/google/registry/rde/DomainResourceToXjcConverter.java
diff --git a/java/com/google/domain/registry/rde/EscrowTaskRunner.java b/java/google/registry/rde/EscrowTaskRunner.java
similarity index 100%
rename from java/com/google/domain/registry/rde/EscrowTaskRunner.java
rename to java/google/registry/rde/EscrowTaskRunner.java
diff --git a/java/com/google/domain/registry/rde/Ghostryde.java b/java/google/registry/rde/Ghostryde.java
similarity index 100%
rename from java/com/google/domain/registry/rde/Ghostryde.java
rename to java/google/registry/rde/Ghostryde.java
diff --git a/java/com/google/domain/registry/rde/HostResourceToXjcConverter.java b/java/google/registry/rde/HostResourceToXjcConverter.java
similarity index 100%
rename from java/com/google/domain/registry/rde/HostResourceToXjcConverter.java
rename to java/google/registry/rde/HostResourceToXjcConverter.java
diff --git a/java/com/google/domain/registry/rde/JSchModule.java b/java/google/registry/rde/JSchModule.java
similarity index 100%
rename from java/com/google/domain/registry/rde/JSchModule.java
rename to java/google/registry/rde/JSchModule.java
diff --git a/java/com/google/domain/registry/rde/JSchSftpChannel.java b/java/google/registry/rde/JSchSftpChannel.java
similarity index 100%
rename from java/com/google/domain/registry/rde/JSchSftpChannel.java
rename to java/google/registry/rde/JSchSftpChannel.java
diff --git a/java/com/google/domain/registry/rde/JSchSshSession.java b/java/google/registry/rde/JSchSshSession.java
similarity index 100%
rename from java/com/google/domain/registry/rde/JSchSshSession.java
rename to java/google/registry/rde/JSchSshSession.java
diff --git a/java/com/google/domain/registry/rde/PendingDeposit.java b/java/google/registry/rde/PendingDeposit.java
similarity index 100%
rename from java/com/google/domain/registry/rde/PendingDeposit.java
rename to java/google/registry/rde/PendingDeposit.java
diff --git a/java/com/google/domain/registry/rde/PendingDepositChecker.java b/java/google/registry/rde/PendingDepositChecker.java
similarity index 100%
rename from java/com/google/domain/registry/rde/PendingDepositChecker.java
rename to java/google/registry/rde/PendingDepositChecker.java
diff --git a/java/com/google/domain/registry/rde/RdeAdapter.java b/java/google/registry/rde/RdeAdapter.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeAdapter.java
rename to java/google/registry/rde/RdeAdapter.java
diff --git a/java/com/google/domain/registry/rde/RdeCounter.java b/java/google/registry/rde/RdeCounter.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeCounter.java
rename to java/google/registry/rde/RdeCounter.java
diff --git a/java/com/google/domain/registry/rde/RdeMarshaller.java b/java/google/registry/rde/RdeMarshaller.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeMarshaller.java
rename to java/google/registry/rde/RdeMarshaller.java
diff --git a/java/com/google/domain/registry/rde/RdeModule.java b/java/google/registry/rde/RdeModule.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeModule.java
rename to java/google/registry/rde/RdeModule.java
diff --git a/java/com/google/domain/registry/rde/RdeReportAction.java b/java/google/registry/rde/RdeReportAction.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeReportAction.java
rename to java/google/registry/rde/RdeReportAction.java
diff --git a/java/com/google/domain/registry/rde/RdeReporter.java b/java/google/registry/rde/RdeReporter.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeReporter.java
rename to java/google/registry/rde/RdeReporter.java
diff --git a/java/com/google/domain/registry/rde/RdeResourceType.java b/java/google/registry/rde/RdeResourceType.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeResourceType.java
rename to java/google/registry/rde/RdeResourceType.java
diff --git a/java/com/google/domain/registry/rde/RdeStagingAction.java b/java/google/registry/rde/RdeStagingAction.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeStagingAction.java
rename to java/google/registry/rde/RdeStagingAction.java
diff --git a/java/com/google/domain/registry/rde/RdeStagingMapper.java b/java/google/registry/rde/RdeStagingMapper.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeStagingMapper.java
rename to java/google/registry/rde/RdeStagingMapper.java
diff --git a/java/com/google/domain/registry/rde/RdeStagingReducer.java b/java/google/registry/rde/RdeStagingReducer.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeStagingReducer.java
rename to java/google/registry/rde/RdeStagingReducer.java
diff --git a/java/com/google/domain/registry/rde/RdeUploadAction.java b/java/google/registry/rde/RdeUploadAction.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeUploadAction.java
rename to java/google/registry/rde/RdeUploadAction.java
diff --git a/java/com/google/domain/registry/rde/RdeUploadUrl.java b/java/google/registry/rde/RdeUploadUrl.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeUploadUrl.java
rename to java/google/registry/rde/RdeUploadUrl.java
diff --git a/java/com/google/domain/registry/rde/RdeUtil.java b/java/google/registry/rde/RdeUtil.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RdeUtil.java
rename to java/google/registry/rde/RdeUtil.java
diff --git a/java/com/google/domain/registry/rde/RegistrarToXjcConverter.java b/java/google/registry/rde/RegistrarToXjcConverter.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RegistrarToXjcConverter.java
rename to java/google/registry/rde/RegistrarToXjcConverter.java
diff --git a/java/com/google/domain/registry/rde/RydePgpCompressionOutputStream.java b/java/google/registry/rde/RydePgpCompressionOutputStream.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RydePgpCompressionOutputStream.java
rename to java/google/registry/rde/RydePgpCompressionOutputStream.java
diff --git a/java/com/google/domain/registry/rde/RydePgpEncryptionOutputStream.java b/java/google/registry/rde/RydePgpEncryptionOutputStream.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RydePgpEncryptionOutputStream.java
rename to java/google/registry/rde/RydePgpEncryptionOutputStream.java
diff --git a/java/com/google/domain/registry/rde/RydePgpFileOutputStream.java b/java/google/registry/rde/RydePgpFileOutputStream.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RydePgpFileOutputStream.java
rename to java/google/registry/rde/RydePgpFileOutputStream.java
diff --git a/java/com/google/domain/registry/rde/RydePgpSigningOutputStream.java b/java/google/registry/rde/RydePgpSigningOutputStream.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RydePgpSigningOutputStream.java
rename to java/google/registry/rde/RydePgpSigningOutputStream.java
diff --git a/java/com/google/domain/registry/rde/RydeTarOutputStream.java b/java/google/registry/rde/RydeTarOutputStream.java
similarity index 100%
rename from java/com/google/domain/registry/rde/RydeTarOutputStream.java
rename to java/google/registry/rde/RydeTarOutputStream.java
diff --git a/java/com/google/domain/registry/rde/package-info.java b/java/google/registry/rde/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/rde/package-info.java
rename to java/google/registry/rde/package-info.java
diff --git a/java/com/google/domain/registry/repositories.bzl b/java/google/registry/repositories.bzl
similarity index 100%
rename from java/com/google/domain/registry/repositories.bzl
rename to java/google/registry/repositories.bzl
diff --git a/java/com/google/domain/registry/request/Action.java b/java/google/registry/request/Action.java
similarity index 100%
rename from java/com/google/domain/registry/request/Action.java
rename to java/google/registry/request/Action.java
diff --git a/java/com/google/domain/registry/request/Actions.java b/java/google/registry/request/Actions.java
similarity index 100%
rename from java/com/google/domain/registry/request/Actions.java
rename to java/google/registry/request/Actions.java
diff --git a/java/com/google/domain/registry/request/BUILD b/java/google/registry/request/BUILD
similarity index 100%
rename from java/com/google/domain/registry/request/BUILD
rename to java/google/registry/request/BUILD
diff --git a/java/com/google/domain/registry/request/DelegatedOAuthScopes.java b/java/google/registry/request/DelegatedOAuthScopes.java
similarity index 100%
rename from java/com/google/domain/registry/request/DelegatedOAuthScopes.java
rename to java/google/registry/request/DelegatedOAuthScopes.java
diff --git a/java/com/google/domain/registry/request/Header.java b/java/google/registry/request/Header.java
similarity index 100%
rename from java/com/google/domain/registry/request/Header.java
rename to java/google/registry/request/Header.java
diff --git a/java/com/google/domain/registry/request/HttpException.java b/java/google/registry/request/HttpException.java
similarity index 100%
rename from java/com/google/domain/registry/request/HttpException.java
rename to java/google/registry/request/HttpException.java
diff --git a/java/com/google/domain/registry/request/JsonActionRunner.java b/java/google/registry/request/JsonActionRunner.java
similarity index 100%
rename from java/com/google/domain/registry/request/JsonActionRunner.java
rename to java/google/registry/request/JsonActionRunner.java
diff --git a/java/com/google/domain/registry/request/JsonPayload.java b/java/google/registry/request/JsonPayload.java
similarity index 100%
rename from java/com/google/domain/registry/request/JsonPayload.java
rename to java/google/registry/request/JsonPayload.java
diff --git a/java/com/google/domain/registry/request/JsonResponse.java b/java/google/registry/request/JsonResponse.java
similarity index 100%
rename from java/com/google/domain/registry/request/JsonResponse.java
rename to java/google/registry/request/JsonResponse.java
diff --git a/java/com/google/domain/registry/request/Modules.java b/java/google/registry/request/Modules.java
similarity index 100%
rename from java/com/google/domain/registry/request/Modules.java
rename to java/google/registry/request/Modules.java
diff --git a/java/com/google/domain/registry/request/OAuthScopes.java b/java/google/registry/request/OAuthScopes.java
similarity index 100%
rename from java/com/google/domain/registry/request/OAuthScopes.java
rename to java/google/registry/request/OAuthScopes.java
diff --git a/java/com/google/domain/registry/request/Parameter.java b/java/google/registry/request/Parameter.java
similarity index 100%
rename from java/com/google/domain/registry/request/Parameter.java
rename to java/google/registry/request/Parameter.java
diff --git a/java/com/google/domain/registry/request/ParameterMap.java b/java/google/registry/request/ParameterMap.java
similarity index 100%
rename from java/com/google/domain/registry/request/ParameterMap.java
rename to java/google/registry/request/ParameterMap.java
diff --git a/java/com/google/domain/registry/request/Payload.java b/java/google/registry/request/Payload.java
similarity index 100%
rename from java/com/google/domain/registry/request/Payload.java
rename to java/google/registry/request/Payload.java
diff --git a/java/com/google/domain/registry/request/RequestHandler.java b/java/google/registry/request/RequestHandler.java
similarity index 100%
rename from java/com/google/domain/registry/request/RequestHandler.java
rename to java/google/registry/request/RequestHandler.java
diff --git a/java/com/google/domain/registry/request/RequestMethod.java b/java/google/registry/request/RequestMethod.java
similarity index 100%
rename from java/com/google/domain/registry/request/RequestMethod.java
rename to java/google/registry/request/RequestMethod.java
diff --git a/java/com/google/domain/registry/request/RequestModule.java b/java/google/registry/request/RequestModule.java
similarity index 100%
rename from java/com/google/domain/registry/request/RequestModule.java
rename to java/google/registry/request/RequestModule.java
diff --git a/java/com/google/domain/registry/request/RequestParameters.java b/java/google/registry/request/RequestParameters.java
similarity index 100%
rename from java/com/google/domain/registry/request/RequestParameters.java
rename to java/google/registry/request/RequestParameters.java
diff --git a/java/com/google/domain/registry/request/RequestPath.java b/java/google/registry/request/RequestPath.java
similarity index 100%
rename from java/com/google/domain/registry/request/RequestPath.java
rename to java/google/registry/request/RequestPath.java
diff --git a/java/com/google/domain/registry/request/RequestScope.java b/java/google/registry/request/RequestScope.java
similarity index 100%
rename from java/com/google/domain/registry/request/RequestScope.java
rename to java/google/registry/request/RequestScope.java
diff --git a/java/com/google/domain/registry/request/Response.java b/java/google/registry/request/Response.java
similarity index 100%
rename from java/com/google/domain/registry/request/Response.java
rename to java/google/registry/request/Response.java
diff --git a/java/com/google/domain/registry/request/ResponseImpl.java b/java/google/registry/request/ResponseImpl.java
similarity index 100%
rename from java/com/google/domain/registry/request/ResponseImpl.java
rename to java/google/registry/request/ResponseImpl.java
diff --git a/java/com/google/domain/registry/request/Route.java b/java/google/registry/request/Route.java
similarity index 100%
rename from java/com/google/domain/registry/request/Route.java
rename to java/google/registry/request/Route.java
diff --git a/java/com/google/domain/registry/request/Router.java b/java/google/registry/request/Router.java
similarity index 100%
rename from java/com/google/domain/registry/request/Router.java
rename to java/google/registry/request/Router.java
diff --git a/java/com/google/domain/registry/request/ServletDelegate.java b/java/google/registry/request/ServletDelegate.java
similarity index 100%
rename from java/com/google/domain/registry/request/ServletDelegate.java
rename to java/google/registry/request/ServletDelegate.java
diff --git a/java/com/google/domain/registry/request/package-info.java b/java/google/registry/request/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/request/package-info.java
rename to java/google/registry/request/package-info.java
diff --git a/java/com/google/domain/registry/security/BUILD b/java/google/registry/security/BUILD
similarity index 100%
rename from java/com/google/domain/registry/security/BUILD
rename to java/google/registry/security/BUILD
diff --git a/java/com/google/domain/registry/security/JsonHttp.java b/java/google/registry/security/JsonHttp.java
similarity index 100%
rename from java/com/google/domain/registry/security/JsonHttp.java
rename to java/google/registry/security/JsonHttp.java
diff --git a/java/com/google/domain/registry/security/JsonResponseHelper.java b/java/google/registry/security/JsonResponseHelper.java
similarity index 100%
rename from java/com/google/domain/registry/security/JsonResponseHelper.java
rename to java/google/registry/security/JsonResponseHelper.java
diff --git a/java/com/google/domain/registry/security/JsonTransportServlet.java b/java/google/registry/security/JsonTransportServlet.java
similarity index 100%
rename from java/com/google/domain/registry/security/JsonTransportServlet.java
rename to java/google/registry/security/JsonTransportServlet.java
diff --git a/java/com/google/domain/registry/security/XsrfProtectedServlet.java b/java/google/registry/security/XsrfProtectedServlet.java
similarity index 100%
rename from java/com/google/domain/registry/security/XsrfProtectedServlet.java
rename to java/google/registry/security/XsrfProtectedServlet.java
diff --git a/java/com/google/domain/registry/security/XsrfTokenManager.java b/java/google/registry/security/XsrfTokenManager.java
similarity index 100%
rename from java/com/google/domain/registry/security/XsrfTokenManager.java
rename to java/google/registry/security/XsrfTokenManager.java
diff --git a/java/com/google/domain/registry/security/package-info.java b/java/google/registry/security/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/security/package-info.java
rename to java/google/registry/security/package-info.java
diff --git a/java/com/google/domain/registry/storage/drive/BUILD b/java/google/registry/storage/drive/BUILD
similarity index 100%
rename from java/com/google/domain/registry/storage/drive/BUILD
rename to java/google/registry/storage/drive/BUILD
diff --git a/java/com/google/domain/registry/storage/drive/DriveConnection.java b/java/google/registry/storage/drive/DriveConnection.java
similarity index 100%
rename from java/com/google/domain/registry/storage/drive/DriveConnection.java
rename to java/google/registry/storage/drive/DriveConnection.java
diff --git a/java/com/google/domain/registry/tldconfig/idn/BUILD b/java/google/registry/tldconfig/idn/BUILD
similarity index 100%
rename from java/com/google/domain/registry/tldconfig/idn/BUILD
rename to java/google/registry/tldconfig/idn/BUILD
diff --git a/java/com/google/domain/registry/tldconfig/idn/IdnLabelValidator.java b/java/google/registry/tldconfig/idn/IdnLabelValidator.java
similarity index 100%
rename from java/com/google/domain/registry/tldconfig/idn/IdnLabelValidator.java
rename to java/google/registry/tldconfig/idn/IdnLabelValidator.java
diff --git a/java/com/google/domain/registry/tldconfig/idn/IdnTable.java b/java/google/registry/tldconfig/idn/IdnTable.java
similarity index 100%
rename from java/com/google/domain/registry/tldconfig/idn/IdnTable.java
rename to java/google/registry/tldconfig/idn/IdnTable.java
diff --git a/java/com/google/domain/registry/tldconfig/idn/IdnTableEnum.java b/java/google/registry/tldconfig/idn/IdnTableEnum.java
similarity index 100%
rename from java/com/google/domain/registry/tldconfig/idn/IdnTableEnum.java
rename to java/google/registry/tldconfig/idn/IdnTableEnum.java
diff --git a/java/com/google/domain/registry/tldconfig/idn/JapaneseLanguageValidator.java b/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java
similarity index 100%
rename from java/com/google/domain/registry/tldconfig/idn/JapaneseLanguageValidator.java
rename to java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java
diff --git a/java/com/google/domain/registry/tldconfig/idn/LanguageValidator.java b/java/google/registry/tldconfig/idn/LanguageValidator.java
similarity index 100%
rename from java/com/google/domain/registry/tldconfig/idn/LanguageValidator.java
rename to java/google/registry/tldconfig/idn/LanguageValidator.java
diff --git a/java/com/google/domain/registry/tldconfig/idn/extended_latin.txt b/java/google/registry/tldconfig/idn/extended_latin.txt
similarity index 100%
rename from java/com/google/domain/registry/tldconfig/idn/extended_latin.txt
rename to java/google/registry/tldconfig/idn/extended_latin.txt
diff --git a/java/com/google/domain/registry/tldconfig/idn/ja.txt b/java/google/registry/tldconfig/idn/ja.txt
similarity index 100%
rename from java/com/google/domain/registry/tldconfig/idn/ja.txt
rename to java/google/registry/tldconfig/idn/ja.txt
diff --git a/java/com/google/domain/registry/tmch/BUILD b/java/google/registry/tmch/BUILD
similarity index 100%
rename from java/com/google/domain/registry/tmch/BUILD
rename to java/google/registry/tmch/BUILD
diff --git a/java/com/google/domain/registry/tmch/ClaimsListParser.java b/java/google/registry/tmch/ClaimsListParser.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/ClaimsListParser.java
rename to java/google/registry/tmch/ClaimsListParser.java
diff --git a/java/com/google/domain/registry/tmch/LordnLog.java b/java/google/registry/tmch/LordnLog.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/LordnLog.java
rename to java/google/registry/tmch/LordnLog.java
diff --git a/java/com/google/domain/registry/tmch/LordnRequestInitializer.java b/java/google/registry/tmch/LordnRequestInitializer.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/LordnRequestInitializer.java
rename to java/google/registry/tmch/LordnRequestInitializer.java
diff --git a/java/com/google/domain/registry/tmch/LordnTask.java b/java/google/registry/tmch/LordnTask.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/LordnTask.java
rename to java/google/registry/tmch/LordnTask.java
diff --git a/java/com/google/domain/registry/tmch/Marksdb.java b/java/google/registry/tmch/Marksdb.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/Marksdb.java
rename to java/google/registry/tmch/Marksdb.java
diff --git a/java/com/google/domain/registry/tmch/NordnUploadAction.java b/java/google/registry/tmch/NordnUploadAction.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/NordnUploadAction.java
rename to java/google/registry/tmch/NordnUploadAction.java
diff --git a/java/com/google/domain/registry/tmch/NordnVerifyAction.java b/java/google/registry/tmch/NordnVerifyAction.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/NordnVerifyAction.java
rename to java/google/registry/tmch/NordnVerifyAction.java
diff --git a/java/com/google/domain/registry/tmch/SmdrlCsvParser.java b/java/google/registry/tmch/SmdrlCsvParser.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/SmdrlCsvParser.java
rename to java/google/registry/tmch/SmdrlCsvParser.java
diff --git a/java/com/google/domain/registry/tmch/TmchCertificateAuthority.java b/java/google/registry/tmch/TmchCertificateAuthority.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/TmchCertificateAuthority.java
rename to java/google/registry/tmch/TmchCertificateAuthority.java
diff --git a/java/com/google/domain/registry/tmch/TmchCrlAction.java b/java/google/registry/tmch/TmchCrlAction.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/TmchCrlAction.java
rename to java/google/registry/tmch/TmchCrlAction.java
diff --git a/java/com/google/domain/registry/tmch/TmchData.java b/java/google/registry/tmch/TmchData.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/TmchData.java
rename to java/google/registry/tmch/TmchData.java
diff --git a/java/com/google/domain/registry/tmch/TmchDnlAction.java b/java/google/registry/tmch/TmchDnlAction.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/TmchDnlAction.java
rename to java/google/registry/tmch/TmchDnlAction.java
diff --git a/java/com/google/domain/registry/tmch/TmchModule.java b/java/google/registry/tmch/TmchModule.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/TmchModule.java
rename to java/google/registry/tmch/TmchModule.java
diff --git a/java/com/google/domain/registry/tmch/TmchSmdrlAction.java b/java/google/registry/tmch/TmchSmdrlAction.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/TmchSmdrlAction.java
rename to java/google/registry/tmch/TmchSmdrlAction.java
diff --git a/java/com/google/domain/registry/tmch/TmchXmlSignature.java b/java/google/registry/tmch/TmchXmlSignature.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/TmchXmlSignature.java
rename to java/google/registry/tmch/TmchXmlSignature.java
diff --git a/java/com/google/domain/registry/tmch/icann-tmch-test.crl b/java/google/registry/tmch/icann-tmch-test.crl
similarity index 100%
rename from java/com/google/domain/registry/tmch/icann-tmch-test.crl
rename to java/google/registry/tmch/icann-tmch-test.crl
diff --git a/java/com/google/domain/registry/tmch/icann-tmch-test.crt b/java/google/registry/tmch/icann-tmch-test.crt
similarity index 100%
rename from java/com/google/domain/registry/tmch/icann-tmch-test.crt
rename to java/google/registry/tmch/icann-tmch-test.crt
diff --git a/java/com/google/domain/registry/tmch/icann-tmch.crl b/java/google/registry/tmch/icann-tmch.crl
similarity index 100%
rename from java/com/google/domain/registry/tmch/icann-tmch.crl
rename to java/google/registry/tmch/icann-tmch.crl
diff --git a/java/com/google/domain/registry/tmch/icann-tmch.crt b/java/google/registry/tmch/icann-tmch.crt
similarity index 100%
rename from java/com/google/domain/registry/tmch/icann-tmch.crt
rename to java/google/registry/tmch/icann-tmch.crt
diff --git a/java/com/google/domain/registry/tmch/marksdb-public-key.asc b/java/google/registry/tmch/marksdb-public-key.asc
similarity index 100%
rename from java/com/google/domain/registry/tmch/marksdb-public-key.asc
rename to java/google/registry/tmch/marksdb-public-key.asc
diff --git a/java/com/google/domain/registry/tmch/package-info.java b/java/google/registry/tmch/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/tmch/package-info.java
rename to java/google/registry/tmch/package-info.java
diff --git a/java/com/google/domain/registry/tools/AllocateDomainCommand.java b/java/google/registry/tools/AllocateDomainCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/AllocateDomainCommand.java
rename to java/google/registry/tools/AllocateDomainCommand.java
diff --git a/java/com/google/domain/registry/tools/AppEngineConnection.java b/java/google/registry/tools/AppEngineConnection.java
similarity index 100%
rename from java/com/google/domain/registry/tools/AppEngineConnection.java
rename to java/google/registry/tools/AppEngineConnection.java
diff --git a/java/com/google/domain/registry/tools/AuctionStatusCommand.java b/java/google/registry/tools/AuctionStatusCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/AuctionStatusCommand.java
rename to java/google/registry/tools/AuctionStatusCommand.java
diff --git a/java/com/google/domain/registry/tools/BUILD b/java/google/registry/tools/BUILD
similarity index 100%
rename from java/com/google/domain/registry/tools/BUILD
rename to java/google/registry/tools/BUILD
diff --git a/java/com/google/domain/registry/tools/BigqueryCommand.java b/java/google/registry/tools/BigqueryCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/BigqueryCommand.java
rename to java/google/registry/tools/BigqueryCommand.java
diff --git a/java/com/google/domain/registry/tools/BigqueryCommandUtilities.java b/java/google/registry/tools/BigqueryCommandUtilities.java
similarity index 100%
rename from java/com/google/domain/registry/tools/BigqueryCommandUtilities.java
rename to java/google/registry/tools/BigqueryCommandUtilities.java
diff --git a/java/com/google/domain/registry/tools/BigqueryParameters.java b/java/google/registry/tools/BigqueryParameters.java
similarity index 100%
rename from java/com/google/domain/registry/tools/BigqueryParameters.java
rename to java/google/registry/tools/BigqueryParameters.java
diff --git a/java/com/google/domain/registry/tools/CanonicalizeLabelsCommand.java b/java/google/registry/tools/CanonicalizeLabelsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CanonicalizeLabelsCommand.java
rename to java/google/registry/tools/CanonicalizeLabelsCommand.java
diff --git a/java/com/google/domain/registry/tools/CheckSnapshotCommand.java b/java/google/registry/tools/CheckSnapshotCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CheckSnapshotCommand.java
rename to java/google/registry/tools/CheckSnapshotCommand.java
diff --git a/java/com/google/domain/registry/tools/Command.java b/java/google/registry/tools/Command.java
similarity index 100%
rename from java/com/google/domain/registry/tools/Command.java
rename to java/google/registry/tools/Command.java
diff --git a/java/com/google/domain/registry/tools/CommandUtilities.java b/java/google/registry/tools/CommandUtilities.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CommandUtilities.java
rename to java/google/registry/tools/CommandUtilities.java
diff --git a/java/com/google/domain/registry/tools/ConfirmingCommand.java b/java/google/registry/tools/ConfirmingCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ConfirmingCommand.java
rename to java/google/registry/tools/ConfirmingCommand.java
diff --git a/java/com/google/domain/registry/tools/ConvertIdnCommand.java b/java/google/registry/tools/ConvertIdnCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ConvertIdnCommand.java
rename to java/google/registry/tools/ConvertIdnCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateAnchorTenantCommand.java b/java/google/registry/tools/CreateAnchorTenantCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateAnchorTenantCommand.java
rename to java/google/registry/tools/CreateAnchorTenantCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateAuctionCreditsCommand.java b/java/google/registry/tools/CreateAuctionCreditsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateAuctionCreditsCommand.java
rename to java/google/registry/tools/CreateAuctionCreditsCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateContactCommand.java b/java/google/registry/tools/CreateContactCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateContactCommand.java
rename to java/google/registry/tools/CreateContactCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateCreditBalanceCommand.java b/java/google/registry/tools/CreateCreditBalanceCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateCreditBalanceCommand.java
rename to java/google/registry/tools/CreateCreditBalanceCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateCreditCommand.java b/java/google/registry/tools/CreateCreditCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateCreditCommand.java
rename to java/google/registry/tools/CreateCreditCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateOrUpdatePremiumListCommand.java b/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateOrUpdatePremiumListCommand.java
rename to java/google/registry/tools/CreateOrUpdatePremiumListCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateOrUpdateRegistrarCommand.java b/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateOrUpdateRegistrarCommand.java
rename to java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateOrUpdateReservedListCommand.java b/java/google/registry/tools/CreateOrUpdateReservedListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateOrUpdateReservedListCommand.java
rename to java/google/registry/tools/CreateOrUpdateReservedListCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateOrUpdateTldCommand.java b/java/google/registry/tools/CreateOrUpdateTldCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateOrUpdateTldCommand.java
rename to java/google/registry/tools/CreateOrUpdateTldCommand.java
diff --git a/java/com/google/domain/registry/tools/CreatePremiumListCommand.java b/java/google/registry/tools/CreatePremiumListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreatePremiumListCommand.java
rename to java/google/registry/tools/CreatePremiumListCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateRegistrarCommand.java b/java/google/registry/tools/CreateRegistrarCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateRegistrarCommand.java
rename to java/google/registry/tools/CreateRegistrarCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateRegistrarGroupsCommand.java b/java/google/registry/tools/CreateRegistrarGroupsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateRegistrarGroupsCommand.java
rename to java/google/registry/tools/CreateRegistrarGroupsCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateReservedListCommand.java b/java/google/registry/tools/CreateReservedListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateReservedListCommand.java
rename to java/google/registry/tools/CreateReservedListCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateSandboxTldCommand.java b/java/google/registry/tools/CreateSandboxTldCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateSandboxTldCommand.java
rename to java/google/registry/tools/CreateSandboxTldCommand.java
diff --git a/java/com/google/domain/registry/tools/CreateTldCommand.java b/java/google/registry/tools/CreateTldCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/CreateTldCommand.java
rename to java/google/registry/tools/CreateTldCommand.java
diff --git a/java/com/google/domain/registry/tools/DeleteCreditCommand.java b/java/google/registry/tools/DeleteCreditCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DeleteCreditCommand.java
rename to java/google/registry/tools/DeleteCreditCommand.java
diff --git a/java/com/google/domain/registry/tools/DeleteDomainCommand.java b/java/google/registry/tools/DeleteDomainCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DeleteDomainCommand.java
rename to java/google/registry/tools/DeleteDomainCommand.java
diff --git a/java/com/google/domain/registry/tools/DeleteEntityCommand.java b/java/google/registry/tools/DeleteEntityCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DeleteEntityCommand.java
rename to java/google/registry/tools/DeleteEntityCommand.java
diff --git a/java/com/google/domain/registry/tools/DeleteEppResourceCommand.java b/java/google/registry/tools/DeleteEppResourceCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DeleteEppResourceCommand.java
rename to java/google/registry/tools/DeleteEppResourceCommand.java
diff --git a/java/com/google/domain/registry/tools/DeletePremiumListCommand.java b/java/google/registry/tools/DeletePremiumListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DeletePremiumListCommand.java
rename to java/google/registry/tools/DeletePremiumListCommand.java
diff --git a/java/com/google/domain/registry/tools/DeleteReservedListCommand.java b/java/google/registry/tools/DeleteReservedListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DeleteReservedListCommand.java
rename to java/google/registry/tools/DeleteReservedListCommand.java
diff --git a/java/com/google/domain/registry/tools/DomainApplicationInfoCommand.java b/java/google/registry/tools/DomainApplicationInfoCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DomainApplicationInfoCommand.java
rename to java/google/registry/tools/DomainApplicationInfoCommand.java
diff --git a/java/com/google/domain/registry/tools/DomainCheckClaimsCommand.java b/java/google/registry/tools/DomainCheckClaimsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DomainCheckClaimsCommand.java
rename to java/google/registry/tools/DomainCheckClaimsCommand.java
diff --git a/java/com/google/domain/registry/tools/DomainCheckCommand.java b/java/google/registry/tools/DomainCheckCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DomainCheckCommand.java
rename to java/google/registry/tools/DomainCheckCommand.java
diff --git a/java/com/google/domain/registry/tools/DomainCheckFeeCommand.java b/java/google/registry/tools/DomainCheckFeeCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/DomainCheckFeeCommand.java
rename to java/google/registry/tools/DomainCheckFeeCommand.java
diff --git a/java/com/google/domain/registry/tools/EncryptEscrowDepositCommand.java b/java/google/registry/tools/EncryptEscrowDepositCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/EncryptEscrowDepositCommand.java
rename to java/google/registry/tools/EncryptEscrowDepositCommand.java
diff --git a/java/com/google/domain/registry/tools/EppToolCommand.java b/java/google/registry/tools/EppToolCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/EppToolCommand.java
rename to java/google/registry/tools/EppToolCommand.java
diff --git a/java/com/google/domain/registry/tools/EscrowDepositEncryptor.java b/java/google/registry/tools/EscrowDepositEncryptor.java
similarity index 100%
rename from java/com/google/domain/registry/tools/EscrowDepositEncryptor.java
rename to java/google/registry/tools/EscrowDepositEncryptor.java
diff --git a/java/com/google/domain/registry/tools/ExecuteEppCommand.java b/java/google/registry/tools/ExecuteEppCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ExecuteEppCommand.java
rename to java/google/registry/tools/ExecuteEppCommand.java
diff --git a/java/com/google/domain/registry/tools/GenerateApplicationsReportCommand.java b/java/google/registry/tools/GenerateApplicationsReportCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GenerateApplicationsReportCommand.java
rename to java/google/registry/tools/GenerateApplicationsReportCommand.java
diff --git a/java/com/google/domain/registry/tools/GenerateAuctionDataCommand.java b/java/google/registry/tools/GenerateAuctionDataCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GenerateAuctionDataCommand.java
rename to java/google/registry/tools/GenerateAuctionDataCommand.java
diff --git a/java/com/google/domain/registry/tools/GenerateDnsReportCommand.java b/java/google/registry/tools/GenerateDnsReportCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GenerateDnsReportCommand.java
rename to java/google/registry/tools/GenerateDnsReportCommand.java
diff --git a/java/com/google/domain/registry/tools/GenerateEscrowDepositCommand.java b/java/google/registry/tools/GenerateEscrowDepositCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GenerateEscrowDepositCommand.java
rename to java/google/registry/tools/GenerateEscrowDepositCommand.java
diff --git a/java/com/google/domain/registry/tools/GenerateLordnCommand.java b/java/google/registry/tools/GenerateLordnCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GenerateLordnCommand.java
rename to java/google/registry/tools/GenerateLordnCommand.java
diff --git a/java/com/google/domain/registry/tools/GenerateZoneFilesCommand.java b/java/google/registry/tools/GenerateZoneFilesCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GenerateZoneFilesCommand.java
rename to java/google/registry/tools/GenerateZoneFilesCommand.java
diff --git a/java/com/google/domain/registry/tools/GetApplicationCommand.java b/java/google/registry/tools/GetApplicationCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetApplicationCommand.java
rename to java/google/registry/tools/GetApplicationCommand.java
diff --git a/java/com/google/domain/registry/tools/GetApplicationIdsCommand.java b/java/google/registry/tools/GetApplicationIdsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetApplicationIdsCommand.java
rename to java/google/registry/tools/GetApplicationIdsCommand.java
diff --git a/java/com/google/domain/registry/tools/GetAppliedLabelsCommand.java b/java/google/registry/tools/GetAppliedLabelsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetAppliedLabelsCommand.java
rename to java/google/registry/tools/GetAppliedLabelsCommand.java
diff --git a/java/com/google/domain/registry/tools/GetClaimsListCommand.java b/java/google/registry/tools/GetClaimsListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetClaimsListCommand.java
rename to java/google/registry/tools/GetClaimsListCommand.java
diff --git a/java/com/google/domain/registry/tools/GetContactCommand.java b/java/google/registry/tools/GetContactCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetContactCommand.java
rename to java/google/registry/tools/GetContactCommand.java
diff --git a/java/com/google/domain/registry/tools/GetDomainCommand.java b/java/google/registry/tools/GetDomainCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetDomainCommand.java
rename to java/google/registry/tools/GetDomainCommand.java
diff --git a/java/com/google/domain/registry/tools/GetEppResourceCommand.java b/java/google/registry/tools/GetEppResourceCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetEppResourceCommand.java
rename to java/google/registry/tools/GetEppResourceCommand.java
diff --git a/java/com/google/domain/registry/tools/GetHistoryEntriesCommand.java b/java/google/registry/tools/GetHistoryEntriesCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetHistoryEntriesCommand.java
rename to java/google/registry/tools/GetHistoryEntriesCommand.java
diff --git a/java/com/google/domain/registry/tools/GetHostCommand.java b/java/google/registry/tools/GetHostCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetHostCommand.java
rename to java/google/registry/tools/GetHostCommand.java
diff --git a/java/com/google/domain/registry/tools/GetRegistrarCommand.java b/java/google/registry/tools/GetRegistrarCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetRegistrarCommand.java
rename to java/google/registry/tools/GetRegistrarCommand.java
diff --git a/java/com/google/domain/registry/tools/GetResourceByKeyCommand.java b/java/google/registry/tools/GetResourceByKeyCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetResourceByKeyCommand.java
rename to java/google/registry/tools/GetResourceByKeyCommand.java
diff --git a/java/com/google/domain/registry/tools/GetSchemaCommand.java b/java/google/registry/tools/GetSchemaCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetSchemaCommand.java
rename to java/google/registry/tools/GetSchemaCommand.java
diff --git a/java/com/google/domain/registry/tools/GetSchemaTreeCommand.java b/java/google/registry/tools/GetSchemaTreeCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetSchemaTreeCommand.java
rename to java/google/registry/tools/GetSchemaTreeCommand.java
diff --git a/java/com/google/domain/registry/tools/GetTldCommand.java b/java/google/registry/tools/GetTldCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GetTldCommand.java
rename to java/google/registry/tools/GetTldCommand.java
diff --git a/java/com/google/domain/registry/tools/GhostrydeCommand.java b/java/google/registry/tools/GhostrydeCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GhostrydeCommand.java
rename to java/google/registry/tools/GhostrydeCommand.java
diff --git a/java/com/google/domain/registry/tools/GtechTool.java b/java/google/registry/tools/GtechTool.java
similarity index 100%
rename from java/com/google/domain/registry/tools/GtechTool.java
rename to java/google/registry/tools/GtechTool.java
diff --git a/java/com/google/domain/registry/tools/HashCertificateCommand.java b/java/google/registry/tools/HashCertificateCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/HashCertificateCommand.java
rename to java/google/registry/tools/HashCertificateCommand.java
diff --git a/java/com/google/domain/registry/tools/HelpCommand.java b/java/google/registry/tools/HelpCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/HelpCommand.java
rename to java/google/registry/tools/HelpCommand.java
diff --git a/java/com/google/domain/registry/tools/Injector.java b/java/google/registry/tools/Injector.java
similarity index 100%
rename from java/com/google/domain/registry/tools/Injector.java
rename to java/google/registry/tools/Injector.java
diff --git a/java/com/google/domain/registry/tools/ListCreditsCommand.java b/java/google/registry/tools/ListCreditsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ListCreditsCommand.java
rename to java/google/registry/tools/ListCreditsCommand.java
diff --git a/java/com/google/domain/registry/tools/ListCursorsCommand.java b/java/google/registry/tools/ListCursorsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ListCursorsCommand.java
rename to java/google/registry/tools/ListCursorsCommand.java
diff --git a/java/com/google/domain/registry/tools/ListDomainsCommand.java b/java/google/registry/tools/ListDomainsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ListDomainsCommand.java
rename to java/google/registry/tools/ListDomainsCommand.java
diff --git a/java/com/google/domain/registry/tools/ListHostsCommand.java b/java/google/registry/tools/ListHostsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ListHostsCommand.java
rename to java/google/registry/tools/ListHostsCommand.java
diff --git a/java/com/google/domain/registry/tools/ListObjectsCommand.java b/java/google/registry/tools/ListObjectsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ListObjectsCommand.java
rename to java/google/registry/tools/ListObjectsCommand.java
diff --git a/java/com/google/domain/registry/tools/ListPremiumListsCommand.java b/java/google/registry/tools/ListPremiumListsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ListPremiumListsCommand.java
rename to java/google/registry/tools/ListPremiumListsCommand.java
diff --git a/java/com/google/domain/registry/tools/ListRegistrarsCommand.java b/java/google/registry/tools/ListRegistrarsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ListRegistrarsCommand.java
rename to java/google/registry/tools/ListRegistrarsCommand.java
diff --git a/java/com/google/domain/registry/tools/ListReservedListsCommand.java b/java/google/registry/tools/ListReservedListsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ListReservedListsCommand.java
rename to java/google/registry/tools/ListReservedListsCommand.java
diff --git a/java/com/google/domain/registry/tools/ListTldsCommand.java b/java/google/registry/tools/ListTldsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ListTldsCommand.java
rename to java/google/registry/tools/ListTldsCommand.java
diff --git a/java/com/google/domain/registry/tools/LoadSnapshotCommand.java b/java/google/registry/tools/LoadSnapshotCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/LoadSnapshotCommand.java
rename to java/google/registry/tools/LoadSnapshotCommand.java
diff --git a/java/com/google/domain/registry/tools/LoggingParameters.java b/java/google/registry/tools/LoggingParameters.java
similarity index 100%
rename from java/com/google/domain/registry/tools/LoggingParameters.java
rename to java/google/registry/tools/LoggingParameters.java
diff --git a/java/com/google/domain/registry/tools/MakeBillingTablesCommand.java b/java/google/registry/tools/MakeBillingTablesCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/MakeBillingTablesCommand.java
rename to java/google/registry/tools/MakeBillingTablesCommand.java
diff --git a/java/com/google/domain/registry/tools/MutatingCommand.java b/java/google/registry/tools/MutatingCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/MutatingCommand.java
rename to java/google/registry/tools/MutatingCommand.java
diff --git a/java/com/google/domain/registry/tools/MutatingEppToolCommand.java b/java/google/registry/tools/MutatingEppToolCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/MutatingEppToolCommand.java
rename to java/google/registry/tools/MutatingEppToolCommand.java
diff --git a/java/com/google/domain/registry/tools/PasswordGenerator.java b/java/google/registry/tools/PasswordGenerator.java
similarity index 100%
rename from java/com/google/domain/registry/tools/PasswordGenerator.java
rename to java/google/registry/tools/PasswordGenerator.java
diff --git a/java/com/google/domain/registry/tools/PendingEscrowCommand.java b/java/google/registry/tools/PendingEscrowCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/PendingEscrowCommand.java
rename to java/google/registry/tools/PendingEscrowCommand.java
diff --git a/java/com/google/domain/registry/tools/PublishDetailReportCommand.java b/java/google/registry/tools/PublishDetailReportCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/PublishDetailReportCommand.java
rename to java/google/registry/tools/PublishDetailReportCommand.java
diff --git a/java/com/google/domain/registry/tools/RandomPasswordGenerator.java b/java/google/registry/tools/RandomPasswordGenerator.java
similarity index 100%
rename from java/com/google/domain/registry/tools/RandomPasswordGenerator.java
rename to java/google/registry/tools/RandomPasswordGenerator.java
diff --git a/java/com/google/domain/registry/tools/RegistrarActivityReportCommand.java b/java/google/registry/tools/RegistrarActivityReportCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/RegistrarActivityReportCommand.java
rename to java/google/registry/tools/RegistrarActivityReportCommand.java
diff --git a/java/com/google/domain/registry/tools/RegistrarContactCommand.java b/java/google/registry/tools/RegistrarContactCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/RegistrarContactCommand.java
rename to java/google/registry/tools/RegistrarContactCommand.java
diff --git a/java/com/google/domain/registry/tools/RegistryCli.java b/java/google/registry/tools/RegistryCli.java
similarity index 100%
rename from java/com/google/domain/registry/tools/RegistryCli.java
rename to java/google/registry/tools/RegistryCli.java
diff --git a/java/com/google/domain/registry/tools/RegistryTool.java b/java/google/registry/tools/RegistryTool.java
similarity index 100%
rename from java/com/google/domain/registry/tools/RegistryTool.java
rename to java/google/registry/tools/RegistryTool.java
diff --git a/java/com/google/domain/registry/tools/RegistryToolComponent.java b/java/google/registry/tools/RegistryToolComponent.java
similarity index 100%
rename from java/com/google/domain/registry/tools/RegistryToolComponent.java
rename to java/google/registry/tools/RegistryToolComponent.java
diff --git a/java/com/google/domain/registry/tools/RegistryToolEnvironment.java b/java/google/registry/tools/RegistryToolEnvironment.java
similarity index 100%
rename from java/com/google/domain/registry/tools/RegistryToolEnvironment.java
rename to java/google/registry/tools/RegistryToolEnvironment.java
diff --git a/java/com/google/domain/registry/tools/RegistryToolModule.java b/java/google/registry/tools/RegistryToolModule.java
similarity index 100%
rename from java/com/google/domain/registry/tools/RegistryToolModule.java
rename to java/google/registry/tools/RegistryToolModule.java
diff --git a/java/com/google/domain/registry/tools/ResaveEnvironmentEntitiesCommand.java b/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ResaveEnvironmentEntitiesCommand.java
rename to java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java
diff --git a/java/com/google/domain/registry/tools/SendEscrowReportToIcannCommand.java b/java/google/registry/tools/SendEscrowReportToIcannCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/SendEscrowReportToIcannCommand.java
rename to java/google/registry/tools/SendEscrowReportToIcannCommand.java
diff --git a/java/com/google/domain/registry/tools/ServerSideCommand.java b/java/google/registry/tools/ServerSideCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ServerSideCommand.java
rename to java/google/registry/tools/ServerSideCommand.java
diff --git a/java/com/google/domain/registry/tools/SetupOteCommand.java b/java/google/registry/tools/SetupOteCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/SetupOteCommand.java
rename to java/google/registry/tools/SetupOteCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateApplicationStatusCommand.java b/java/google/registry/tools/UpdateApplicationStatusCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateApplicationStatusCommand.java
rename to java/google/registry/tools/UpdateApplicationStatusCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateClaimsNoticeCommand.java b/java/google/registry/tools/UpdateClaimsNoticeCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateClaimsNoticeCommand.java
rename to java/google/registry/tools/UpdateClaimsNoticeCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateCreditsCommand.java b/java/google/registry/tools/UpdateCreditsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateCreditsCommand.java
rename to java/google/registry/tools/UpdateCreditsCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateCursorsCommand.java b/java/google/registry/tools/UpdateCursorsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateCursorsCommand.java
rename to java/google/registry/tools/UpdateCursorsCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdatePremiumListCommand.java b/java/google/registry/tools/UpdatePremiumListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdatePremiumListCommand.java
rename to java/google/registry/tools/UpdatePremiumListCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateRegistrarCommand.java b/java/google/registry/tools/UpdateRegistrarCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateRegistrarCommand.java
rename to java/google/registry/tools/UpdateRegistrarCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateReservedListCommand.java b/java/google/registry/tools/UpdateReservedListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateReservedListCommand.java
rename to java/google/registry/tools/UpdateReservedListCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateSandboxTldCommand.java b/java/google/registry/tools/UpdateSandboxTldCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateSandboxTldCommand.java
rename to java/google/registry/tools/UpdateSandboxTldCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateServerLocksCommand.java b/java/google/registry/tools/UpdateServerLocksCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateServerLocksCommand.java
rename to java/google/registry/tools/UpdateServerLocksCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateSmdCommand.java b/java/google/registry/tools/UpdateSmdCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateSmdCommand.java
rename to java/google/registry/tools/UpdateSmdCommand.java
diff --git a/java/com/google/domain/registry/tools/UpdateTldCommand.java b/java/google/registry/tools/UpdateTldCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UpdateTldCommand.java
rename to java/google/registry/tools/UpdateTldCommand.java
diff --git a/java/com/google/domain/registry/tools/UploadClaimsListCommand.java b/java/google/registry/tools/UploadClaimsListCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UploadClaimsListCommand.java
rename to java/google/registry/tools/UploadClaimsListCommand.java
diff --git a/java/com/google/domain/registry/tools/UserIdProvider.java b/java/google/registry/tools/UserIdProvider.java
similarity index 100%
rename from java/com/google/domain/registry/tools/UserIdProvider.java
rename to java/google/registry/tools/UserIdProvider.java
diff --git a/java/com/google/domain/registry/tools/ValidateEscrowDepositCommand.java b/java/google/registry/tools/ValidateEscrowDepositCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ValidateEscrowDepositCommand.java
rename to java/google/registry/tools/ValidateEscrowDepositCommand.java
diff --git a/java/com/google/domain/registry/tools/ValidateLoginCredentialsCommand.java b/java/google/registry/tools/ValidateLoginCredentialsCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/ValidateLoginCredentialsCommand.java
rename to java/google/registry/tools/ValidateLoginCredentialsCommand.java
diff --git a/java/com/google/domain/registry/tools/VerifyOteCommand.java b/java/google/registry/tools/VerifyOteCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/VerifyOteCommand.java
rename to java/google/registry/tools/VerifyOteCommand.java
diff --git a/java/com/google/domain/registry/tools/WhoisQueryCommand.java b/java/google/registry/tools/WhoisQueryCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/WhoisQueryCommand.java
rename to java/google/registry/tools/WhoisQueryCommand.java
diff --git a/java/com/google/domain/registry/tools/javascrap/LoadAndResaveCommand.java b/java/google/registry/tools/javascrap/LoadAndResaveCommand.java
similarity index 100%
rename from java/com/google/domain/registry/tools/javascrap/LoadAndResaveCommand.java
rename to java/google/registry/tools/javascrap/LoadAndResaveCommand.java
diff --git a/java/com/google/domain/registry/tools/logging.properties b/java/google/registry/tools/logging.properties
similarity index 100%
rename from java/com/google/domain/registry/tools/logging.properties
rename to java/google/registry/tools/logging.properties
diff --git a/java/com/google/domain/registry/tools/package-info.java b/java/google/registry/tools/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/tools/package-info.java
rename to java/google/registry/tools/package-info.java
diff --git a/java/com/google/domain/registry/tools/params/BUILD b/java/google/registry/tools/params/BUILD
similarity index 100%
rename from java/com/google/domain/registry/tools/params/BUILD
rename to java/google/registry/tools/params/BUILD
diff --git a/java/com/google/domain/registry/tools/params/DateTimeParameter.java b/java/google/registry/tools/params/DateTimeParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/DateTimeParameter.java
rename to java/google/registry/tools/params/DateTimeParameter.java
diff --git a/java/com/google/domain/registry/tools/params/DurationParameter.java b/java/google/registry/tools/params/DurationParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/DurationParameter.java
rename to java/google/registry/tools/params/DurationParameter.java
diff --git a/java/com/google/domain/registry/tools/params/EppResourceTypeParameter.java b/java/google/registry/tools/params/EppResourceTypeParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/EppResourceTypeParameter.java
rename to java/google/registry/tools/params/EppResourceTypeParameter.java
diff --git a/java/com/google/domain/registry/tools/params/HostAndPortParameter.java b/java/google/registry/tools/params/HostAndPortParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/HostAndPortParameter.java
rename to java/google/registry/tools/params/HostAndPortParameter.java
diff --git a/java/com/google/domain/registry/tools/params/InternetDomainNameParameter.java b/java/google/registry/tools/params/InternetDomainNameParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/InternetDomainNameParameter.java
rename to java/google/registry/tools/params/InternetDomainNameParameter.java
diff --git a/java/com/google/domain/registry/tools/params/LocalDateParameter.java b/java/google/registry/tools/params/LocalDateParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/LocalDateParameter.java
rename to java/google/registry/tools/params/LocalDateParameter.java
diff --git a/java/com/google/domain/registry/tools/params/LoggingLevelParameter.java b/java/google/registry/tools/params/LoggingLevelParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/LoggingLevelParameter.java
rename to java/google/registry/tools/params/LoggingLevelParameter.java
diff --git a/java/com/google/domain/registry/tools/params/LongParameter.java b/java/google/registry/tools/params/LongParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/LongParameter.java
rename to java/google/registry/tools/params/LongParameter.java
diff --git a/java/com/google/domain/registry/tools/params/MoneyParameter.java b/java/google/registry/tools/params/MoneyParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/MoneyParameter.java
rename to java/google/registry/tools/params/MoneyParameter.java
diff --git a/java/com/google/domain/registry/tools/params/OptionalLongParameter.java b/java/google/registry/tools/params/OptionalLongParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/OptionalLongParameter.java
rename to java/google/registry/tools/params/OptionalLongParameter.java
diff --git a/java/com/google/domain/registry/tools/params/OptionalParameterConverterValidator.java b/java/google/registry/tools/params/OptionalParameterConverterValidator.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/OptionalParameterConverterValidator.java
rename to java/google/registry/tools/params/OptionalParameterConverterValidator.java
diff --git a/java/com/google/domain/registry/tools/params/OptionalPhoneNumberParameter.java b/java/google/registry/tools/params/OptionalPhoneNumberParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/OptionalPhoneNumberParameter.java
rename to java/google/registry/tools/params/OptionalPhoneNumberParameter.java
diff --git a/java/com/google/domain/registry/tools/params/OptionalStringParameter.java b/java/google/registry/tools/params/OptionalStringParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/OptionalStringParameter.java
rename to java/google/registry/tools/params/OptionalStringParameter.java
diff --git a/java/com/google/domain/registry/tools/params/ParameterConverterValidator.java b/java/google/registry/tools/params/ParameterConverterValidator.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/ParameterConverterValidator.java
rename to java/google/registry/tools/params/ParameterConverterValidator.java
diff --git a/java/com/google/domain/registry/tools/params/ParameterFactory.java b/java/google/registry/tools/params/ParameterFactory.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/ParameterFactory.java
rename to java/google/registry/tools/params/ParameterFactory.java
diff --git a/java/com/google/domain/registry/tools/params/PathParameter.java b/java/google/registry/tools/params/PathParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/PathParameter.java
rename to java/google/registry/tools/params/PathParameter.java
diff --git a/java/com/google/domain/registry/tools/params/PhoneNumberParameter.java b/java/google/registry/tools/params/PhoneNumberParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/PhoneNumberParameter.java
rename to java/google/registry/tools/params/PhoneNumberParameter.java
diff --git a/java/com/google/domain/registry/tools/params/StringParameter.java b/java/google/registry/tools/params/StringParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/StringParameter.java
rename to java/google/registry/tools/params/StringParameter.java
diff --git a/java/com/google/domain/registry/tools/params/TransitionListParameter.java b/java/google/registry/tools/params/TransitionListParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/TransitionListParameter.java
rename to java/google/registry/tools/params/TransitionListParameter.java
diff --git a/java/com/google/domain/registry/tools/params/YearMonthParameter.java b/java/google/registry/tools/params/YearMonthParameter.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/YearMonthParameter.java
rename to java/google/registry/tools/params/YearMonthParameter.java
diff --git a/java/com/google/domain/registry/tools/params/package-info.java b/java/google/registry/tools/params/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/tools/params/package-info.java
rename to java/google/registry/tools/params/package-info.java
diff --git a/java/com/google/domain/registry/tools/server/BUILD b/java/google/registry/tools/server/BUILD
similarity index 100%
rename from java/com/google/domain/registry/tools/server/BUILD
rename to java/google/registry/tools/server/BUILD
diff --git a/java/com/google/domain/registry/tools/server/CreateGroupsAction.java b/java/google/registry/tools/server/CreateGroupsAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/CreateGroupsAction.java
rename to java/google/registry/tools/server/CreateGroupsAction.java
diff --git a/java/com/google/domain/registry/tools/server/CreateOrUpdatePremiumListAction.java b/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/CreateOrUpdatePremiumListAction.java
rename to java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java
diff --git a/java/com/google/domain/registry/tools/server/CreatePremiumListAction.java b/java/google/registry/tools/server/CreatePremiumListAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/CreatePremiumListAction.java
rename to java/google/registry/tools/server/CreatePremiumListAction.java
diff --git a/java/com/google/domain/registry/tools/server/DeleteEntityAction.java b/java/google/registry/tools/server/DeleteEntityAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/DeleteEntityAction.java
rename to java/google/registry/tools/server/DeleteEntityAction.java
diff --git a/java/com/google/domain/registry/tools/server/DeleteProberDataAction.java b/java/google/registry/tools/server/DeleteProberDataAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/DeleteProberDataAction.java
rename to java/google/registry/tools/server/DeleteProberDataAction.java
diff --git a/java/com/google/domain/registry/tools/server/GenerateZoneFilesAction.java b/java/google/registry/tools/server/GenerateZoneFilesAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/GenerateZoneFilesAction.java
rename to java/google/registry/tools/server/GenerateZoneFilesAction.java
diff --git a/java/com/google/domain/registry/tools/server/KillAllCommitLogsAction.java b/java/google/registry/tools/server/KillAllCommitLogsAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/KillAllCommitLogsAction.java
rename to java/google/registry/tools/server/KillAllCommitLogsAction.java
diff --git a/java/com/google/domain/registry/tools/server/KillAllCrossTldEntitiesAction.java b/java/google/registry/tools/server/KillAllCrossTldEntitiesAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/KillAllCrossTldEntitiesAction.java
rename to java/google/registry/tools/server/KillAllCrossTldEntitiesAction.java
diff --git a/java/com/google/domain/registry/tools/server/KillAllEntitiesReducer.java b/java/google/registry/tools/server/KillAllEntitiesReducer.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/KillAllEntitiesReducer.java
rename to java/google/registry/tools/server/KillAllEntitiesReducer.java
diff --git a/java/com/google/domain/registry/tools/server/KillAllEppResourcesAction.java b/java/google/registry/tools/server/KillAllEppResourcesAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/KillAllEppResourcesAction.java
rename to java/google/registry/tools/server/KillAllEppResourcesAction.java
diff --git a/java/com/google/domain/registry/tools/server/ListDomainsAction.java b/java/google/registry/tools/server/ListDomainsAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/ListDomainsAction.java
rename to java/google/registry/tools/server/ListDomainsAction.java
diff --git a/java/com/google/domain/registry/tools/server/ListHostsAction.java b/java/google/registry/tools/server/ListHostsAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/ListHostsAction.java
rename to java/google/registry/tools/server/ListHostsAction.java
diff --git a/java/com/google/domain/registry/tools/server/ListObjectsAction.java b/java/google/registry/tools/server/ListObjectsAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/ListObjectsAction.java
rename to java/google/registry/tools/server/ListObjectsAction.java
diff --git a/java/com/google/domain/registry/tools/server/ListPremiumListsAction.java b/java/google/registry/tools/server/ListPremiumListsAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/ListPremiumListsAction.java
rename to java/google/registry/tools/server/ListPremiumListsAction.java
diff --git a/java/com/google/domain/registry/tools/server/ListRegistrarsAction.java b/java/google/registry/tools/server/ListRegistrarsAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/ListRegistrarsAction.java
rename to java/google/registry/tools/server/ListRegistrarsAction.java
diff --git a/java/com/google/domain/registry/tools/server/ListReservedListsAction.java b/java/google/registry/tools/server/ListReservedListsAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/ListReservedListsAction.java
rename to java/google/registry/tools/server/ListReservedListsAction.java
diff --git a/java/com/google/domain/registry/tools/server/ListTldsAction.java b/java/google/registry/tools/server/ListTldsAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/ListTldsAction.java
rename to java/google/registry/tools/server/ListTldsAction.java
diff --git a/java/com/google/domain/registry/tools/server/ResaveAllEppResourcesAction.java b/java/google/registry/tools/server/ResaveAllEppResourcesAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/ResaveAllEppResourcesAction.java
rename to java/google/registry/tools/server/ResaveAllEppResourcesAction.java
diff --git a/java/com/google/domain/registry/tools/server/ToolsServerModule.java b/java/google/registry/tools/server/ToolsServerModule.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/ToolsServerModule.java
rename to java/google/registry/tools/server/ToolsServerModule.java
diff --git a/java/com/google/domain/registry/tools/server/UpdatePremiumListAction.java b/java/google/registry/tools/server/UpdatePremiumListAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/UpdatePremiumListAction.java
rename to java/google/registry/tools/server/UpdatePremiumListAction.java
diff --git a/java/com/google/domain/registry/tools/server/VerifyOteAction.java b/java/google/registry/tools/server/VerifyOteAction.java
similarity index 100%
rename from java/com/google/domain/registry/tools/server/VerifyOteAction.java
rename to java/google/registry/tools/server/VerifyOteAction.java
diff --git a/java/com/google/domain/registry/tools/soy/BUILD b/java/google/registry/tools/soy/BUILD
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/BUILD
rename to java/google/registry/tools/soy/BUILD
diff --git a/java/com/google/domain/registry/tools/soy/CreateAnchorTenant.soy b/java/google/registry/tools/soy/CreateAnchorTenant.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/CreateAnchorTenant.soy
rename to java/google/registry/tools/soy/CreateAnchorTenant.soy
diff --git a/java/com/google/domain/registry/tools/soy/CreateContact.soy b/java/google/registry/tools/soy/CreateContact.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/CreateContact.soy
rename to java/google/registry/tools/soy/CreateContact.soy
diff --git a/java/com/google/domain/registry/tools/soy/DeleteDomain.soy b/java/google/registry/tools/soy/DeleteDomain.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/DeleteDomain.soy
rename to java/google/registry/tools/soy/DeleteDomain.soy
diff --git a/java/com/google/domain/registry/tools/soy/DomainAllocate.soy b/java/google/registry/tools/soy/DomainAllocate.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/DomainAllocate.soy
rename to java/google/registry/tools/soy/DomainAllocate.soy
diff --git a/java/com/google/domain/registry/tools/soy/DomainApplicationInfo.soy b/java/google/registry/tools/soy/DomainApplicationInfo.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/DomainApplicationInfo.soy
rename to java/google/registry/tools/soy/DomainApplicationInfo.soy
diff --git a/java/com/google/domain/registry/tools/soy/DomainCheck.soy b/java/google/registry/tools/soy/DomainCheck.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/DomainCheck.soy
rename to java/google/registry/tools/soy/DomainCheck.soy
diff --git a/java/com/google/domain/registry/tools/soy/DomainCheckClaims.soy b/java/google/registry/tools/soy/DomainCheckClaims.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/DomainCheckClaims.soy
rename to java/google/registry/tools/soy/DomainCheckClaims.soy
diff --git a/java/com/google/domain/registry/tools/soy/DomainCheckFee.soy b/java/google/registry/tools/soy/DomainCheckFee.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/DomainCheckFee.soy
rename to java/google/registry/tools/soy/DomainCheckFee.soy
diff --git a/java/com/google/domain/registry/tools/soy/Login.soy b/java/google/registry/tools/soy/Login.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/Login.soy
rename to java/google/registry/tools/soy/Login.soy
diff --git a/java/com/google/domain/registry/tools/soy/UpdateServerLocks.soy b/java/google/registry/tools/soy/UpdateServerLocks.soy
similarity index 100%
rename from java/com/google/domain/registry/tools/soy/UpdateServerLocks.soy
rename to java/google/registry/tools/soy/UpdateServerLocks.soy
diff --git a/java/com/google/domain/registry/tools/sql/ReportingHistory.sql b/java/google/registry/tools/sql/ReportingHistory.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/ReportingHistory.sql
rename to java/google/registry/tools/sql/ReportingHistory.sql
diff --git a/java/com/google/domain/registry/tools/sql/ReportingIdentifiers.sql b/java/google/registry/tools/sql/ReportingIdentifiers.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/ReportingIdentifiers.sql
rename to java/google/registry/tools/sql/ReportingIdentifiers.sql
diff --git a/java/com/google/domain/registry/tools/sql/billing_data_view.sql b/java/google/registry/tools/sql/billing_data_view.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/billing_data_view.sql
rename to java/google/registry/tools/sql/billing_data_view.sql
diff --git a/java/com/google/domain/registry/tools/sql/credit_balance_data_view.sql b/java/google/registry/tools/sql/credit_balance_data_view.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/credit_balance_data_view.sql
rename to java/google/registry/tools/sql/credit_balance_data_view.sql
diff --git a/java/com/google/domain/registry/tools/sql/credit_data_view.sql b/java/google/registry/tools/sql/credit_data_view.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/credit_data_view.sql
rename to java/google/registry/tools/sql/credit_data_view.sql
diff --git a/java/com/google/domain/registry/tools/sql/currency_table.sql b/java/google/registry/tools/sql/currency_table.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/currency_table.sql
rename to java/google/registry/tools/sql/currency_table.sql
diff --git a/java/com/google/domain/registry/tools/sql/premium_list_data_view.sql b/java/google/registry/tools/sql/premium_list_data_view.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/premium_list_data_view.sql
rename to java/google/registry/tools/sql/premium_list_data_view.sql
diff --git a/java/com/google/domain/registry/tools/sql/recurring_event_data_view.sql b/java/google/registry/tools/sql/recurring_event_data_view.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/recurring_event_data_view.sql
rename to java/google/registry/tools/sql/recurring_event_data_view.sql
diff --git a/java/com/google/domain/registry/tools/sql/registrar_activity_report.sql b/java/google/registry/tools/sql/registrar_activity_report.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/registrar_activity_report.sql
rename to java/google/registry/tools/sql/registrar_activity_report.sql
diff --git a/java/com/google/domain/registry/tools/sql/registrar_data_view.sql b/java/google/registry/tools/sql/registrar_data_view.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/registrar_data_view.sql
rename to java/google/registry/tools/sql/registrar_data_view.sql
diff --git a/java/com/google/domain/registry/tools/sql/registry_data_view.sql b/java/google/registry/tools/sql/registry_data_view.sql
similarity index 100%
rename from java/com/google/domain/registry/tools/sql/registry_data_view.sql
rename to java/google/registry/tools/sql/registry_data_view.sql
diff --git a/java/com/google/domain/registry/ui/BUILD b/java/google/registry/ui/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/BUILD
rename to java/google/registry/ui/BUILD
diff --git a/java/com/google/domain/registry/ui/ConsoleConfigModule.java b/java/google/registry/ui/ConsoleConfigModule.java
similarity index 100%
rename from java/com/google/domain/registry/ui/ConsoleConfigModule.java
rename to java/google/registry/ui/ConsoleConfigModule.java
diff --git a/java/com/google/domain/registry/ui/ConsoleDebug.java b/java/google/registry/ui/ConsoleDebug.java
similarity index 100%
rename from java/com/google/domain/registry/ui/ConsoleDebug.java
rename to java/google/registry/ui/ConsoleDebug.java
diff --git a/java/com/google/domain/registry/ui/assets/html/brainframe-alpha.html b/java/google/registry/ui/assets/html/brainframe-alpha.html
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/html/brainframe-alpha.html
rename to java/google/registry/ui/assets/html/brainframe-alpha.html
diff --git a/java/com/google/domain/registry/ui/assets/html/brainframe-map.html b/java/google/registry/ui/assets/html/brainframe-map.html
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/html/brainframe-map.html
rename to java/google/registry/ui/assets/html/brainframe-map.html
diff --git a/java/com/google/domain/registry/ui/assets/html/brainframe.html b/java/google/registry/ui/assets/html/brainframe.html
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/html/brainframe.html
rename to java/google/registry/ui/assets/html/brainframe.html
diff --git a/java/com/google/domain/registry/ui/assets/html/insecure-brainframe.html b/java/google/registry/ui/assets/html/insecure-brainframe.html
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/html/insecure-brainframe.html
rename to java/google/registry/ui/assets/html/insecure-brainframe.html
diff --git a/java/com/google/domain/registry/ui/assets/html/integration-test-brainframe.html b/java/google/registry/ui/assets/html/integration-test-brainframe.html
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/html/integration-test-brainframe.html
rename to java/google/registry/ui/assets/html/integration-test-brainframe.html
diff --git a/java/com/google/domain/registry/ui/assets/images/ajax-loader.gif b/java/google/registry/ui/assets/images/ajax-loader.gif
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/ajax-loader.gif
rename to java/google/registry/ui/assets/images/ajax-loader.gif
diff --git a/java/com/google/domain/registry/ui/assets/images/android_sad.png b/java/google/registry/ui/assets/images/android_sad.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/android_sad.png
rename to java/google/registry/ui/assets/images/android_sad.png
diff --git a/java/com/google/domain/registry/ui/assets/images/disclosure_arrow_dk_grey.png b/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/disclosure_arrow_dk_grey.png
rename to java/google/registry/ui/assets/images/disclosure_arrow_dk_grey.png
diff --git a/java/com/google/domain/registry/ui/assets/images/disclosure_arrow_dk_grey_down.png b/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_down.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/disclosure_arrow_dk_grey_down.png
rename to java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_down.png
diff --git a/java/com/google/domain/registry/ui/assets/images/disclosure_arrow_dk_grey_up_down.png b/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_up_down.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/disclosure_arrow_dk_grey_up_down.png
rename to java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_up_down.png
diff --git a/java/com/google/domain/registry/ui/assets/images/explore_24.png b/java/google/registry/ui/assets/images/explore_24.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/explore_24.png
rename to java/google/registry/ui/assets/images/explore_24.png
diff --git a/java/com/google/domain/registry/ui/assets/images/folder.png b/java/google/registry/ui/assets/images/folder.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/folder.png
rename to java/google/registry/ui/assets/images/folder.png
diff --git a/java/com/google/domain/registry/ui/assets/images/glogo_black.png b/java/google/registry/ui/assets/images/glogo_black.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/glogo_black.png
rename to java/google/registry/ui/assets/images/glogo_black.png
diff --git a/java/com/google/domain/registry/ui/assets/images/google.png b/java/google/registry/ui/assets/images/google.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/google.png
rename to java/google/registry/ui/assets/images/google.png
diff --git a/java/com/google/domain/registry/ui/assets/images/homeContact.png b/java/google/registry/ui/assets/images/homeContact.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/homeContact.png
rename to java/google/registry/ui/assets/images/homeContact.png
diff --git a/java/com/google/domain/registry/ui/assets/images/homeResources.png b/java/google/registry/ui/assets/images/homeResources.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/homeResources.png
rename to java/google/registry/ui/assets/images/homeResources.png
diff --git a/java/com/google/domain/registry/ui/assets/images/homeSettings.png b/java/google/registry/ui/assets/images/homeSettings.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/homeSettings.png
rename to java/google/registry/ui/assets/images/homeSettings.png
diff --git a/java/com/google/domain/registry/ui/assets/images/ic_contacts_blue_12.png b/java/google/registry/ui/assets/images/ic_contacts_blue_12.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/ic_contacts_blue_12.png
rename to java/google/registry/ui/assets/images/ic_contacts_blue_12.png
diff --git a/java/com/google/domain/registry/ui/assets/images/ic_contacts_blue_8.png b/java/google/registry/ui/assets/images/ic_contacts_blue_8.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/ic_contacts_blue_8.png
rename to java/google/registry/ui/assets/images/ic_contacts_blue_8.png
diff --git a/java/com/google/domain/registry/ui/assets/images/icons/svg/Gcomm/search.svg b/java/google/registry/ui/assets/images/icons/svg/Gcomm/search.svg
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/icons/svg/Gcomm/search.svg
rename to java/google/registry/ui/assets/images/icons/svg/Gcomm/search.svg
diff --git a/java/com/google/domain/registry/ui/assets/images/icons/svg/search.svg b/java/google/registry/ui/assets/images/icons/svg/search.svg
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/icons/svg/search.svg
rename to java/google/registry/ui/assets/images/icons/svg/search.svg
diff --git a/java/com/google/domain/registry/ui/assets/images/icons/svg/settings.svg b/java/google/registry/ui/assets/images/icons/svg/settings.svg
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/icons/svg/settings.svg
rename to java/google/registry/ui/assets/images/icons/svg/settings.svg
diff --git a/java/com/google/domain/registry/ui/assets/images/loader1x.gif b/java/google/registry/ui/assets/images/loader1x.gif
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/loader1x.gif
rename to java/google/registry/ui/assets/images/loader1x.gif
diff --git a/java/com/google/domain/registry/ui/assets/images/loader4x.gif b/java/google/registry/ui/assets/images/loader4x.gif
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/loader4x.gif
rename to java/google/registry/ui/assets/images/loader4x.gif
diff --git a/java/com/google/domain/registry/ui/assets/images/logo_sm.gif b/java/google/registry/ui/assets/images/logo_sm.gif
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/logo_sm.gif
rename to java/google/registry/ui/assets/images/logo_sm.gif
diff --git a/java/com/google/domain/registry/ui/assets/images/offline_lightning.png b/java/google/registry/ui/assets/images/offline_lightning.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/offline_lightning.png
rename to java/google/registry/ui/assets/images/offline_lightning.png
diff --git a/java/com/google/domain/registry/ui/assets/images/ribbon_certified-128.png b/java/google/registry/ui/assets/images/ribbon_certified-128.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/ribbon_certified-128.png
rename to java/google/registry/ui/assets/images/ribbon_certified-128.png
diff --git a/java/com/google/domain/registry/ui/assets/images/ribbon_certified-64.png b/java/google/registry/ui/assets/images/ribbon_certified-64.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/ribbon_certified-64.png
rename to java/google/registry/ui/assets/images/ribbon_certified-64.png
diff --git a/java/com/google/domain/registry/ui/assets/images/visibleOff_16.png b/java/google/registry/ui/assets/images/visibleOff_16.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/visibleOff_16.png
rename to java/google/registry/ui/assets/images/visibleOff_16.png
diff --git a/java/com/google/domain/registry/ui/assets/images/visibleOn_16.png b/java/google/registry/ui/assets/images/visibleOn_16.png
similarity index 100%
rename from java/com/google/domain/registry/ui/assets/images/visibleOn_16.png
rename to java/google/registry/ui/assets/images/visibleOn_16.png
diff --git a/java/com/google/domain/registry/ui/compile_test.js b/java/google/registry/ui/compile_test.js
similarity index 100%
rename from java/com/google/domain/registry/ui/compile_test.js
rename to java/google/registry/ui/compile_test.js
diff --git a/java/com/google/domain/registry/ui/conformance_proto.txt b/java/google/registry/ui/conformance_proto.txt
similarity index 100%
rename from java/com/google/domain/registry/ui/conformance_proto.txt
rename to java/google/registry/ui/conformance_proto.txt
diff --git a/java/com/google/domain/registry/ui/css/BUILD b/java/google/registry/ui/css/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/css/BUILD
rename to java/google/registry/ui/css/BUILD
diff --git a/java/com/google/domain/registry/ui/css/console.css b/java/google/registry/ui/css/console.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/console.css
rename to java/google/registry/ui/css/console.css
diff --git a/java/com/google/domain/registry/ui/css/contact-settings.css b/java/google/registry/ui/css/contact-settings.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/contact-settings.css
rename to java/google/registry/ui/css/contact-settings.css
diff --git a/java/com/google/domain/registry/ui/css/contact-us.css b/java/google/registry/ui/css/contact-us.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/contact-us.css
rename to java/google/registry/ui/css/contact-us.css
diff --git a/java/com/google/domain/registry/ui/css/dashboard.css b/java/google/registry/ui/css/dashboard.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/dashboard.css
rename to java/google/registry/ui/css/dashboard.css
diff --git a/java/com/google/domain/registry/ui/css/demo_css.css b/java/google/registry/ui/css/demo_css.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/demo_css.css
rename to java/google/registry/ui/css/demo_css.css
diff --git a/java/com/google/domain/registry/ui/css/epp.css b/java/google/registry/ui/css/epp.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/epp.css
rename to java/google/registry/ui/css/epp.css
diff --git a/java/com/google/domain/registry/ui/css/forms.css b/java/google/registry/ui/css/forms.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/forms.css
rename to java/google/registry/ui/css/forms.css
diff --git a/java/com/google/domain/registry/ui/css/kd_components.css b/java/google/registry/ui/css/kd_components.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/kd_components.css
rename to java/google/registry/ui/css/kd_components.css
diff --git a/java/com/google/domain/registry/ui/css/registrar_imports_raw.css b/java/google/registry/ui/css/registrar_imports_raw.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/registrar_imports_raw.css
rename to java/google/registry/ui/css/registrar_imports_raw.css
diff --git a/java/com/google/domain/registry/ui/css/registry.css b/java/google/registry/ui/css/registry.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/registry.css
rename to java/google/registry/ui/css/registry.css
diff --git a/java/com/google/domain/registry/ui/css/resources.css b/java/google/registry/ui/css/resources.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/resources.css
rename to java/google/registry/ui/css/resources.css
diff --git a/java/com/google/domain/registry/ui/css/security-settings.css b/java/google/registry/ui/css/security-settings.css
similarity index 100%
rename from java/com/google/domain/registry/ui/css/security-settings.css
rename to java/google/registry/ui/css/security-settings.css
diff --git a/java/com/google/domain/registry/ui/epptmpl/contact_info.xml b/java/google/registry/ui/epptmpl/contact_info.xml
similarity index 100%
rename from java/com/google/domain/registry/ui/epptmpl/contact_info.xml
rename to java/google/registry/ui/epptmpl/contact_info.xml
diff --git a/java/com/google/domain/registry/ui/epptmpl/contact_transfer_request.xml b/java/google/registry/ui/epptmpl/contact_transfer_request.xml
similarity index 100%
rename from java/com/google/domain/registry/ui/epptmpl/contact_transfer_request.xml
rename to java/google/registry/ui/epptmpl/contact_transfer_request.xml
diff --git a/java/com/google/domain/registry/ui/epptmpl/domain_create_no_hosts_or_dsdata.xml b/java/google/registry/ui/epptmpl/domain_create_no_hosts_or_dsdata.xml
similarity index 100%
rename from java/com/google/domain/registry/ui/epptmpl/domain_create_no_hosts_or_dsdata.xml
rename to java/google/registry/ui/epptmpl/domain_create_no_hosts_or_dsdata.xml
diff --git a/java/com/google/domain/registry/ui/epptmpl/domain_delete.xml b/java/google/registry/ui/epptmpl/domain_delete.xml
similarity index 100%
rename from java/com/google/domain/registry/ui/epptmpl/domain_delete.xml
rename to java/google/registry/ui/epptmpl/domain_delete.xml
diff --git a/java/com/google/domain/registry/ui/epptmpl/domain_update_restore_request.xml b/java/google/registry/ui/epptmpl/domain_update_restore_request.xml
similarity index 100%
rename from java/com/google/domain/registry/ui/epptmpl/domain_update_restore_request.xml
rename to java/google/registry/ui/epptmpl/domain_update_restore_request.xml
diff --git a/java/com/google/domain/registry/ui/epptmpl/hello.xml b/java/google/registry/ui/epptmpl/hello.xml
similarity index 100%
rename from java/com/google/domain/registry/ui/epptmpl/hello.xml
rename to java/google/registry/ui/epptmpl/hello.xml
diff --git a/java/com/google/domain/registry/ui/epptmpl/login_valid.xml b/java/google/registry/ui/epptmpl/login_valid.xml
similarity index 100%
rename from java/com/google/domain/registry/ui/epptmpl/login_valid.xml
rename to java/google/registry/ui/epptmpl/login_valid.xml
diff --git a/java/com/google/domain/registry/ui/epptmpl/logout.xml b/java/google/registry/ui/epptmpl/logout.xml
similarity index 100%
rename from java/com/google/domain/registry/ui/epptmpl/logout.xml
rename to java/google/registry/ui/epptmpl/logout.xml
diff --git a/java/com/google/domain/registry/ui/epptmpl/poll.xml b/java/google/registry/ui/epptmpl/poll.xml
similarity index 100%
rename from java/com/google/domain/registry/ui/epptmpl/poll.xml
rename to java/google/registry/ui/epptmpl/poll.xml
diff --git a/java/com/google/domain/registry/ui/externs/BUILD b/java/google/registry/ui/externs/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/externs/BUILD
rename to java/google/registry/ui/externs/BUILD
diff --git a/java/com/google/domain/registry/ui/externs/braintree.js b/java/google/registry/ui/externs/braintree.js
similarity index 100%
rename from java/com/google/domain/registry/ui/externs/braintree.js
rename to java/google/registry/ui/externs/braintree.js
diff --git a/java/com/google/domain/registry/ui/externs/json.js b/java/google/registry/ui/externs/json.js
similarity index 100%
rename from java/com/google/domain/registry/ui/externs/json.js
rename to java/google/registry/ui/externs/json.js
diff --git a/java/com/google/domain/registry/ui/externs/rpc_payment.js b/java/google/registry/ui/externs/rpc_payment.js
similarity index 100%
rename from java/com/google/domain/registry/ui/externs/rpc_payment.js
rename to java/google/registry/ui/externs/rpc_payment.js
diff --git a/java/com/google/domain/registry/ui/externs/rpc_paymentsetup.js b/java/google/registry/ui/externs/rpc_paymentsetup.js
similarity index 100%
rename from java/com/google/domain/registry/ui/externs/rpc_paymentsetup.js
rename to java/google/registry/ui/externs/rpc_paymentsetup.js
diff --git a/java/com/google/domain/registry/ui/forms/BUILD b/java/google/registry/ui/forms/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/forms/BUILD
rename to java/google/registry/ui/forms/BUILD
diff --git a/java/com/google/domain/registry/ui/forms/FormException.java b/java/google/registry/ui/forms/FormException.java
similarity index 100%
rename from java/com/google/domain/registry/ui/forms/FormException.java
rename to java/google/registry/ui/forms/FormException.java
diff --git a/java/com/google/domain/registry/ui/forms/FormField.java b/java/google/registry/ui/forms/FormField.java
similarity index 100%
rename from java/com/google/domain/registry/ui/forms/FormField.java
rename to java/google/registry/ui/forms/FormField.java
diff --git a/java/com/google/domain/registry/ui/forms/FormFieldException.java b/java/google/registry/ui/forms/FormFieldException.java
similarity index 100%
rename from java/com/google/domain/registry/ui/forms/FormFieldException.java
rename to java/google/registry/ui/forms/FormFieldException.java
diff --git a/java/com/google/domain/registry/ui/forms/FormFields.java b/java/google/registry/ui/forms/FormFields.java
similarity index 100%
rename from java/com/google/domain/registry/ui/forms/FormFields.java
rename to java/google/registry/ui/forms/FormFields.java
diff --git a/java/com/google/domain/registry/ui/forms/package-info.java b/java/google/registry/ui/forms/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/ui/forms/package-info.java
rename to java/google/registry/ui/forms/package-info.java
diff --git a/java/com/google/domain/registry/ui/globals.txt b/java/google/registry/ui/globals.txt
similarity index 100%
rename from java/com/google/domain/registry/ui/globals.txt
rename to java/google/registry/ui/globals.txt
diff --git a/java/com/google/domain/registry/ui/html/BUILD b/java/google/registry/ui/html/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/html/BUILD
rename to java/google/registry/ui/html/BUILD
diff --git a/java/com/google/domain/registry/ui/html/error.html b/java/google/registry/ui/html/error.html
similarity index 100%
rename from java/com/google/domain/registry/ui/html/error.html
rename to java/google/registry/ui/html/error.html
diff --git a/java/com/google/domain/registry/ui/html/index.html b/java/google/registry/ui/html/index.html
similarity index 100%
rename from java/com/google/domain/registry/ui/html/index.html
rename to java/google/registry/ui/html/index.html
diff --git a/java/com/google/domain/registry/ui/js/BUILD b/java/google/registry/ui/js/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/js/BUILD
rename to java/google/registry/ui/js/BUILD
diff --git a/java/com/google/domain/registry/ui/js/component.js b/java/google/registry/ui/js/component.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/component.js
rename to java/google/registry/ui/js/component.js
diff --git a/java/com/google/domain/registry/ui/js/console.js b/java/google/registry/ui/js/console.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/console.js
rename to java/google/registry/ui/js/console.js
diff --git a/java/com/google/domain/registry/ui/js/edit_item.js b/java/google/registry/ui/js/edit_item.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/edit_item.js
rename to java/google/registry/ui/js/edit_item.js
diff --git a/java/com/google/domain/registry/ui/js/forms.js b/java/google/registry/ui/js/forms.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/forms.js
rename to java/google/registry/ui/js/forms.js
diff --git a/java/com/google/domain/registry/ui/js/menu_button.js b/java/google/registry/ui/js/menu_button.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/menu_button.js
rename to java/google/registry/ui/js/menu_button.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/BUILD b/java/google/registry/ui/js/registrar/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/BUILD
rename to java/google/registry/ui/js/registrar/BUILD
diff --git a/java/com/google/domain/registry/ui/js/registrar/brainframe.js b/java/google/registry/ui/js/registrar/brainframe.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/brainframe.js
rename to java/google/registry/ui/js/registrar/brainframe.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/console.js b/java/google/registry/ui/js/registrar/console.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/console.js
rename to java/google/registry/ui/js/registrar/console.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/contact.js b/java/google/registry/ui/js/registrar/contact.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/contact.js
rename to java/google/registry/ui/js/registrar/contact.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/contact_settings.js b/java/google/registry/ui/js/registrar/contact_settings.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/contact_settings.js
rename to java/google/registry/ui/js/registrar/contact_settings.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/contact_us.js b/java/google/registry/ui/js/registrar/contact_us.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/contact_us.js
rename to java/google/registry/ui/js/registrar/contact_us.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/dashboard.js b/java/google/registry/ui/js/registrar/dashboard.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/dashboard.js
rename to java/google/registry/ui/js/registrar/dashboard.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/domain.js b/java/google/registry/ui/js/registrar/domain.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/domain.js
rename to java/google/registry/ui/js/registrar/domain.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/epp_session.js b/java/google/registry/ui/js/registrar/epp_session.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/epp_session.js
rename to java/google/registry/ui/js/registrar/epp_session.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/host.js b/java/google/registry/ui/js/registrar/host.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/host.js
rename to java/google/registry/ui/js/registrar/host.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/main.js b/java/google/registry/ui/js/registrar/main.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/main.js
rename to java/google/registry/ui/js/registrar/main.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/payment.js b/java/google/registry/ui/js/registrar/payment.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/payment.js
rename to java/google/registry/ui/js/registrar/payment.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/resources.js b/java/google/registry/ui/js/registrar/resources.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/resources.js
rename to java/google/registry/ui/js/registrar/resources.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/security_settings.js b/java/google/registry/ui/js/registrar/security_settings.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/security_settings.js
rename to java/google/registry/ui/js/registrar/security_settings.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/whois_settings.js b/java/google/registry/ui/js/registrar/whois_settings.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/whois_settings.js
rename to java/google/registry/ui/js/registrar/whois_settings.js
diff --git a/java/com/google/domain/registry/ui/js/registrar/xml_resource_component.js b/java/google/registry/ui/js/registrar/xml_resource_component.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/registrar/xml_resource_component.js
rename to java/google/registry/ui/js/registrar/xml_resource_component.js
diff --git a/java/com/google/domain/registry/ui/js/resource.js b/java/google/registry/ui/js/resource.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/resource.js
rename to java/google/registry/ui/js/resource.js
diff --git a/java/com/google/domain/registry/ui/js/resource_component.js b/java/google/registry/ui/js/resource_component.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/resource_component.js
rename to java/google/registry/ui/js/resource_component.js
diff --git a/java/com/google/domain/registry/ui/js/session.js b/java/google/registry/ui/js/session.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/session.js
rename to java/google/registry/ui/js/session.js
diff --git a/java/com/google/domain/registry/ui/js/util.js b/java/google/registry/ui/js/util.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/util.js
rename to java/google/registry/ui/js/util.js
diff --git a/java/com/google/domain/registry/ui/js/xml.js b/java/google/registry/ui/js/xml.js
similarity index 100%
rename from java/com/google/domain/registry/ui/js/xml.js
rename to java/google/registry/ui/js/xml.js
diff --git a/java/com/google/domain/registry/ui/package-info.java b/java/google/registry/ui/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/ui/package-info.java
rename to java/google/registry/ui/package-info.java
diff --git a/java/com/google/domain/registry/ui/server/BUILD b/java/google/registry/ui/server/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/server/BUILD
rename to java/google/registry/ui/server/BUILD
diff --git a/java/com/google/domain/registry/ui/server/RegistrarFormFields.java b/java/google/registry/ui/server/RegistrarFormFields.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/RegistrarFormFields.java
rename to java/google/registry/ui/server/RegistrarFormFields.java
diff --git a/java/com/google/domain/registry/ui/server/SoyTemplateUtils.java b/java/google/registry/ui/server/SoyTemplateUtils.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/SoyTemplateUtils.java
rename to java/google/registry/ui/server/SoyTemplateUtils.java
diff --git a/java/com/google/domain/registry/ui/server/StateCode.java b/java/google/registry/ui/server/StateCode.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/StateCode.java
rename to java/google/registry/ui/server/StateCode.java
diff --git a/java/com/google/domain/registry/ui/server/api/BUILD b/java/google/registry/ui/server/api/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/server/api/BUILD
rename to java/google/registry/ui/server/api/BUILD
diff --git a/java/com/google/domain/registry/ui/server/api/CheckApiServlet.java b/java/google/registry/ui/server/api/CheckApiServlet.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/api/CheckApiServlet.java
rename to java/google/registry/ui/server/api/CheckApiServlet.java
diff --git a/java/com/google/domain/registry/ui/server/api/package-info.java b/java/google/registry/ui/server/api/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/api/package-info.java
rename to java/google/registry/ui/server/api/package-info.java
diff --git a/java/com/google/domain/registry/ui/server/package-info.java b/java/google/registry/ui/server/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/package-info.java
rename to java/google/registry/ui/server/package-info.java
diff --git a/java/com/google/domain/registry/ui/server/registrar/BUILD b/java/google/registry/ui/server/registrar/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/server/registrar/BUILD
rename to java/google/registry/ui/server/registrar/BUILD
diff --git a/java/com/google/domain/registry/ui/server/registrar/ConsoleUiAction.java b/java/google/registry/ui/server/registrar/ConsoleUiAction.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/registrar/ConsoleUiAction.java
rename to java/google/registry/ui/server/registrar/ConsoleUiAction.java
diff --git a/java/com/google/domain/registry/ui/server/registrar/RegistrarPaymentAction.java b/java/google/registry/ui/server/registrar/RegistrarPaymentAction.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/registrar/RegistrarPaymentAction.java
rename to java/google/registry/ui/server/registrar/RegistrarPaymentAction.java
diff --git a/java/com/google/domain/registry/ui/server/registrar/RegistrarPaymentSetupAction.java b/java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/registrar/RegistrarPaymentSetupAction.java
rename to java/google/registry/ui/server/registrar/RegistrarPaymentSetupAction.java
diff --git a/java/com/google/domain/registry/ui/server/registrar/RegistrarServlet.java b/java/google/registry/ui/server/registrar/RegistrarServlet.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/registrar/RegistrarServlet.java
rename to java/google/registry/ui/server/registrar/RegistrarServlet.java
diff --git a/java/com/google/domain/registry/ui/server/registrar/RegistrarUserModule.java b/java/google/registry/ui/server/registrar/RegistrarUserModule.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/registrar/RegistrarUserModule.java
rename to java/google/registry/ui/server/registrar/RegistrarUserModule.java
diff --git a/java/com/google/domain/registry/ui/server/registrar/ResourceServlet.java b/java/google/registry/ui/server/registrar/ResourceServlet.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/registrar/ResourceServlet.java
rename to java/google/registry/ui/server/registrar/ResourceServlet.java
diff --git a/java/com/google/domain/registry/ui/server/registrar/SessionUtils.java b/java/google/registry/ui/server/registrar/SessionUtils.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/registrar/SessionUtils.java
rename to java/google/registry/ui/server/registrar/SessionUtils.java
diff --git a/java/com/google/domain/registry/ui/server/registrar/package-info.java b/java/google/registry/ui/server/registrar/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/ui/server/registrar/package-info.java
rename to java/google/registry/ui/server/registrar/package-info.java
diff --git a/java/com/google/domain/registry/ui/soy/BUILD b/java/google/registry/ui/soy/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/BUILD
rename to java/google/registry/ui/soy/BUILD
diff --git a/java/com/google/domain/registry/ui/soy/Console.soy b/java/google/registry/ui/soy/Console.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/Console.soy
rename to java/google/registry/ui/soy/Console.soy
diff --git a/java/com/google/domain/registry/ui/soy/Forms.soy b/java/google/registry/ui/soy/Forms.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/Forms.soy
rename to java/google/registry/ui/soy/Forms.soy
diff --git a/java/com/google/domain/registry/ui/soy/api/BUILD b/java/google/registry/ui/soy/api/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/api/BUILD
rename to java/google/registry/ui/soy/api/BUILD
diff --git a/java/com/google/domain/registry/ui/soy/api/DomainCheckFeeEpp.soy b/java/google/registry/ui/soy/api/DomainCheckFeeEpp.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/api/DomainCheckFeeEpp.soy
rename to java/google/registry/ui/soy/api/DomainCheckFeeEpp.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/BUILD b/java/google/registry/ui/soy/registrar/BUILD
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/BUILD
rename to java/google/registry/ui/soy/registrar/BUILD
diff --git a/java/com/google/domain/registry/ui/soy/registrar/Console.soy b/java/google/registry/ui/soy/registrar/Console.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/Console.soy
rename to java/google/registry/ui/soy/registrar/Console.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/Contact.soy b/java/google/registry/ui/soy/registrar/Contact.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/Contact.soy
rename to java/google/registry/ui/soy/registrar/Contact.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/ContactEpp.soy b/java/google/registry/ui/soy/registrar/ContactEpp.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/ContactEpp.soy
rename to java/google/registry/ui/soy/registrar/ContactEpp.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/ContactSettings.soy b/java/google/registry/ui/soy/registrar/ContactSettings.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/ContactSettings.soy
rename to java/google/registry/ui/soy/registrar/ContactSettings.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/Domain.soy b/java/google/registry/ui/soy/registrar/Domain.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/Domain.soy
rename to java/google/registry/ui/soy/registrar/Domain.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/DomainEpp.soy b/java/google/registry/ui/soy/registrar/DomainEpp.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/DomainEpp.soy
rename to java/google/registry/ui/soy/registrar/DomainEpp.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/Epp.soy b/java/google/registry/ui/soy/registrar/Epp.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/Epp.soy
rename to java/google/registry/ui/soy/registrar/Epp.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/Host.soy b/java/google/registry/ui/soy/registrar/Host.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/Host.soy
rename to java/google/registry/ui/soy/registrar/Host.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/HostEpp.soy b/java/google/registry/ui/soy/registrar/HostEpp.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/HostEpp.soy
rename to java/google/registry/ui/soy/registrar/HostEpp.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/Payment.soy b/java/google/registry/ui/soy/registrar/Payment.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/Payment.soy
rename to java/google/registry/ui/soy/registrar/Payment.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/SecuritySettings.soy b/java/google/registry/ui/soy/registrar/SecuritySettings.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/SecuritySettings.soy
rename to java/google/registry/ui/soy/registrar/SecuritySettings.soy
diff --git a/java/com/google/domain/registry/ui/soy/registrar/WhoisSettings.soy b/java/google/registry/ui/soy/registrar/WhoisSettings.soy
similarity index 100%
rename from java/com/google/domain/registry/ui/soy/registrar/WhoisSettings.soy
rename to java/google/registry/ui/soy/registrar/WhoisSettings.soy
diff --git a/java/com/google/domain/registry/util/AppEngineTimeLimiter.java b/java/google/registry/util/AppEngineTimeLimiter.java
similarity index 100%
rename from java/com/google/domain/registry/util/AppEngineTimeLimiter.java
rename to java/google/registry/util/AppEngineTimeLimiter.java
diff --git a/java/com/google/domain/registry/util/BUILD b/java/google/registry/util/BUILD
similarity index 100%
rename from java/com/google/domain/registry/util/BUILD
rename to java/google/registry/util/BUILD
diff --git a/java/com/google/domain/registry/util/BasicHttpSession.java b/java/google/registry/util/BasicHttpSession.java
similarity index 100%
rename from java/com/google/domain/registry/util/BasicHttpSession.java
rename to java/google/registry/util/BasicHttpSession.java
diff --git a/java/com/google/domain/registry/util/CacheUtils.java b/java/google/registry/util/CacheUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/CacheUtils.java
rename to java/google/registry/util/CacheUtils.java
diff --git a/java/com/google/domain/registry/util/CapturingLogHandler.java b/java/google/registry/util/CapturingLogHandler.java
similarity index 100%
rename from java/com/google/domain/registry/util/CapturingLogHandler.java
rename to java/google/registry/util/CapturingLogHandler.java
diff --git a/java/com/google/domain/registry/util/CidrAddressBlock.java b/java/google/registry/util/CidrAddressBlock.java
similarity index 100%
rename from java/com/google/domain/registry/util/CidrAddressBlock.java
rename to java/google/registry/util/CidrAddressBlock.java
diff --git a/java/com/google/domain/registry/util/Clock.java b/java/google/registry/util/Clock.java
similarity index 100%
rename from java/com/google/domain/registry/util/Clock.java
rename to java/google/registry/util/Clock.java
diff --git a/java/com/google/domain/registry/util/CollectionUtils.java b/java/google/registry/util/CollectionUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/CollectionUtils.java
rename to java/google/registry/util/CollectionUtils.java
diff --git a/java/com/google/domain/registry/util/Concurrent.java b/java/google/registry/util/Concurrent.java
similarity index 100%
rename from java/com/google/domain/registry/util/Concurrent.java
rename to java/google/registry/util/Concurrent.java
diff --git a/java/com/google/domain/registry/util/DatastoreServiceUtils.java b/java/google/registry/util/DatastoreServiceUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/DatastoreServiceUtils.java
rename to java/google/registry/util/DatastoreServiceUtils.java
diff --git a/java/com/google/domain/registry/util/DateTimeUtils.java b/java/google/registry/util/DateTimeUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/DateTimeUtils.java
rename to java/google/registry/util/DateTimeUtils.java
diff --git a/java/com/google/domain/registry/util/DiffUtils.java b/java/google/registry/util/DiffUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/DiffUtils.java
rename to java/google/registry/util/DiffUtils.java
diff --git a/java/com/google/domain/registry/util/DomainNameUtils.java b/java/google/registry/util/DomainNameUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/DomainNameUtils.java
rename to java/google/registry/util/DomainNameUtils.java
diff --git a/java/com/google/domain/registry/util/FixedClock.java b/java/google/registry/util/FixedClock.java
similarity index 100%
rename from java/com/google/domain/registry/util/FixedClock.java
rename to java/google/registry/util/FixedClock.java
diff --git a/java/com/google/domain/registry/util/FormattingLogger.java b/java/google/registry/util/FormattingLogger.java
similarity index 100%
rename from java/com/google/domain/registry/util/FormattingLogger.java
rename to java/google/registry/util/FormattingLogger.java
diff --git a/java/com/google/domain/registry/util/HexDumper.java b/java/google/registry/util/HexDumper.java
similarity index 100%
rename from java/com/google/domain/registry/util/HexDumper.java
rename to java/google/registry/util/HexDumper.java
diff --git a/java/com/google/domain/registry/util/Idn.java b/java/google/registry/util/Idn.java
similarity index 100%
rename from java/com/google/domain/registry/util/Idn.java
rename to java/google/registry/util/Idn.java
diff --git a/java/com/google/domain/registry/util/ImprovedInputStream.java b/java/google/registry/util/ImprovedInputStream.java
similarity index 100%
rename from java/com/google/domain/registry/util/ImprovedInputStream.java
rename to java/google/registry/util/ImprovedInputStream.java
diff --git a/java/com/google/domain/registry/util/ImprovedOutputStream.java b/java/google/registry/util/ImprovedOutputStream.java
similarity index 100%
rename from java/com/google/domain/registry/util/ImprovedOutputStream.java
rename to java/google/registry/util/ImprovedOutputStream.java
diff --git a/java/com/google/domain/registry/util/ListNamingUtils.java b/java/google/registry/util/ListNamingUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/ListNamingUtils.java
rename to java/google/registry/util/ListNamingUtils.java
diff --git a/java/com/google/domain/registry/util/NetworkUtils.java b/java/google/registry/util/NetworkUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/NetworkUtils.java
rename to java/google/registry/util/NetworkUtils.java
diff --git a/java/com/google/domain/registry/util/NonFinalForTesting.java b/java/google/registry/util/NonFinalForTesting.java
similarity index 100%
rename from java/com/google/domain/registry/util/NonFinalForTesting.java
rename to java/google/registry/util/NonFinalForTesting.java
diff --git a/java/com/google/domain/registry/util/ObjectifyUtils.java b/java/google/registry/util/ObjectifyUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/ObjectifyUtils.java
rename to java/google/registry/util/ObjectifyUtils.java
diff --git a/java/com/google/domain/registry/util/PathargMatcher.java b/java/google/registry/util/PathargMatcher.java
similarity index 100%
rename from java/com/google/domain/registry/util/PathargMatcher.java
rename to java/google/registry/util/PathargMatcher.java
diff --git a/java/com/google/domain/registry/util/PipelineUtils.java b/java/google/registry/util/PipelineUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/PipelineUtils.java
rename to java/google/registry/util/PipelineUtils.java
diff --git a/java/com/google/domain/registry/util/PosixTarHeader.java b/java/google/registry/util/PosixTarHeader.java
similarity index 100%
rename from java/com/google/domain/registry/util/PosixTarHeader.java
rename to java/google/registry/util/PosixTarHeader.java
diff --git a/java/com/google/domain/registry/util/PreconditionsUtils.java b/java/google/registry/util/PreconditionsUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/PreconditionsUtils.java
rename to java/google/registry/util/PreconditionsUtils.java
diff --git a/java/com/google/domain/registry/util/PredicateUtils.java b/java/google/registry/util/PredicateUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/PredicateUtils.java
rename to java/google/registry/util/PredicateUtils.java
diff --git a/java/com/google/domain/registry/util/RegistrarUtils.java b/java/google/registry/util/RegistrarUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/RegistrarUtils.java
rename to java/google/registry/util/RegistrarUtils.java
diff --git a/java/com/google/domain/registry/util/ResourceUtils.java b/java/google/registry/util/ResourceUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/ResourceUtils.java
rename to java/google/registry/util/ResourceUtils.java
diff --git a/java/com/google/domain/registry/util/Retrier.java b/java/google/registry/util/Retrier.java
similarity index 100%
rename from java/com/google/domain/registry/util/Retrier.java
rename to java/google/registry/util/Retrier.java
diff --git a/java/com/google/domain/registry/util/SendEmailService.java b/java/google/registry/util/SendEmailService.java
similarity index 100%
rename from java/com/google/domain/registry/util/SendEmailService.java
rename to java/google/registry/util/SendEmailService.java
diff --git a/java/com/google/domain/registry/util/SendEmailUtils.java b/java/google/registry/util/SendEmailUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/SendEmailUtils.java
rename to java/google/registry/util/SendEmailUtils.java
diff --git a/java/com/google/domain/registry/util/SerializeUtils.java b/java/google/registry/util/SerializeUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/SerializeUtils.java
rename to java/google/registry/util/SerializeUtils.java
diff --git a/java/com/google/domain/registry/util/Sleeper.java b/java/google/registry/util/Sleeper.java
similarity index 100%
rename from java/com/google/domain/registry/util/Sleeper.java
rename to java/google/registry/util/Sleeper.java
diff --git a/java/com/google/domain/registry/util/SqlTemplate.java b/java/google/registry/util/SqlTemplate.java
similarity index 100%
rename from java/com/google/domain/registry/util/SqlTemplate.java
rename to java/google/registry/util/SqlTemplate.java
diff --git a/java/com/google/domain/registry/util/SystemClock.java b/java/google/registry/util/SystemClock.java
similarity index 100%
rename from java/com/google/domain/registry/util/SystemClock.java
rename to java/google/registry/util/SystemClock.java
diff --git a/java/com/google/domain/registry/util/SystemSleeper.java b/java/google/registry/util/SystemSleeper.java
similarity index 100%
rename from java/com/google/domain/registry/util/SystemSleeper.java
rename to java/google/registry/util/SystemSleeper.java
diff --git a/java/com/google/domain/registry/util/TaskEnqueuer.java b/java/google/registry/util/TaskEnqueuer.java
similarity index 100%
rename from java/com/google/domain/registry/util/TaskEnqueuer.java
rename to java/google/registry/util/TaskEnqueuer.java
diff --git a/java/com/google/domain/registry/util/TeeOutputStream.java b/java/google/registry/util/TeeOutputStream.java
similarity index 100%
rename from java/com/google/domain/registry/util/TeeOutputStream.java
rename to java/google/registry/util/TeeOutputStream.java
diff --git a/java/com/google/domain/registry/util/TypeUtils.java b/java/google/registry/util/TypeUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/TypeUtils.java
rename to java/google/registry/util/TypeUtils.java
diff --git a/java/com/google/domain/registry/util/UrlFetchException.java b/java/google/registry/util/UrlFetchException.java
similarity index 100%
rename from java/com/google/domain/registry/util/UrlFetchException.java
rename to java/google/registry/util/UrlFetchException.java
diff --git a/java/com/google/domain/registry/util/UrlFetchUtils.java b/java/google/registry/util/UrlFetchUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/UrlFetchUtils.java
rename to java/google/registry/util/UrlFetchUtils.java
diff --git a/java/com/google/domain/registry/util/X509Utils.java b/java/google/registry/util/X509Utils.java
similarity index 100%
rename from java/com/google/domain/registry/util/X509Utils.java
rename to java/google/registry/util/X509Utils.java
diff --git a/java/com/google/domain/registry/util/XmlEnumUtils.java b/java/google/registry/util/XmlEnumUtils.java
similarity index 100%
rename from java/com/google/domain/registry/util/XmlEnumUtils.java
rename to java/google/registry/util/XmlEnumUtils.java
diff --git a/java/com/google/domain/registry/util/package-info.java b/java/google/registry/util/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/util/package-info.java
rename to java/google/registry/util/package-info.java
diff --git a/java/com/google/domain/registry/whois/BUILD b/java/google/registry/whois/BUILD
similarity index 100%
rename from java/com/google/domain/registry/whois/BUILD
rename to java/google/registry/whois/BUILD
diff --git a/java/com/google/domain/registry/whois/DomainLookupCommand.java b/java/google/registry/whois/DomainLookupCommand.java
similarity index 100%
rename from java/com/google/domain/registry/whois/DomainLookupCommand.java
rename to java/google/registry/whois/DomainLookupCommand.java
diff --git a/java/com/google/domain/registry/whois/DomainOrHostLookupCommand.java b/java/google/registry/whois/DomainOrHostLookupCommand.java
similarity index 100%
rename from java/com/google/domain/registry/whois/DomainOrHostLookupCommand.java
rename to java/google/registry/whois/DomainOrHostLookupCommand.java
diff --git a/java/com/google/domain/registry/whois/DomainWhoisResponse.java b/java/google/registry/whois/DomainWhoisResponse.java
similarity index 100%
rename from java/com/google/domain/registry/whois/DomainWhoisResponse.java
rename to java/google/registry/whois/DomainWhoisResponse.java
diff --git a/java/com/google/domain/registry/whois/NameserverLookupByHostCommand.java b/java/google/registry/whois/NameserverLookupByHostCommand.java
similarity index 100%
rename from java/com/google/domain/registry/whois/NameserverLookupByHostCommand.java
rename to java/google/registry/whois/NameserverLookupByHostCommand.java
diff --git a/java/com/google/domain/registry/whois/NameserverLookupByIpCommand.java b/java/google/registry/whois/NameserverLookupByIpCommand.java
similarity index 100%
rename from java/com/google/domain/registry/whois/NameserverLookupByIpCommand.java
rename to java/google/registry/whois/NameserverLookupByIpCommand.java
diff --git a/java/com/google/domain/registry/whois/NameserverWhoisResponse.java b/java/google/registry/whois/NameserverWhoisResponse.java
similarity index 100%
rename from java/com/google/domain/registry/whois/NameserverWhoisResponse.java
rename to java/google/registry/whois/NameserverWhoisResponse.java
diff --git a/java/com/google/domain/registry/whois/RegistrarLookupCommand.java b/java/google/registry/whois/RegistrarLookupCommand.java
similarity index 100%
rename from java/com/google/domain/registry/whois/RegistrarLookupCommand.java
rename to java/google/registry/whois/RegistrarLookupCommand.java
diff --git a/java/com/google/domain/registry/whois/RegistrarWhoisResponse.java b/java/google/registry/whois/RegistrarWhoisResponse.java
similarity index 100%
rename from java/com/google/domain/registry/whois/RegistrarWhoisResponse.java
rename to java/google/registry/whois/RegistrarWhoisResponse.java
diff --git a/java/com/google/domain/registry/whois/Whois.java b/java/google/registry/whois/Whois.java
similarity index 100%
rename from java/com/google/domain/registry/whois/Whois.java
rename to java/google/registry/whois/Whois.java
diff --git a/java/com/google/domain/registry/whois/WhoisCommand.java b/java/google/registry/whois/WhoisCommand.java
similarity index 100%
rename from java/com/google/domain/registry/whois/WhoisCommand.java
rename to java/google/registry/whois/WhoisCommand.java
diff --git a/java/com/google/domain/registry/whois/WhoisException.java b/java/google/registry/whois/WhoisException.java
similarity index 100%
rename from java/com/google/domain/registry/whois/WhoisException.java
rename to java/google/registry/whois/WhoisException.java
diff --git a/java/com/google/domain/registry/whois/WhoisHttpServer.java b/java/google/registry/whois/WhoisHttpServer.java
similarity index 100%
rename from java/com/google/domain/registry/whois/WhoisHttpServer.java
rename to java/google/registry/whois/WhoisHttpServer.java
diff --git a/java/com/google/domain/registry/whois/WhoisModule.java b/java/google/registry/whois/WhoisModule.java
similarity index 100%
rename from java/com/google/domain/registry/whois/WhoisModule.java
rename to java/google/registry/whois/WhoisModule.java
diff --git a/java/com/google/domain/registry/whois/WhoisReader.java b/java/google/registry/whois/WhoisReader.java
similarity index 100%
rename from java/com/google/domain/registry/whois/WhoisReader.java
rename to java/google/registry/whois/WhoisReader.java
diff --git a/java/com/google/domain/registry/whois/WhoisResponse.java b/java/google/registry/whois/WhoisResponse.java
similarity index 100%
rename from java/com/google/domain/registry/whois/WhoisResponse.java
rename to java/google/registry/whois/WhoisResponse.java
diff --git a/java/com/google/domain/registry/whois/WhoisResponseImpl.java b/java/google/registry/whois/WhoisResponseImpl.java
similarity index 100%
rename from java/com/google/domain/registry/whois/WhoisResponseImpl.java
rename to java/google/registry/whois/WhoisResponseImpl.java
diff --git a/java/com/google/domain/registry/whois/WhoisServer.java b/java/google/registry/whois/WhoisServer.java
similarity index 100%
rename from java/com/google/domain/registry/whois/WhoisServer.java
rename to java/google/registry/whois/WhoisServer.java
diff --git a/java/com/google/domain/registry/whois/disclaimer.txt b/java/google/registry/whois/disclaimer.txt
similarity index 100%
rename from java/com/google/domain/registry/whois/disclaimer.txt
rename to java/google/registry/whois/disclaimer.txt
diff --git a/java/com/google/domain/registry/whois/package-info.java b/java/google/registry/whois/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/whois/package-info.java
rename to java/google/registry/whois/package-info.java
diff --git a/java/com/google/domain/registry/xjc/BUILD b/java/google/registry/xjc/BUILD
similarity index 100%
rename from java/com/google/domain/registry/xjc/BUILD
rename to java/google/registry/xjc/BUILD
diff --git a/java/com/google/domain/registry/xjc/README.missing-code b/java/google/registry/xjc/README.missing-code
similarity index 100%
rename from java/com/google/domain/registry/xjc/README.missing-code
rename to java/google/registry/xjc/README.missing-code
diff --git a/java/com/google/domain/registry/xjc/XjcObject.java b/java/google/registry/xjc/XjcObject.java
similarity index 100%
rename from java/com/google/domain/registry/xjc/XjcObject.java
rename to java/google/registry/xjc/XjcObject.java
diff --git a/java/com/google/domain/registry/xjc/XjcXmlTransformer.java b/java/google/registry/xjc/XjcXmlTransformer.java
similarity index 100%
rename from java/com/google/domain/registry/xjc/XjcXmlTransformer.java
rename to java/google/registry/xjc/XjcXmlTransformer.java
diff --git a/java/com/google/domain/registry/xjc/bindings.xjb b/java/google/registry/xjc/bindings.xjb
similarity index 100%
rename from java/com/google/domain/registry/xjc/bindings.xjb
rename to java/google/registry/xjc/bindings.xjb
diff --git a/java/com/google/domain/registry/xjc/generated_files.bzl b/java/google/registry/xjc/generated_files.bzl
similarity index 100%
rename from java/com/google/domain/registry/xjc/generated_files.bzl
rename to java/google/registry/xjc/generated_files.bzl
diff --git a/java/com/google/domain/registry/xjc/list_generated_files.sh b/java/google/registry/xjc/list_generated_files.sh
similarity index 100%
rename from java/com/google/domain/registry/xjc/list_generated_files.sh
rename to java/google/registry/xjc/list_generated_files.sh
diff --git a/java/com/google/domain/registry/xjc/make_pkginfo.sh b/java/google/registry/xjc/make_pkginfo.sh
similarity index 100%
rename from java/com/google/domain/registry/xjc/make_pkginfo.sh
rename to java/google/registry/xjc/make_pkginfo.sh
diff --git a/java/com/google/domain/registry/xjc/package-info.java b/java/google/registry/xjc/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/xjc/package-info.java
rename to java/google/registry/xjc/package-info.java
diff --git a/java/com/google/domain/registry/xjc/package-info.java.in b/java/google/registry/xjc/package-info.java.in
similarity index 100%
rename from java/com/google/domain/registry/xjc/package-info.java.in
rename to java/google/registry/xjc/package-info.java.in
diff --git a/java/com/google/domain/registry/xml/BUILD b/java/google/registry/xml/BUILD
similarity index 100%
rename from java/com/google/domain/registry/xml/BUILD
rename to java/google/registry/xml/BUILD
diff --git a/java/com/google/domain/registry/xml/DateAdapter.java b/java/google/registry/xml/DateAdapter.java
similarity index 100%
rename from java/com/google/domain/registry/xml/DateAdapter.java
rename to java/google/registry/xml/DateAdapter.java
diff --git a/java/com/google/domain/registry/xml/PeriodAdapter.java b/java/google/registry/xml/PeriodAdapter.java
similarity index 100%
rename from java/com/google/domain/registry/xml/PeriodAdapter.java
rename to java/google/registry/xml/PeriodAdapter.java
diff --git a/java/com/google/domain/registry/xml/UtcDateTimeAdapter.java b/java/google/registry/xml/UtcDateTimeAdapter.java
similarity index 100%
rename from java/com/google/domain/registry/xml/UtcDateTimeAdapter.java
rename to java/google/registry/xml/UtcDateTimeAdapter.java
diff --git a/java/com/google/domain/registry/xml/ValidationMode.java b/java/google/registry/xml/ValidationMode.java
similarity index 100%
rename from java/com/google/domain/registry/xml/ValidationMode.java
rename to java/google/registry/xml/ValidationMode.java
diff --git a/java/com/google/domain/registry/xml/XmlException.java b/java/google/registry/xml/XmlException.java
similarity index 100%
rename from java/com/google/domain/registry/xml/XmlException.java
rename to java/google/registry/xml/XmlException.java
diff --git a/java/com/google/domain/registry/xml/XmlFragmentMarshaller.java b/java/google/registry/xml/XmlFragmentMarshaller.java
similarity index 100%
rename from java/com/google/domain/registry/xml/XmlFragmentMarshaller.java
rename to java/google/registry/xml/XmlFragmentMarshaller.java
diff --git a/java/com/google/domain/registry/xml/XmlTransformer.java b/java/google/registry/xml/XmlTransformer.java
similarity index 100%
rename from java/com/google/domain/registry/xml/XmlTransformer.java
rename to java/google/registry/xml/XmlTransformer.java
diff --git a/java/com/google/domain/registry/xml/package-info.java b/java/google/registry/xml/package-info.java
similarity index 100%
rename from java/com/google/domain/registry/xml/package-info.java
rename to java/google/registry/xml/package-info.java
diff --git a/java/com/google/domain/registry/xml/xsd/allocate.xsd b/java/google/registry/xml/xsd/allocate.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/allocate.xsd
rename to java/google/registry/xml/xsd/allocate.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/contact.xsd b/java/google/registry/xml/xsd/contact.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/contact.xsd
rename to java/google/registry/xml/xsd/contact.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/domain.xsd b/java/google/registry/xml/xsd/domain.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/domain.xsd
rename to java/google/registry/xml/xsd/domain.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/dsig.xsd b/java/google/registry/xml/xsd/dsig.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/dsig.xsd
rename to java/google/registry/xml/xsd/dsig.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/epp.xsd b/java/google/registry/xml/xsd/epp.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/epp.xsd
rename to java/google/registry/xml/xsd/epp.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/eppcom.xsd b/java/google/registry/xml/xsd/eppcom.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/eppcom.xsd
rename to java/google/registry/xml/xsd/eppcom.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/fee.xsd b/java/google/registry/xml/xsd/fee.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/fee.xsd
rename to java/google/registry/xml/xsd/fee.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/host.xsd b/java/google/registry/xml/xsd/host.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/host.xsd
rename to java/google/registry/xml/xsd/host.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/iirdea.xsd b/java/google/registry/xml/xsd/iirdea.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/iirdea.xsd
rename to java/google/registry/xml/xsd/iirdea.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/launch.xsd b/java/google/registry/xml/xsd/launch.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/launch.xsd
rename to java/google/registry/xml/xsd/launch.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/mark.xsd b/java/google/registry/xml/xsd/mark.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/mark.xsd
rename to java/google/registry/xml/xsd/mark.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/metadata.xsd b/java/google/registry/xml/xsd/metadata.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/metadata.xsd
rename to java/google/registry/xml/xsd/metadata.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-contact.xsd b/java/google/registry/xml/xsd/rde-contact.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-contact.xsd
rename to java/google/registry/xml/xsd/rde-contact.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-domain.xsd b/java/google/registry/xml/xsd/rde-domain.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-domain.xsd
rename to java/google/registry/xml/xsd/rde-domain.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-eppparams.xsd b/java/google/registry/xml/xsd/rde-eppparams.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-eppparams.xsd
rename to java/google/registry/xml/xsd/rde-eppparams.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-header.xsd b/java/google/registry/xml/xsd/rde-header.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-header.xsd
rename to java/google/registry/xml/xsd/rde-header.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-host.xsd b/java/google/registry/xml/xsd/rde-host.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-host.xsd
rename to java/google/registry/xml/xsd/rde-host.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-idn.xsd b/java/google/registry/xml/xsd/rde-idn.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-idn.xsd
rename to java/google/registry/xml/xsd/rde-idn.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-nndn.xsd b/java/google/registry/xml/xsd/rde-nndn.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-nndn.xsd
rename to java/google/registry/xml/xsd/rde-nndn.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-notification.xsd b/java/google/registry/xml/xsd/rde-notification.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-notification.xsd
rename to java/google/registry/xml/xsd/rde-notification.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-policy.xsd b/java/google/registry/xml/xsd/rde-policy.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-policy.xsd
rename to java/google/registry/xml/xsd/rde-policy.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-registrar.xsd b/java/google/registry/xml/xsd/rde-registrar.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-registrar.xsd
rename to java/google/registry/xml/xsd/rde-registrar.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde-report.xsd b/java/google/registry/xml/xsd/rde-report.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde-report.xsd
rename to java/google/registry/xml/xsd/rde-report.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rde.xsd b/java/google/registry/xml/xsd/rde.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rde.xsd
rename to java/google/registry/xml/xsd/rde.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/rgp.xsd b/java/google/registry/xml/xsd/rgp.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/rgp.xsd
rename to java/google/registry/xml/xsd/rgp.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/secdns.xsd b/java/google/registry/xml/xsd/secdns.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/secdns.xsd
rename to java/google/registry/xml/xsd/secdns.xsd
diff --git a/java/com/google/domain/registry/xml/xsd/smd.xsd b/java/google/registry/xml/xsd/smd.xsd
similarity index 100%
rename from java/com/google/domain/registry/xml/xsd/smd.xsd
rename to java/google/registry/xml/xsd/smd.xsd
diff --git a/javatests/com/google/domain/registry/backup/BUILD b/javatests/google/registry/backup/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/backup/BUILD
rename to javatests/google/registry/backup/BUILD
diff --git a/javatests/com/google/domain/registry/backup/CommitLogCheckpointActionTest.java b/javatests/google/registry/backup/CommitLogCheckpointActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/backup/CommitLogCheckpointActionTest.java
rename to javatests/google/registry/backup/CommitLogCheckpointActionTest.java
diff --git a/javatests/com/google/domain/registry/backup/CommitLogCheckpointStrategyTest.java b/javatests/google/registry/backup/CommitLogCheckpointStrategyTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/backup/CommitLogCheckpointStrategyTest.java
rename to javatests/google/registry/backup/CommitLogCheckpointStrategyTest.java
diff --git a/javatests/com/google/domain/registry/backup/DeleteOldCommitLogsActionTest.java b/javatests/google/registry/backup/DeleteOldCommitLogsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/backup/DeleteOldCommitLogsActionTest.java
rename to javatests/google/registry/backup/DeleteOldCommitLogsActionTest.java
diff --git a/javatests/com/google/domain/registry/backup/ExportCommitLogDiffActionTest.java b/javatests/google/registry/backup/ExportCommitLogDiffActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/backup/ExportCommitLogDiffActionTest.java
rename to javatests/google/registry/backup/ExportCommitLogDiffActionTest.java
diff --git a/javatests/com/google/domain/registry/backup/GcsDiffFileListerTest.java b/javatests/google/registry/backup/GcsDiffFileListerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/backup/GcsDiffFileListerTest.java
rename to javatests/google/registry/backup/GcsDiffFileListerTest.java
diff --git a/javatests/com/google/domain/registry/backup/RestoreCommitLogsActionTest.java b/javatests/google/registry/backup/RestoreCommitLogsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/backup/RestoreCommitLogsActionTest.java
rename to javatests/google/registry/backup/RestoreCommitLogsActionTest.java
diff --git a/javatests/com/google/domain/registry/bigquery/BUILD b/javatests/google/registry/bigquery/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/bigquery/BUILD
rename to javatests/google/registry/bigquery/BUILD
diff --git a/javatests/com/google/domain/registry/bigquery/BigqueryConnectionTest.java b/javatests/google/registry/bigquery/BigqueryConnectionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/bigquery/BigqueryConnectionTest.java
rename to javatests/google/registry/bigquery/BigqueryConnectionTest.java
diff --git a/javatests/com/google/domain/registry/bigquery/BigqueryFactoryTest.java b/javatests/google/registry/bigquery/BigqueryFactoryTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/bigquery/BigqueryFactoryTest.java
rename to javatests/google/registry/bigquery/BigqueryFactoryTest.java
diff --git a/javatests/com/google/domain/registry/bigquery/BigqueryUtilsTest.java b/javatests/google/registry/bigquery/BigqueryUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/bigquery/BigqueryUtilsTest.java
rename to javatests/google/registry/bigquery/BigqueryUtilsTest.java
diff --git a/javatests/com/google/domain/registry/config/BUILD b/javatests/google/registry/config/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/config/BUILD
rename to javatests/google/registry/config/BUILD
diff --git a/javatests/com/google/domain/registry/config/RegistryEnvironmentTest.java b/javatests/google/registry/config/RegistryEnvironmentTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/config/RegistryEnvironmentTest.java
rename to javatests/google/registry/config/RegistryEnvironmentTest.java
diff --git a/javatests/com/google/domain/registry/cron/BUILD b/javatests/google/registry/cron/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/cron/BUILD
rename to javatests/google/registry/cron/BUILD
diff --git a/javatests/com/google/domain/registry/cron/CommitLogFanoutActionTest.java b/javatests/google/registry/cron/CommitLogFanoutActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/cron/CommitLogFanoutActionTest.java
rename to javatests/google/registry/cron/CommitLogFanoutActionTest.java
diff --git a/javatests/com/google/domain/registry/cron/TldFanoutActionTest.java b/javatests/google/registry/cron/TldFanoutActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/cron/TldFanoutActionTest.java
rename to javatests/google/registry/cron/TldFanoutActionTest.java
diff --git a/javatests/com/google/domain/registry/dns/BUILD b/javatests/google/registry/dns/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/dns/BUILD
rename to javatests/google/registry/dns/BUILD
diff --git a/javatests/com/google/domain/registry/dns/DnsInjectionTest.java b/javatests/google/registry/dns/DnsInjectionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/dns/DnsInjectionTest.java
rename to javatests/google/registry/dns/DnsInjectionTest.java
diff --git a/javatests/com/google/domain/registry/dns/DnsQueueTest.java b/javatests/google/registry/dns/DnsQueueTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/dns/DnsQueueTest.java
rename to javatests/google/registry/dns/DnsQueueTest.java
diff --git a/javatests/com/google/domain/registry/dns/DnsTestComponent.java b/javatests/google/registry/dns/DnsTestComponent.java
similarity index 100%
rename from javatests/com/google/domain/registry/dns/DnsTestComponent.java
rename to javatests/google/registry/dns/DnsTestComponent.java
diff --git a/javatests/com/google/domain/registry/dns/PublishDnsUpdatesActionTest.java b/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/dns/PublishDnsUpdatesActionTest.java
rename to javatests/google/registry/dns/PublishDnsUpdatesActionTest.java
diff --git a/javatests/com/google/domain/registry/dns/ReadDnsQueueActionTest.java b/javatests/google/registry/dns/ReadDnsQueueActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/dns/ReadDnsQueueActionTest.java
rename to javatests/google/registry/dns/ReadDnsQueueActionTest.java
diff --git a/javatests/com/google/domain/registry/dns/RefreshDnsActionTest.java b/javatests/google/registry/dns/RefreshDnsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/dns/RefreshDnsActionTest.java
rename to javatests/google/registry/dns/RefreshDnsActionTest.java
diff --git a/javatests/com/google/domain/registry/dns/WriteDnsActionTest.java b/javatests/google/registry/dns/WriteDnsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/dns/WriteDnsActionTest.java
rename to javatests/google/registry/dns/WriteDnsActionTest.java
diff --git a/javatests/com/google/domain/registry/dns/writer/api/BUILD b/javatests/google/registry/dns/writer/api/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/dns/writer/api/BUILD
rename to javatests/google/registry/dns/writer/api/BUILD
diff --git a/javatests/com/google/domain/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java b/javatests/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java
rename to javatests/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java
diff --git a/javatests/com/google/domain/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java b/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java
rename to javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java
diff --git a/javatests/com/google/domain/registry/export/BUILD b/javatests/google/registry/export/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/export/BUILD
rename to javatests/google/registry/export/BUILD
diff --git a/javatests/com/google/domain/registry/export/BigqueryPollJobActionTest.java b/javatests/google/registry/export/BigqueryPollJobActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/BigqueryPollJobActionTest.java
rename to javatests/google/registry/export/BigqueryPollJobActionTest.java
diff --git a/javatests/com/google/domain/registry/export/CheckSnapshotServletTest.java b/javatests/google/registry/export/CheckSnapshotServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/CheckSnapshotServletTest.java
rename to javatests/google/registry/export/CheckSnapshotServletTest.java
diff --git a/javatests/com/google/domain/registry/export/DatastoreBackupInfoTest.java b/javatests/google/registry/export/DatastoreBackupInfoTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/DatastoreBackupInfoTest.java
rename to javatests/google/registry/export/DatastoreBackupInfoTest.java
diff --git a/javatests/com/google/domain/registry/export/DatastoreBackupServiceTest.java b/javatests/google/registry/export/DatastoreBackupServiceTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/DatastoreBackupServiceTest.java
rename to javatests/google/registry/export/DatastoreBackupServiceTest.java
diff --git a/javatests/com/google/domain/registry/export/ExportConstantsTest.java b/javatests/google/registry/export/ExportConstantsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/ExportConstantsTest.java
rename to javatests/google/registry/export/ExportConstantsTest.java
diff --git a/javatests/com/google/domain/registry/export/ExportDomainListsActionTest.java b/javatests/google/registry/export/ExportDomainListsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/ExportDomainListsActionTest.java
rename to javatests/google/registry/export/ExportDomainListsActionTest.java
diff --git a/javatests/com/google/domain/registry/export/ExportReservedTermsActionTest.java b/javatests/google/registry/export/ExportReservedTermsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/ExportReservedTermsActionTest.java
rename to javatests/google/registry/export/ExportReservedTermsActionTest.java
diff --git a/javatests/com/google/domain/registry/export/ExportSnapshotServletTest.java b/javatests/google/registry/export/ExportSnapshotServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/ExportSnapshotServletTest.java
rename to javatests/google/registry/export/ExportSnapshotServletTest.java
diff --git a/javatests/com/google/domain/registry/export/ExportUtilsTest.java b/javatests/google/registry/export/ExportUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/ExportUtilsTest.java
rename to javatests/google/registry/export/ExportUtilsTest.java
diff --git a/javatests/com/google/domain/registry/export/LoadSnapshotActionTest.java b/javatests/google/registry/export/LoadSnapshotActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/LoadSnapshotActionTest.java
rename to javatests/google/registry/export/LoadSnapshotActionTest.java
diff --git a/javatests/com/google/domain/registry/export/PublishDetailReportActionTest.java b/javatests/google/registry/export/PublishDetailReportActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/PublishDetailReportActionTest.java
rename to javatests/google/registry/export/PublishDetailReportActionTest.java
diff --git a/javatests/com/google/domain/registry/export/SyncGroupMembersActionTest.java b/javatests/google/registry/export/SyncGroupMembersActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/SyncGroupMembersActionTest.java
rename to javatests/google/registry/export/SyncGroupMembersActionTest.java
diff --git a/javatests/com/google/domain/registry/export/UpdateSnapshotViewActionTest.java b/javatests/google/registry/export/UpdateSnapshotViewActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/UpdateSnapshotViewActionTest.java
rename to javatests/google/registry/export/UpdateSnapshotViewActionTest.java
diff --git a/javatests/com/google/domain/registry/export/backup_kinds.txt b/javatests/google/registry/export/backup_kinds.txt
similarity index 100%
rename from javatests/com/google/domain/registry/export/backup_kinds.txt
rename to javatests/google/registry/export/backup_kinds.txt
diff --git a/javatests/com/google/domain/registry/export/sheet/BUILD b/javatests/google/registry/export/sheet/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/export/sheet/BUILD
rename to javatests/google/registry/export/sheet/BUILD
diff --git a/javatests/com/google/domain/registry/export/sheet/SheetSynchronizerTest.java b/javatests/google/registry/export/sheet/SheetSynchronizerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/sheet/SheetSynchronizerTest.java
rename to javatests/google/registry/export/sheet/SheetSynchronizerTest.java
diff --git a/javatests/com/google/domain/registry/export/sheet/SyncRegistrarsSheetActionTest.java b/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/sheet/SyncRegistrarsSheetActionTest.java
rename to javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java
diff --git a/javatests/com/google/domain/registry/export/sheet/SyncRegistrarsSheetTest.java b/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/export/sheet/SyncRegistrarsSheetTest.java
rename to javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java
diff --git a/javatests/com/google/domain/registry/export/testdata/contact_create.xml b/javatests/google/registry/export/testdata/contact_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/export/testdata/contact_create.xml
rename to javatests/google/registry/export/testdata/contact_create.xml
diff --git a/javatests/com/google/domain/registry/export/testdata/domain_allocate.xml b/javatests/google/registry/export/testdata/domain_allocate.xml
similarity index 100%
rename from javatests/com/google/domain/registry/export/testdata/domain_allocate.xml
rename to javatests/google/registry/export/testdata/domain_allocate.xml
diff --git a/javatests/com/google/domain/registry/export/testdata/domain_create.xml b/javatests/google/registry/export/testdata/domain_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/export/testdata/domain_create.xml
rename to javatests/google/registry/export/testdata/domain_create.xml
diff --git a/javatests/com/google/domain/registry/export/testdata/domain_create_sunrise_encoded_signed_mark.xml b/javatests/google/registry/export/testdata/domain_create_sunrise_encoded_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/export/testdata/domain_create_sunrise_encoded_signed_mark.xml
rename to javatests/google/registry/export/testdata/domain_create_sunrise_encoded_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/export/testdata/domain_renew.xml b/javatests/google/registry/export/testdata/domain_renew.xml
similarity index 100%
rename from javatests/com/google/domain/registry/export/testdata/domain_renew.xml
rename to javatests/google/registry/export/testdata/domain_renew.xml
diff --git a/javatests/com/google/domain/registry/flows/BUILD b/javatests/google/registry/flows/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/flows/BUILD
rename to javatests/google/registry/flows/BUILD
diff --git a/javatests/com/google/domain/registry/flows/EppConsoleAsAdminServletTest.java b/javatests/google/registry/flows/EppConsoleAsAdminServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/EppConsoleAsAdminServletTest.java
rename to javatests/google/registry/flows/EppConsoleAsAdminServletTest.java
diff --git a/javatests/com/google/domain/registry/flows/EppConsoleServletTest.java b/javatests/google/registry/flows/EppConsoleServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/EppConsoleServletTest.java
rename to javatests/google/registry/flows/EppConsoleServletTest.java
diff --git a/javatests/com/google/domain/registry/flows/EppControllerTest.java b/javatests/google/registry/flows/EppControllerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/EppControllerTest.java
rename to javatests/google/registry/flows/EppControllerTest.java
diff --git a/javatests/com/google/domain/registry/flows/EppServletTestCase.java b/javatests/google/registry/flows/EppServletTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/EppServletTestCase.java
rename to javatests/google/registry/flows/EppServletTestCase.java
diff --git a/javatests/com/google/domain/registry/flows/EppServletXmlLoginTestCase.java b/javatests/google/registry/flows/EppServletXmlLoginTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/EppServletXmlLoginTestCase.java
rename to javatests/google/registry/flows/EppServletXmlLoginTestCase.java
diff --git a/javatests/com/google/domain/registry/flows/EppTlsServletTest.java b/javatests/google/registry/flows/EppTlsServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/EppTlsServletTest.java
rename to javatests/google/registry/flows/EppTlsServletTest.java
diff --git a/javatests/com/google/domain/registry/flows/EppToolServletTest.java b/javatests/google/registry/flows/EppToolServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/EppToolServletTest.java
rename to javatests/google/registry/flows/EppToolServletTest.java
diff --git a/javatests/com/google/domain/registry/flows/FlowTestCase.java b/javatests/google/registry/flows/FlowTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/FlowTestCase.java
rename to javatests/google/registry/flows/FlowTestCase.java
diff --git a/javatests/com/google/domain/registry/flows/ResourceCheckFlowTestCase.java b/javatests/google/registry/flows/ResourceCheckFlowTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/ResourceCheckFlowTestCase.java
rename to javatests/google/registry/flows/ResourceCheckFlowTestCase.java
diff --git a/javatests/com/google/domain/registry/flows/ResourceFlowTestCase.java b/javatests/google/registry/flows/ResourceFlowTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/ResourceFlowTestCase.java
rename to javatests/google/registry/flows/ResourceFlowTestCase.java
diff --git a/javatests/com/google/domain/registry/flows/async/DeleteContactResourceActionTest.java b/javatests/google/registry/flows/async/DeleteContactResourceActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/async/DeleteContactResourceActionTest.java
rename to javatests/google/registry/flows/async/DeleteContactResourceActionTest.java
diff --git a/javatests/com/google/domain/registry/flows/async/DeleteEppResourceActionTestCase.java b/javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/async/DeleteEppResourceActionTestCase.java
rename to javatests/google/registry/flows/async/DeleteEppResourceActionTestCase.java
diff --git a/javatests/com/google/domain/registry/flows/async/DeleteHostResourceActionTest.java b/javatests/google/registry/flows/async/DeleteHostResourceActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/async/DeleteHostResourceActionTest.java
rename to javatests/google/registry/flows/async/DeleteHostResourceActionTest.java
diff --git a/javatests/com/google/domain/registry/flows/async/DnsRefreshForHostRenameActionTest.java b/javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/async/DnsRefreshForHostRenameActionTest.java
rename to javatests/google/registry/flows/async/DnsRefreshForHostRenameActionTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactCheckFlowTest.java b/javatests/google/registry/flows/contact/ContactCheckFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactCheckFlowTest.java
rename to javatests/google/registry/flows/contact/ContactCheckFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactCreateFlowTest.java b/javatests/google/registry/flows/contact/ContactCreateFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactCreateFlowTest.java
rename to javatests/google/registry/flows/contact/ContactCreateFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactDeleteFlowTest.java b/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactDeleteFlowTest.java
rename to javatests/google/registry/flows/contact/ContactDeleteFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactInfoFlowTest.java b/javatests/google/registry/flows/contact/ContactInfoFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactInfoFlowTest.java
rename to javatests/google/registry/flows/contact/ContactInfoFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactTransferApproveFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferApproveFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactTransferApproveFlowTest.java
rename to javatests/google/registry/flows/contact/ContactTransferApproveFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactTransferCancelFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferCancelFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactTransferCancelFlowTest.java
rename to javatests/google/registry/flows/contact/ContactTransferCancelFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactTransferFlowTestCase.java b/javatests/google/registry/flows/contact/ContactTransferFlowTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactTransferFlowTestCase.java
rename to javatests/google/registry/flows/contact/ContactTransferFlowTestCase.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactTransferQueryFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferQueryFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactTransferQueryFlowTest.java
rename to javatests/google/registry/flows/contact/ContactTransferQueryFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactTransferRejectFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferRejectFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactTransferRejectFlowTest.java
rename to javatests/google/registry/flows/contact/ContactTransferRejectFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactTransferRequestFlowTest.java b/javatests/google/registry/flows/contact/ContactTransferRequestFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactTransferRequestFlowTest.java
rename to javatests/google/registry/flows/contact/ContactTransferRequestFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/ContactUpdateFlowTest.java b/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/ContactUpdateFlowTest.java
rename to javatests/google/registry/flows/contact/ContactUpdateFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_check.xml b/javatests/google/registry/flows/contact/testdata/contact_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_check.xml
rename to javatests/google/registry/flows/contact/testdata/contact_check.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_check_50.xml b/javatests/google/registry/flows/contact/testdata/contact_check_50.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_check_50.xml
rename to javatests/google/registry/flows/contact/testdata/contact_check_50.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_check_51.xml b/javatests/google/registry/flows/contact/testdata/contact_check_51.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_check_51.xml
rename to javatests/google/registry/flows/contact/testdata/contact_check_51.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_check_response.xml b/javatests/google/registry/flows/contact/testdata/contact_check_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_check_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_check_response.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_create.xml b/javatests/google/registry/flows/contact/testdata/contact_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_create.xml
rename to javatests/google/registry/flows/contact/testdata/contact_create.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_create_decline_disclosure.xml b/javatests/google/registry/flows/contact/testdata/contact_create_decline_disclosure.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_create_decline_disclosure.xml
rename to javatests/google/registry/flows/contact/testdata/contact_create_decline_disclosure.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_create_hebrew_int.xml b/javatests/google/registry/flows/contact/testdata/contact_create_hebrew_int.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_create_hebrew_int.xml
rename to javatests/google/registry/flows/contact/testdata/contact_create_hebrew_int.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_create_hebrew_loc.xml b/javatests/google/registry/flows/contact/testdata/contact_create_hebrew_loc.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_create_hebrew_loc.xml
rename to javatests/google/registry/flows/contact/testdata/contact_create_hebrew_loc.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_create_response.xml b/javatests/google/registry/flows/contact/testdata/contact_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_create_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_create_response.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_delete.xml b/javatests/google/registry/flows/contact/testdata/contact_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_delete.xml
rename to javatests/google/registry/flows/contact/testdata/contact_delete.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_delete_response.xml b/javatests/google/registry/flows/contact/testdata/contact_delete_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_delete_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_delete_response.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_info.xml b/javatests/google/registry/flows/contact/testdata/contact_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_info.xml
rename to javatests/google/registry/flows/contact/testdata/contact_info.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_info_response.xml b/javatests/google/registry/flows/contact/testdata/contact_info_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_info_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_info_response.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_info_response_linked.xml b/javatests/google/registry/flows/contact/testdata/contact_info_response_linked.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_info_response_linked.xml
rename to javatests/google/registry/flows/contact/testdata/contact_info_response_linked.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_approve.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_approve.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_approve.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_approve.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_approve_response.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_approve_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_approve_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_approve_response.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_cancel.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_cancel.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_cancel.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_cancel.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_cancel_response.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_cancel_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_cancel_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_cancel_response.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_query.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_query.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_query_response.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_reject.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_reject.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_reject.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_reject.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_reject_response.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_reject_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_reject_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_reject_response.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_request.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_request.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_request.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_request_response.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_request_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_request_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_request_response.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_request_response_15_minutes.xml b/javatests/google/registry/flows/contact/testdata/contact_transfer_request_response_15_minutes.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_transfer_request_response_15_minutes.xml
rename to javatests/google/registry/flows/contact/testdata/contact_transfer_request_response_15_minutes.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_update.xml b/javatests/google/registry/flows/contact/testdata/contact_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_update.xml
rename to javatests/google/registry/flows/contact/testdata/contact_update.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_update_decline_disclosure.xml b/javatests/google/registry/flows/contact/testdata/contact_update_decline_disclosure.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_update_decline_disclosure.xml
rename to javatests/google/registry/flows/contact/testdata/contact_update_decline_disclosure.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_update_hebrew_int.xml b/javatests/google/registry/flows/contact/testdata/contact_update_hebrew_int.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_update_hebrew_int.xml
rename to javatests/google/registry/flows/contact/testdata/contact_update_hebrew_int.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_update_hebrew_loc.xml b/javatests/google/registry/flows/contact/testdata/contact_update_hebrew_loc.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_update_hebrew_loc.xml
rename to javatests/google/registry/flows/contact/testdata/contact_update_hebrew_loc.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml b/javatests/google/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml
rename to javatests/google/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_update_prohibited_status.xml b/javatests/google/registry/flows/contact/testdata/contact_update_prohibited_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_update_prohibited_status.xml
rename to javatests/google/registry/flows/contact/testdata/contact_update_prohibited_status.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml b/javatests/google/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml
rename to javatests/google/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml
diff --git a/javatests/com/google/domain/registry/flows/contact/testdata/contact_update_response.xml b/javatests/google/registry/flows/contact/testdata/contact_update_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/contact/testdata/contact_update_response.xml
rename to javatests/google/registry/flows/contact/testdata/contact_update_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/ClaimsCheckFlowTest.java b/javatests/google/registry/flows/domain/ClaimsCheckFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/ClaimsCheckFlowTest.java
rename to javatests/google/registry/flows/domain/ClaimsCheckFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainAllocateFlowTest.java b/javatests/google/registry/flows/domain/DomainAllocateFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainAllocateFlowTest.java
rename to javatests/google/registry/flows/domain/DomainAllocateFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainApplicationCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainApplicationCreateFlowTest.java
rename to javatests/google/registry/flows/domain/DomainApplicationCreateFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainApplicationDeleteFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainApplicationDeleteFlowTest.java
rename to javatests/google/registry/flows/domain/DomainApplicationDeleteFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainApplicationInfoFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationInfoFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainApplicationInfoFlowTest.java
rename to javatests/google/registry/flows/domain/DomainApplicationInfoFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainApplicationUpdateFlowTest.java b/javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainApplicationUpdateFlowTest.java
rename to javatests/google/registry/flows/domain/DomainApplicationUpdateFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainCheckFlowTest.java b/javatests/google/registry/flows/domain/DomainCheckFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainCheckFlowTest.java
rename to javatests/google/registry/flows/domain/DomainCheckFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainCreateFlowTest.java b/javatests/google/registry/flows/domain/DomainCreateFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainCreateFlowTest.java
rename to javatests/google/registry/flows/domain/DomainCreateFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainDeleteFlowTest.java b/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainDeleteFlowTest.java
rename to javatests/google/registry/flows/domain/DomainDeleteFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainInfoFlowTest.java b/javatests/google/registry/flows/domain/DomainInfoFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainInfoFlowTest.java
rename to javatests/google/registry/flows/domain/DomainInfoFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainRenewFlowTest.java b/javatests/google/registry/flows/domain/DomainRenewFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainRenewFlowTest.java
rename to javatests/google/registry/flows/domain/DomainRenewFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainRestoreRequestFlowTest.java b/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainRestoreRequestFlowTest.java
rename to javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainTransferApproveFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferApproveFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainTransferApproveFlowTest.java
rename to javatests/google/registry/flows/domain/DomainTransferApproveFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainTransferCancelFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferCancelFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainTransferCancelFlowTest.java
rename to javatests/google/registry/flows/domain/DomainTransferCancelFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainTransferFlowTestCase.java b/javatests/google/registry/flows/domain/DomainTransferFlowTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainTransferFlowTestCase.java
rename to javatests/google/registry/flows/domain/DomainTransferFlowTestCase.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainTransferQueryFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferQueryFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainTransferQueryFlowTest.java
rename to javatests/google/registry/flows/domain/DomainTransferQueryFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainTransferRejectFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferRejectFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainTransferRejectFlowTest.java
rename to javatests/google/registry/flows/domain/DomainTransferRejectFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainTransferRequestFlowTest.java b/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainTransferRequestFlowTest.java
rename to javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/DomainUpdateFlowTest.java b/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/DomainUpdateFlowTest.java
rename to javatests/google/registry/flows/domain/DomainUpdateFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_13_nameservers.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_13_nameservers.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_13_nameservers.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_13_nameservers.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_bad_application_roid.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_bad_application_roid.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_bad_application_roid.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_bad_application_roid.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_bad_checksum.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_bad_checksum.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_bad_checksum.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_bad_checksum.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_claims_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_claims_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_claims_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_claims_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_collision.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_collision.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_collision.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_collision.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_dsdata.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_dsdata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_dsdata.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_dsdata.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_dsdata_8_records.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_dsdata_8_records.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_dsdata_8_records.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_dsdata_8_records.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_idn.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_idn.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_idn.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_idn.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_no_nameservers.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_no_nameservers.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_no_nameservers.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_no_nameservers.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_reserved.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_reserved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_reserved.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_reserved.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_response.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_smd_id.xml b/javatests/google/registry/flows/domain/testdata/domain_allocate_smd_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_allocate_smd_id.xml
rename to javatests/google/registry/flows/domain/testdata/domain_allocate_smd_id.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check.xml b/javatests/google/registry/flows/domain/testdata/domain_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_50.xml b/javatests/google/registry/flows/domain/testdata/domain_check_50.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_50.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_50.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_51.xml b/javatests/google/registry/flows/domain/testdata/domain_check_51.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_51.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_51.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_anchor.xml b/javatests/google/registry/flows/domain/testdata/domain_check_anchor.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_anchor.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_anchor.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_avail.xml b/javatests/google/registry/flows/domain/testdata/domain_check_avail.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_avail.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_avail.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims.xml b/javatests/google/registry/flows/domain/testdata/domain_check_claims.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_claims.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_50.xml b/javatests/google/registry/flows/domain/testdata/domain_check_claims_50.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_50.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_claims_50.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_51.xml b/javatests/google/registry/flows/domain/testdata/domain_check_claims_51.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_51.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_claims_51.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml b/javatests/google/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml b/javatests/google/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_response.xml b/javatests/google/registry/flows/domain/testdata/domain_check_claims_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_claims_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml b/javatests/google/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_response_none.xml b/javatests/google/registry/flows/domain/testdata/domain_check_claims_response_none.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_claims_response_none.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_claims_response_none.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_duplicates.xml b/javatests/google/registry/flows/domain/testdata/domain_check_duplicates.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_duplicates.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_duplicates.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_bad_period.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_bad_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_bad_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_bad_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_command_phase.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_command_phase.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_command_phase.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_command_phase.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_command_subphase.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_command_subphase.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_command_subphase.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_command_subphase.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_euro.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_euro.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_euro.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_euro.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_fractional.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_fractional.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_fractional.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_fractional.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_invalid_command.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_invalid_command.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_invalid_command.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_invalid_command.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_multiple_commands.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_multiple_commands.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_multiyear_restore.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_multiyear_restore.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_premium_response.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_premium_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_reserved.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_reserved.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_reserved_response.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_reserved_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_response.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_unknown_command.xml b/javatests/google/registry/flows/domain/testdata/domain_check_fee_unknown_command.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_fee_unknown_command.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_fee_unknown_command.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml b/javatests/google/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_one_tld.xml b/javatests/google/registry/flows/domain/testdata/domain_check_one_tld.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_one_tld.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_one_tld.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml b/javatests/google/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_one_tld_response.xml b/javatests/google/registry/flows/domain/testdata/domain_check_one_tld_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_one_tld_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_one_tld_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_check_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_check_template.xml b/javatests/google/registry/flows/domain/testdata/domain_check_template.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_check_template.xml
rename to javatests/google/registry/flows/domain/testdata/domain_check_template.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create.xml b/javatests/google/registry/flows/domain/testdata/domain_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_13_nameservers.xml b/javatests/google/registry/flows/domain/testdata/domain_create_13_nameservers.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_13_nameservers.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_13_nameservers.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_14_nameservers.xml b/javatests/google/registry/flows/domain/testdata/domain_create_14_nameservers.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_14_nameservers.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_14_nameservers.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_anchor_authcode.xml b/javatests/google/registry/flows/domain/testdata/domain_create_anchor_authcode.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_anchor_authcode.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_anchor_authcode.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_anchor_tenant.xml b/javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_anchor_tenant.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_anchor_wrong_authcode.xml b/javatests/google/registry/flows/domain/testdata/domain_create_anchor_wrong_authcode.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_anchor_wrong_authcode.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_anchor_wrong_authcode.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml b/javatests/google/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_bad_validator_id.xml b/javatests/google/registry/flows/domain/testdata/domain_create_bad_validator_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_bad_validator_id.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_bad_validator_id.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_claim_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_create_claim_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_claim_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_claim_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_code_with_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_code_with_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_code_with_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_code_with_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_dsdata.xml b/javatests/google/registry/flows/domain/testdata/domain_create_dsdata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_dsdata.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_dsdata.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml b/javatests/google/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml b/javatests/google/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml b/javatests/google/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_duplicate_contact.xml b/javatests/google/registry/flows/domain/testdata/domain_create_duplicate_contact.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_duplicate_contact.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_duplicate_contact.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_create_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_applied.xml b/javatests/google/registry/flows/domain/testdata/domain_create_fee_applied.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_applied.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_fee_applied.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml b/javatests/google/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_defaults.xml b/javatests/google/registry/flows/domain/testdata/domain_create_fee_defaults.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_defaults.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_fee_defaults.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_grace_period.xml b/javatests/google/registry/flows/domain/testdata/domain_create_fee_grace_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_grace_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_fee_grace_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_refundable.xml b/javatests/google/registry/flows/domain/testdata/domain_create_fee_refundable.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_fee_refundable.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_fee_refundable.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_idn_minna.xml b/javatests/google/registry/flows/domain/testdata/domain_create_idn_minna.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_idn_minna.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_idn_minna.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_allowedinsunrise.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_allowedinsunrise.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_allowedinsunrise.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_allowedinsunrise.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_claim_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_claim_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_claim_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_claim_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_applied.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_applied.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_applied.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_applied.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_bad_scale.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_bad_scale.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_bad_scale.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_bad_scale.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_defaults.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_defaults.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_defaults.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_defaults.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_grace_period.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_grace_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_grace_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_grace_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_refundable.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_refundable.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_refundable.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_refundable.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_fee_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_fee_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_months.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_months.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_months.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_months.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_premium_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_premium_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_premium_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_premium_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_response_claims.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_response_claims.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_response_claims.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_response_claims.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_signed_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_signed_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_two_years.xml b/javatests/google/registry/flows/domain/testdata/domain_create_landrush_two_years.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_landrush_two_years.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_landrush_two_years.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml b/javatests/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml b/javatests/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_metadata.xml b/javatests/google/registry/flows/domain/testdata/domain_create_metadata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_metadata.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_metadata.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_admin.xml b/javatests/google/registry/flows/domain/testdata/domain_create_missing_admin.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_admin.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_missing_admin.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_contact_type.xml b/javatests/google/registry/flows/domain/testdata/domain_create_missing_contact_type.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_contact_type.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_missing_contact_type.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_period.xml b/javatests/google/registry/flows/domain/testdata/domain_create_missing_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_missing_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_registrant.xml b/javatests/google/registry/flows/domain/testdata/domain_create_missing_registrant.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_registrant.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_missing_registrant.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_tech.xml b/javatests/google/registry/flows/domain/testdata/domain_create_missing_tech.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_missing_tech.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_missing_tech.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_months.xml b/javatests/google/registry/flows/domain/testdata/domain_create_months.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_months.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_months.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml b/javatests/google/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_create_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_landrush.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_landrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_landrush.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_landrush.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_landrush.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_landrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_landrush.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_landrush.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_landrush_claims_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_landrush_claims_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_landrush_claims_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_landrush_claims_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_landrush_encoded_signed_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_landrush_encoded_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_landrush_encoded_signed_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_landrush_encoded_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise_claims_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise_claims_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise_claims_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise_claims_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise_encoded_signed_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise_encoded_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise_encoded_signed_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrise_encoded_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush_claims_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush_claims_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush_claims_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush_claims_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush_encoded_signed_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush_encoded_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush_encoded_signed_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_qlp_sunrush_encoded_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_sunrise.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_sunrise.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_sunrise.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_sunrise.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_sunrush.xml b/javatests/google/registry/flows/domain/testdata/domain_create_registration_sunrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_registration_sunrush.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_registration_sunrush.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_reserved.xml b/javatests/google/registry/flows/domain/testdata/domain_create_reserved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_reserved.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_reserved.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_reserved_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_reserved_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_reserved_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_reserved_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_claims.xml b/javatests/google/registry/flows/domain/testdata/domain_create_response_claims.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_claims.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_response_claims.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_encoded_signed_mark_name.xml b/javatests/google/registry/flows/domain/testdata/domain_create_response_encoded_signed_mark_name.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_encoded_signed_mark_name.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_response_encoded_signed_mark_name.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_create_response_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_response_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_idn_minna.xml b/javatests/google/registry/flows/domain/testdata/domain_create_response_idn_minna.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_idn_minna.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_response_idn_minna.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_create_response_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_response_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_wildcard.xml b/javatests/google/registry/flows/domain/testdata/domain_create_response_wildcard.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_response_wildcard.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_response_wildcard.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_signed_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_signed_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_bad_encoded_xml.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_bad_encoded_xml.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_bad_encoded_xml.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_bad_encoded_xml.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_bad_encoding.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_bad_encoding.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_bad_encoding.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_bad_encoding.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_code_with_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_code_with_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_code_with_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_code_with_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_duplicate_contact.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_duplicate_contact.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_duplicate_contact.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_duplicate_contact.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_empty_encoded_signed_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_empty_encoded_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_empty_encoded_signed_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_empty_encoded_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_with_whitespace.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_with_whitespace.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_with_whitespace.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_with_whitespace.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_hex_encoding.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_hex_encoding.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_hex_encoding.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_hex_encoding.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_missing_contact_type.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_missing_contact_type.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_missing_contact_type.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_missing_contact_type.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_no_matching_marks.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_no_matching_marks.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_no_matching_marks.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_no_matching_marks.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_and_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_and_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_and_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_and_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_reserved.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_reserved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_reserved.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_reserved.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_reserved_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_reserved_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_reserved_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_reserved_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_uppercase.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_uppercase.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_uppercase.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_uppercase.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns_8_records.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns_8_records.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns_8_records.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns_8_records.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns_9_records.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns_9_records.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns_9_records.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_signed_mark_with_secdns_9_records.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_two_signed_marks.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_two_signed_marks.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_two_signed_marks.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_two_signed_marks.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_with_secdns_maxsiglife.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_with_secdns_maxsiglife.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_with_secdns_maxsiglife.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_with_secdns_maxsiglife.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_without_marks.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_without_marks.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_without_marks.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_without_marks.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_wrong_extension.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_wrong_extension.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrise_wrong_extension.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrise_wrong_extension.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_13_nameservers.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_13_nameservers.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_13_nameservers.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_13_nameservers.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_14_nameservers.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_14_nameservers.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_14_nameservers.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_14_nameservers.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_allowedinsunrise.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_allowedinsunrise.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_allowedinsunrise.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_allowedinsunrise.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_allowedinsunrise_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_allowedinsunrise_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_allowedinsunrise_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_allowedinsunrise_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_bad_checksum_claim_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_bad_checksum_claim_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_bad_checksum_claim_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_bad_checksum_claim_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_bad_idn_minna.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_bad_idn_minna.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_bad_idn_minna.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_bad_idn_minna.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_bad_validator_id.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_bad_validator_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_bad_validator_id.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_bad_validator_id.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_claim_notice.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_claim_notice.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_claim_notice.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_claim_notice.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_certificate_corrupt.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_certificate_corrupt.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_certificate_corrupt.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_certificate_corrupt.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_corrupt.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_corrupt.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_corrupt.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_corrupt.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_revoked_cert.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_revoked_cert.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_revoked_cert.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_revoked_cert.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_signature_corrupt.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_signature_corrupt.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_signature_corrupt.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_encoded_signed_mark_signature_corrupt.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_malformed_claim_notice1.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_malformed_claim_notice1.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_malformed_claim_notice1.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_malformed_claim_notice1.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_malformed_claim_notice2.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_malformed_claim_notice2.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_malformed_claim_notice2.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_malformed_claim_notice2.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_response.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_response_claims.xml b/javatests/google/registry/flows/domain/testdata/domain_create_sunrush_response_claims.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_sunrush_response_claims.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_sunrush_response_claims.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_uppercase.xml b/javatests/google/registry/flows/domain/testdata/domain_create_uppercase.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_uppercase.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_uppercase.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_with_tld.xml b/javatests/google/registry/flows/domain/testdata/domain_create_with_tld.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_with_tld.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_with_tld.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_create_wrong_extension.xml b/javatests/google/registry/flows/domain/testdata/domain_create_wrong_extension.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_create_wrong_extension.xml
rename to javatests/google/registry/flows/domain/testdata/domain_create_wrong_extension.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete.xml b/javatests/google/registry/flows/domain/testdata/domain_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_application.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_application.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_application.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_application.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_application_landrush.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_application_landrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_application_landrush.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_application_landrush.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_application_sunrush.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_application_sunrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_application_sunrush.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_application_sunrush.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_application_wrong_extension.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_application_wrong_extension.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_application_wrong_extension.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_application_wrong_extension.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_metadata.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_metadata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_metadata.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_metadata.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_response_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_response_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response_pending.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_response_pending.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response_pending.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_response_pending.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info.xml b/javatests/google/registry/flows/domain/testdata/domain_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_default_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_default_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_default_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_default_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_delegated_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_delegated_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_delegated_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_delegated_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_bad_period.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_bad_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_bad_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_bad_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_command_phase.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_command_phase.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_command_phase.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_command_phase.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_create.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create_euro.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_euro.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create_euro.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_create_euro.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create_premium_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create_premium_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_create_premium_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_create_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_create_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_multiyear_restore.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_multiyear_restore.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_multiyear_restore.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_multiyear_restore.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_renew.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_renew.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_renew.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_renew_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_renew_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_renew_premium_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_renew_premium_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_premium_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_renew_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_renew_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_renew_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_restore.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_restore.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_restore.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_restore_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_restore_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_restore_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_restore_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_transfer.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_transfer.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_transfer_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_transfer_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_transfer_premium_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_transfer_premium_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_premium_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_transfer_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_fee_transfer_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_fee_transfer_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_none_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_none_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_none_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_none_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_addperiod.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_addperiod.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_addperiod.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_addperiod.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_dsdata.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_dsdata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_dsdata.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_dsdata.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_none_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_none_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_none_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_none_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_renewperiod.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_renewperiod.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_renewperiod.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_renewperiod.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_transferperiod.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_transferperiod.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_transferperiod.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_transferperiod.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_unauthorized.xml b/javatests/google/registry/flows/domain/testdata/domain_info_response_unauthorized.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_response_unauthorized.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_response_unauthorized.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_all_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_all_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_all_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_all_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_allocated.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_allocated.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_allocated.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_allocated.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_delegated_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_delegated_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_delegated_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_delegated_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_include_marks.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_include_marks.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_include_marks.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_include_marks.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_no_application_id.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_no_application_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_no_application_id.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_no_application_id.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_no_marks.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_no_marks.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_no_marks.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_no_marks.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_none_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_none_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_none_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_none_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_response.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_response_dsdata.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_response_dsdata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_response_dsdata.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_response_dsdata.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_response_no_nameservers.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_response_no_nameservers.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_response_no_nameservers.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_response_no_nameservers.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_response_with_mark.xml b/javatests/google/registry/flows/domain/testdata/domain_info_sunrise_response_with_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_sunrise_response_with_mark.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_sunrise_response_with_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_with_auth.xml b/javatests/google/registry/flows/domain/testdata/domain_info_with_auth.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_with_auth.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_with_auth.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_info_with_contact_auth.xml b/javatests/google/registry/flows/domain/testdata/domain_info_with_contact_auth.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_info_with_contact_auth.xml
rename to javatests/google/registry/flows/domain/testdata/domain_info_with_contact_auth.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew.xml b/javatests/google/registry/flows/domain/testdata/domain_renew.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_11_years.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_11_years.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_11_years.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_11_years.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_applied.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_fee_applied.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_applied.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_fee_applied.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_defaults.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_fee_defaults.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_defaults.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_fee_defaults.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_refundable.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_fee_refundable.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_fee_refundable.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_fee_refundable.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_missing_period.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_missing_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_missing_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_missing_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_months.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_months.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_months.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_months.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_response.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_response_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_response_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_response_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_response_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_response_missing_period.xml b/javatests/google/registry/flows/domain/testdata/domain_renew_response_missing_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_renew_response_missing_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_renew_response_missing_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_approve.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_approve.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_net.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_net.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_net.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_approve_net.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_response.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_cancel.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_cancel.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_cancel.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_cancel.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_cancel_response.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_cancel_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_query.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_query.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_query_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_reject.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_reject.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_reject.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_reject.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_reject_response.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_reject_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_reject_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_reject_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_10_years.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_10_years.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_10_years.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_10_years.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_2_years.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_2_years.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_2_years.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_2_years.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_months.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_months.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_months.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_months.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response_10_years.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_10_years.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response_10_years.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_10_years.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response_2_years.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_2_years.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response_2_years.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_2_years.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml b/javatests/google/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml
rename to javatests/google/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update.xml b/javatests/google/registry/flows/domain/testdata/domain_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_nameserver.xml b/javatests/google/registry/flows/domain/testdata/domain_update_add_nameserver.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_nameserver.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_add_nameserver.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_non_server_status.xml b/javatests/google/registry/flows/domain/testdata/domain_update_add_non_server_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_non_server_status.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_add_non_server_status.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml b/javatests/google/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml b/javatests/google/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml b/javatests/google/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_server_status.xml b/javatests/google/registry/flows/domain/testdata/domain_update_add_server_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_server_status.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_add_server_status.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml b/javatests/google/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_update_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_change_server_status.xml b/javatests/google/registry/flows/domain/testdata/domain_update_change_server_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_change_server_status.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_change_server_status.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_add.xml b/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_add.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml b/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml b/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_empty.xml b/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_empty.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_empty.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_dsdata_empty.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_rem.xml b/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_rem.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml b/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml b/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml b/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_duplicate_contact.xml b/javatests/google/registry/flows/domain/testdata/domain_update_duplicate_contact.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_duplicate_contact.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_duplicate_contact.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_max_everything.xml b/javatests/google/registry/flows/domain/testdata/domain_update_max_everything.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_max_everything.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_max_everything.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_maxsiglife.xml b/javatests/google/registry/flows/domain/testdata/domain_update_maxsiglife.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_maxsiglife.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_maxsiglife.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_metadata.xml b/javatests/google/registry/flows/domain/testdata/domain_update_metadata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_metadata.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_metadata.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_missing_contact_type.xml b/javatests/google/registry/flows/domain/testdata/domain_update_missing_contact_type.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_missing_contact_type.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_missing_contact_type.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_prohibited_status.xml b/javatests/google/registry/flows/domain/testdata/domain_update_prohibited_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_prohibited_status.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_prohibited_status.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml b/javatests/google/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_admin.xml b/javatests/google/registry/flows/domain/testdata/domain_update_remove_admin.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_admin.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_remove_admin.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_client_hold.xml b/javatests/google/registry/flows/domain/testdata/domain_update_remove_client_hold.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_client_hold.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_remove_client_hold.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_contact.xml b/javatests/google/registry/flows/domain/testdata/domain_update_remove_contact.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_contact.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_remove_contact.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml b/javatests/google/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_server_hold.xml b/javatests/google/registry/flows/domain/testdata/domain_update_remove_server_hold.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_server_hold.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_remove_server_hold.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_server_status.xml b/javatests/google/registry/flows/domain/testdata/domain_update_remove_server_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_server_status.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_remove_server_status.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_tech.xml b/javatests/google/registry/flows/domain/testdata/domain_update_remove_tech.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_remove_tech.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_remove_tech.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_response.xml b/javatests/google/registry/flows/domain/testdata/domain_update_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_response.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_response.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_premium.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_premium.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml b/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml b/javatests/google/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_add_nameserver.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_add_nameserver.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_add_nameserver.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_add_nameserver.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_add_remove_same_contact.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_add_remove_same_contact.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_add_remove_same_contact.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_add_remove_same_contact.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_add_remove_same_host.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_add_remove_same_host.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_add_remove_same_host.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_add_remove_same_host.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_authinfo.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_authinfo.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_authinfo.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_authinfo.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem_same.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem_same.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem_same.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_add_rem_same.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_empty.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_empty.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_empty.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_empty.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all_false.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all_false.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all_false.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_rem_all_false.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_urgent.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_urgent.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_dsdata_urgent.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_dsdata_urgent.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_duplicate_contact.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_duplicate_contact.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_duplicate_contact.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_duplicate_contact.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_maxsiglife.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_maxsiglife.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_maxsiglife.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_maxsiglife.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_missing_contact_type.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_missing_contact_type.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_missing_contact_type.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_missing_contact_type.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_prohibited_status.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_prohibited_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_prohibited_status.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_prohibited_status.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_registrant_to_tech.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_registrant_to_tech.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_registrant_to_tech.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_registrant_to_tech.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_remove_admin.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_admin.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_remove_admin.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_admin.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_remove_contact.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_contact.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_remove_contact.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_contact.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_remove_multiple_contacts.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_multiple_contacts.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_remove_multiple_contacts.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_multiple_contacts.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_remove_tech.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_tech.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_remove_tech.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_remove_tech.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_wrong_extension.xml b/javatests/google/registry/flows/domain/testdata/domain_update_sunrise_wrong_extension.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_sunrise_wrong_extension.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_sunrise_wrong_extension.xml
diff --git a/javatests/com/google/domain/registry/flows/domain/testdata/domain_update_wrong_extension.xml b/javatests/google/registry/flows/domain/testdata/domain_update_wrong_extension.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/domain/testdata/domain_update_wrong_extension.xml
rename to javatests/google/registry/flows/domain/testdata/domain_update_wrong_extension.xml
diff --git a/javatests/com/google/domain/registry/flows/host/HostCheckFlowTest.java b/javatests/google/registry/flows/host/HostCheckFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/HostCheckFlowTest.java
rename to javatests/google/registry/flows/host/HostCheckFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/host/HostCreateFlowTest.java b/javatests/google/registry/flows/host/HostCreateFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/HostCreateFlowTest.java
rename to javatests/google/registry/flows/host/HostCreateFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/host/HostDeleteFlowTest.java b/javatests/google/registry/flows/host/HostDeleteFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/HostDeleteFlowTest.java
rename to javatests/google/registry/flows/host/HostDeleteFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/host/HostInfoFlowTest.java b/javatests/google/registry/flows/host/HostInfoFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/HostInfoFlowTest.java
rename to javatests/google/registry/flows/host/HostInfoFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/host/HostUpdateFlowTest.java b/javatests/google/registry/flows/host/HostUpdateFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/HostUpdateFlowTest.java
rename to javatests/google/registry/flows/host/HostUpdateFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_check.xml b/javatests/google/registry/flows/host/testdata/host_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_check.xml
rename to javatests/google/registry/flows/host/testdata/host_check.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_check_50.xml b/javatests/google/registry/flows/host/testdata/host_check_50.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_check_50.xml
rename to javatests/google/registry/flows/host/testdata/host_check_50.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_check_51.xml b/javatests/google/registry/flows/host/testdata/host_check_51.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_check_51.xml
rename to javatests/google/registry/flows/host/testdata/host_check_51.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_check_response.xml b/javatests/google/registry/flows/host/testdata/host_check_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_check_response.xml
rename to javatests/google/registry/flows/host/testdata/host_check_response.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_create.xml b/javatests/google/registry/flows/host/testdata/host_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_create.xml
rename to javatests/google/registry/flows/host/testdata/host_create.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_create_response.xml b/javatests/google/registry/flows/host/testdata/host_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_create_response.xml
rename to javatests/google/registry/flows/host/testdata/host_create_response.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_delete.xml b/javatests/google/registry/flows/host/testdata/host_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_delete.xml
rename to javatests/google/registry/flows/host/testdata/host_delete.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_delete_response.xml b/javatests/google/registry/flows/host/testdata/host_delete_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_delete_response.xml
rename to javatests/google/registry/flows/host/testdata/host_delete_response.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_info.xml b/javatests/google/registry/flows/host/testdata/host_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_info.xml
rename to javatests/google/registry/flows/host/testdata/host_info.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_info_response.xml b/javatests/google/registry/flows/host/testdata/host_info_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_info_response.xml
rename to javatests/google/registry/flows/host/testdata/host_info_response.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_info_response_linked.xml b/javatests/google/registry/flows/host/testdata/host_info_response_linked.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_info_response_linked.xml
rename to javatests/google/registry/flows/host/testdata/host_info_response_linked.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml b/javatests/google/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml
rename to javatests/google/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_update.xml b/javatests/google/registry/flows/host/testdata/host_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_update.xml
rename to javatests/google/registry/flows/host/testdata/host_update.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_update_add_status.xml b/javatests/google/registry/flows/host/testdata/host_update_add_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_update_add_status.xml
rename to javatests/google/registry/flows/host/testdata/host_update_add_status.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_update_name_unchanged.xml b/javatests/google/registry/flows/host/testdata/host_update_name_unchanged.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_update_name_unchanged.xml
rename to javatests/google/registry/flows/host/testdata/host_update_name_unchanged.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_update_prohibited_status.xml b/javatests/google/registry/flows/host/testdata/host_update_prohibited_status.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_update_prohibited_status.xml
rename to javatests/google/registry/flows/host/testdata/host_update_prohibited_status.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml b/javatests/google/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml
rename to javatests/google/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml
diff --git a/javatests/com/google/domain/registry/flows/host/testdata/host_update_response.xml b/javatests/google/registry/flows/host/testdata/host_update_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/host/testdata/host_update_response.xml
rename to javatests/google/registry/flows/host/testdata/host_update_response.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/PollAckFlowTest.java b/javatests/google/registry/flows/poll/PollAckFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/PollAckFlowTest.java
rename to javatests/google/registry/flows/poll/PollAckFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/poll/PollRequestFlowTest.java b/javatests/google/registry/flows/poll/PollRequestFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/PollRequestFlowTest.java
rename to javatests/google/registry/flows/poll/PollRequestFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll.xml b/javatests/google/registry/flows/poll/testdata/poll.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll.xml
rename to javatests/google/registry/flows/poll/testdata/poll.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_ack.xml b/javatests/google/registry/flows/poll/testdata/poll_ack.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_ack.xml
rename to javatests/google/registry/flows/poll/testdata/poll_ack.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_contact.xml b/javatests/google/registry/flows/poll/testdata/poll_ack_contact.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_contact.xml
rename to javatests/google/registry/flows/poll/testdata/poll_ack_contact.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_invalid_eppresource_id.xml b/javatests/google/registry/flows/poll/testdata/poll_ack_invalid_eppresource_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_invalid_eppresource_id.xml
rename to javatests/google/registry/flows/poll/testdata/poll_ack_invalid_eppresource_id.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_invalid_id.xml b/javatests/google/registry/flows/poll/testdata/poll_ack_invalid_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_invalid_id.xml
rename to javatests/google/registry/flows/poll/testdata/poll_ack_invalid_id.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_invalid_string_id.xml b/javatests/google/registry/flows/poll/testdata/poll_ack_invalid_string_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_invalid_string_id.xml
rename to javatests/google/registry/flows/poll/testdata/poll_ack_invalid_string_id.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_missing_id.xml b/javatests/google/registry/flows/poll/testdata/poll_ack_missing_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_missing_id.xml
rename to javatests/google/registry/flows/poll/testdata/poll_ack_missing_id.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_response.xml b/javatests/google/registry/flows/poll/testdata/poll_ack_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_response.xml
rename to javatests/google/registry/flows/poll/testdata/poll_ack_response.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_response_empty.xml b/javatests/google/registry/flows/poll/testdata/poll_ack_response_empty.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_ack_response_empty.xml
rename to javatests/google/registry/flows/poll/testdata/poll_ack_response_empty.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_response_autorenew.xml b/javatests/google/registry/flows/poll/testdata/poll_response_autorenew.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_response_autorenew.xml
rename to javatests/google/registry/flows/poll/testdata/poll_response_autorenew.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_response_contact_delete.xml b/javatests/google/registry/flows/poll/testdata/poll_response_contact_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_response_contact_delete.xml
rename to javatests/google/registry/flows/poll/testdata/poll_response_contact_delete.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_response_contact_transfer.xml b/javatests/google/registry/flows/poll/testdata/poll_response_contact_transfer.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_response_contact_transfer.xml
rename to javatests/google/registry/flows/poll/testdata/poll_response_contact_transfer.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml b/javatests/google/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml
rename to javatests/google/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_response_domain_transfer.xml b/javatests/google/registry/flows/poll/testdata/poll_response_domain_transfer.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_response_domain_transfer.xml
rename to javatests/google/registry/flows/poll/testdata/poll_response_domain_transfer.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_response_empty.xml b/javatests/google/registry/flows/poll/testdata/poll_response_empty.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_response_empty.xml
rename to javatests/google/registry/flows/poll/testdata/poll_response_empty.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_response_host_delete.xml b/javatests/google/registry/flows/poll/testdata/poll_response_host_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_response_host_delete.xml
rename to javatests/google/registry/flows/poll/testdata/poll_response_host_delete.xml
diff --git a/javatests/com/google/domain/registry/flows/poll/testdata/poll_with_id.xml b/javatests/google/registry/flows/poll/testdata/poll_with_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/poll/testdata/poll_with_id.xml
rename to javatests/google/registry/flows/poll/testdata/poll_with_id.xml
diff --git a/javatests/com/google/domain/registry/flows/session/HelloFlowTest.java b/javatests/google/registry/flows/session/HelloFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/HelloFlowTest.java
rename to javatests/google/registry/flows/session/HelloFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/session/LoginFlowTestCase.java b/javatests/google/registry/flows/session/LoginFlowTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/LoginFlowTestCase.java
rename to javatests/google/registry/flows/session/LoginFlowTestCase.java
diff --git a/javatests/com/google/domain/registry/flows/session/LoginFlowViaConsoleTest.java b/javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/LoginFlowViaConsoleTest.java
rename to javatests/google/registry/flows/session/LoginFlowViaConsoleTest.java
diff --git a/javatests/com/google/domain/registry/flows/session/LoginFlowViaTlsTest.java b/javatests/google/registry/flows/session/LoginFlowViaTlsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/LoginFlowViaTlsTest.java
rename to javatests/google/registry/flows/session/LoginFlowViaTlsTest.java
diff --git a/javatests/com/google/domain/registry/flows/session/LogoutFlowTest.java b/javatests/google/registry/flows/session/LogoutFlowTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/LogoutFlowTest.java
rename to javatests/google/registry/flows/session/LogoutFlowTest.java
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/greeting_crr.xml b/javatests/google/registry/flows/session/testdata/greeting_crr.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/greeting_crr.xml
rename to javatests/google/registry/flows/session/testdata/greeting_crr.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/hello.xml b/javatests/google/registry/flows/session/testdata/hello.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/hello.xml
rename to javatests/google/registry/flows/session/testdata/hello.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/login.xml b/javatests/google/registry/flows/session/testdata/login.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/login.xml
rename to javatests/google/registry/flows/session/testdata/login.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/login_invalid_extension.xml b/javatests/google/registry/flows/session/testdata/login_invalid_extension.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/login_invalid_extension.xml
rename to javatests/google/registry/flows/session/testdata/login_invalid_extension.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/login_invalid_language.xml b/javatests/google/registry/flows/session/testdata/login_invalid_language.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/login_invalid_language.xml
rename to javatests/google/registry/flows/session/testdata/login_invalid_language.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/login_invalid_newpw.xml b/javatests/google/registry/flows/session/testdata/login_invalid_newpw.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/login_invalid_newpw.xml
rename to javatests/google/registry/flows/session/testdata/login_invalid_newpw.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/login_invalid_types.xml b/javatests/google/registry/flows/session/testdata/login_invalid_types.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/login_invalid_types.xml
rename to javatests/google/registry/flows/session/testdata/login_invalid_types.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/login_invalid_version.xml b/javatests/google/registry/flows/session/testdata/login_invalid_version.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/login_invalid_version.xml
rename to javatests/google/registry/flows/session/testdata/login_invalid_version.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/login_response.xml b/javatests/google/registry/flows/session/testdata/login_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/login_response.xml
rename to javatests/google/registry/flows/session/testdata/login_response.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/login_valid.xml b/javatests/google/registry/flows/session/testdata/login_valid.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/login_valid.xml
rename to javatests/google/registry/flows/session/testdata/login_valid.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/login_valid_missing_types.xml b/javatests/google/registry/flows/session/testdata/login_valid_missing_types.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/login_valid_missing_types.xml
rename to javatests/google/registry/flows/session/testdata/login_valid_missing_types.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/logout.xml b/javatests/google/registry/flows/session/testdata/logout.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/logout.xml
rename to javatests/google/registry/flows/session/testdata/logout.xml
diff --git a/javatests/com/google/domain/registry/flows/session/testdata/logout_response.xml b/javatests/google/registry/flows/session/testdata/logout_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/session/testdata/logout_response.xml
rename to javatests/google/registry/flows/session/testdata/logout_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_billion_laughs.xml b/javatests/google/registry/flows/testdata/contact_create_billion_laughs.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_billion_laughs.xml
rename to javatests/google/registry/flows/testdata/contact_create_billion_laughs.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_jd1234.xml b/javatests/google/registry/flows/testdata/contact_create_jd1234.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_jd1234.xml
rename to javatests/google/registry/flows/testdata/contact_create_jd1234.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_local_response_xxe.xml b/javatests/google/registry/flows/testdata/contact_create_local_response_xxe.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_local_response_xxe.xml
rename to javatests/google/registry/flows/testdata/contact_create_local_response_xxe.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_local_xxe.xml b/javatests/google/registry/flows/testdata/contact_create_local_xxe.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_local_xxe.xml
rename to javatests/google/registry/flows/testdata/contact_create_local_xxe.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_remote_response_xxe.xml b/javatests/google/registry/flows/testdata/contact_create_remote_response_xxe.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_remote_response_xxe.xml
rename to javatests/google/registry/flows/testdata/contact_create_remote_response_xxe.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_remote_xxe.xml b/javatests/google/registry/flows/testdata/contact_create_remote_xxe.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_remote_xxe.xml
rename to javatests/google/registry/flows/testdata/contact_create_remote_xxe.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_response_billion_laughs.xml b/javatests/google/registry/flows/testdata/contact_create_response_billion_laughs.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_response_billion_laughs.xml
rename to javatests/google/registry/flows/testdata/contact_create_response_billion_laughs.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_response_jd1234.xml b/javatests/google/registry/flows/testdata/contact_create_response_jd1234.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_response_jd1234.xml
rename to javatests/google/registry/flows/testdata/contact_create_response_jd1234.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_response_sh8013.xml b/javatests/google/registry/flows/testdata/contact_create_response_sh8013.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_response_sh8013.xml
rename to javatests/google/registry/flows/testdata/contact_create_response_sh8013.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_response_template.xml b/javatests/google/registry/flows/testdata/contact_create_response_template.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_response_template.xml
rename to javatests/google/registry/flows/testdata/contact_create_response_template.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_sh8013.xml b/javatests/google/registry/flows/testdata/contact_create_sh8013.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_sh8013.xml
rename to javatests/google/registry/flows/testdata/contact_create_sh8013.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_create_template.xml b/javatests/google/registry/flows/testdata/contact_create_template.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_create_template.xml
rename to javatests/google/registry/flows/testdata/contact_create_template.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_delete_response_sh8013.xml b/javatests/google/registry/flows/testdata/contact_delete_response_sh8013.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_delete_response_sh8013.xml
rename to javatests/google/registry/flows/testdata/contact_delete_response_sh8013.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_delete_sh8013.xml b/javatests/google/registry/flows/testdata/contact_delete_sh8013.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_delete_sh8013.xml
rename to javatests/google/registry/flows/testdata/contact_delete_sh8013.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_info.xml b/javatests/google/registry/flows/testdata/contact_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_info.xml
rename to javatests/google/registry/flows/testdata/contact_info.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_info_from_create_response.xml b/javatests/google/registry/flows/testdata/contact_info_from_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_info_from_create_response.xml
rename to javatests/google/registry/flows/testdata/contact_info_from_create_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_info_not_found.xml b/javatests/google/registry/flows/testdata/contact_info_not_found.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_info_not_found.xml
rename to javatests/google/registry/flows/testdata/contact_info_not_found.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_transfer_request.xml b/javatests/google/registry/flows/testdata/contact_transfer_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_transfer_request.xml
rename to javatests/google/registry/flows/testdata/contact_transfer_request.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/contact_transfer_request_response_alternate.xml b/javatests/google/registry/flows/testdata/contact_transfer_request_response_alternate.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/contact_transfer_request_response_alternate.xml
rename to javatests/google/registry/flows/testdata/contact_transfer_request_response_alternate.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_allocate_response_testvalidate.xml b/javatests/google/registry/flows/testdata/domain_allocate_response_testvalidate.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_allocate_response_testvalidate.xml
rename to javatests/google/registry/flows/testdata/domain_allocate_response_testvalidate.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_allocate_response_testvalidate_only_superuser.xml b/javatests/google/registry/flows/testdata/domain_allocate_response_testvalidate_only_superuser.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_allocate_response_testvalidate_only_superuser.xml
rename to javatests/google/registry/flows/testdata/domain_allocate_response_testvalidate_only_superuser.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_allocate_testvalidate.xml b/javatests/google/registry/flows/testdata/domain_allocate_testvalidate.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_allocate_testvalidate.xml
rename to javatests/google/registry/flows/testdata/domain_allocate_testvalidate.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_check_fee_premium.xml b/javatests/google/registry/flows/testdata/domain_check_fee_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_check_fee_premium.xml
rename to javatests/google/registry/flows/testdata/domain_check_fee_premium.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_check_fee_premium_response.xml b/javatests/google/registry/flows/testdata/domain_check_fee_premium_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_check_fee_premium_response.xml
rename to javatests/google/registry/flows/testdata/domain_check_fee_premium_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_fakesite.xml b/javatests/google/registry/flows/testdata/domain_create_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_create_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_minna.xml b/javatests/google/registry/flows/testdata/domain_create_minna.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_minna.xml
rename to javatests/google/registry/flows/testdata/domain_create_minna.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml b/javatests/google/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml
rename to javatests/google/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_response.xml b/javatests/google/registry/flows/testdata/domain_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_response.xml
rename to javatests/google/registry/flows/testdata/domain_create_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_response_fakesite.xml b/javatests/google/registry/flows/testdata/domain_create_response_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_response_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_create_response_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_response_minna.xml b/javatests/google/registry/flows/testdata/domain_create_response_minna.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_response_minna.xml
rename to javatests/google/registry/flows/testdata/domain_create_response_minna.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_response_secondsite.xml b/javatests/google/registry/flows/testdata/domain_create_response_secondsite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_response_secondsite.xml
rename to javatests/google/registry/flows/testdata/domain_create_response_secondsite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_secondsite.xml b/javatests/google/registry/flows/testdata/domain_create_secondsite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_secondsite.xml
rename to javatests/google/registry/flows/testdata/domain_create_secondsite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml b/javatests/google/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml
rename to javatests/google/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_sunrise_encoded_signed_mark_response.xml b/javatests/google/registry/flows/testdata/domain_create_sunrise_encoded_signed_mark_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_sunrise_encoded_signed_mark_response.xml
rename to javatests/google/registry/flows/testdata/domain_create_sunrise_encoded_signed_mark_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_create_testvalidate_invalid_phase.xml b/javatests/google/registry/flows/testdata/domain_create_testvalidate_invalid_phase.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_create_testvalidate_invalid_phase.xml
rename to javatests/google/registry/flows/testdata/domain_create_testvalidate_invalid_phase.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_delete.xml b/javatests/google/registry/flows/testdata/domain_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_delete.xml
rename to javatests/google/registry/flows/testdata/domain_delete.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_delete_fakesite.xml b/javatests/google/registry/flows/testdata/domain_delete_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_delete_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_delete_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_delete_response_prohibited.xml b/javatests/google/registry/flows/testdata/domain_delete_response_prohibited.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_delete_response_prohibited.xml
rename to javatests/google/registry/flows/testdata/domain_delete_response_prohibited.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info.xml b/javatests/google/registry/flows/testdata/domain_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info.xml
rename to javatests/google/registry/flows/testdata/domain_info.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_fakesite.xml b/javatests/google/registry/flows/testdata/domain_info_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_info_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_ok.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_ok.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_ok.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_ok.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml b/javatests/google/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_pendingdelete.xml b/javatests/google/registry/flows/testdata/domain_info_response_pendingdelete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_pendingdelete.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_pendingdelete.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_testvalidate_doesnt_exist.xml b/javatests/google/registry/flows/testdata/domain_info_response_testvalidate_doesnt_exist.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_testvalidate_doesnt_exist.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_testvalidate_doesnt_exist.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_response_testvalidate_ok.xml b/javatests/google/registry/flows/testdata/domain_info_response_testvalidate_ok.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_response_testvalidate_ok.xml
rename to javatests/google/registry/flows/testdata/domain_info_response_testvalidate_ok.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_info_testvalidate.xml b/javatests/google/registry/flows/testdata/domain_info_testvalidate.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_info_testvalidate.xml
rename to javatests/google/registry/flows/testdata/domain_info_testvalidate.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_transfer_query_fakesite.xml b/javatests/google/registry/flows/testdata/domain_transfer_query_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_transfer_query_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_transfer_query_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml b/javatests/google/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_transfer_query_response_fakesite.xml b/javatests/google/registry/flows/testdata/domain_transfer_query_response_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_transfer_query_response_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_transfer_query_response_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_transfer_query_response_no_transfer_history.xml b/javatests/google/registry/flows/testdata/domain_transfer_query_response_no_transfer_history.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_transfer_query_response_no_transfer_history.xml
rename to javatests/google/registry/flows/testdata/domain_transfer_query_response_no_transfer_history.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_transfer_request_1_year.xml b/javatests/google/registry/flows/testdata/domain_transfer_request_1_year.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_transfer_request_1_year.xml
rename to javatests/google/registry/flows/testdata/domain_transfer_request_1_year.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_transfer_request_2_years.xml b/javatests/google/registry/flows/testdata/domain_transfer_request_2_years.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_transfer_request_2_years.xml
rename to javatests/google/registry/flows/testdata/domain_transfer_request_2_years.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_transfer_response_1_year.xml b/javatests/google/registry/flows/testdata/domain_transfer_response_1_year.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_transfer_response_1_year.xml
rename to javatests/google/registry/flows/testdata/domain_transfer_response_1_year.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_transfer_response_2_years.xml b/javatests/google/registry/flows/testdata/domain_transfer_response_2_years.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_transfer_response_2_years.xml
rename to javatests/google/registry/flows/testdata/domain_transfer_response_2_years.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml b/javatests/google/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_update_add_nameserver_response_fakesite.xml b/javatests/google/registry/flows/testdata/domain_update_add_nameserver_response_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_update_add_nameserver_response_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_update_add_nameserver_response_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_update_restore_fakesite.xml b/javatests/google/registry/flows/testdata/domain_update_restore_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_update_restore_fakesite.xml
rename to javatests/google/registry/flows/testdata/domain_update_restore_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_update_restore_request.xml b/javatests/google/registry/flows/testdata/domain_update_restore_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_update_restore_request.xml
rename to javatests/google/registry/flows/testdata/domain_update_restore_request.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/domain_update_restore_request_response.xml b/javatests/google/registry/flows/testdata/domain_update_restore_request_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/domain_update_restore_request_response.xml
rename to javatests/google/registry/flows/testdata/domain_update_restore_request_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/generic_success_action_pending_response.xml b/javatests/google/registry/flows/testdata/generic_success_action_pending_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/generic_success_action_pending_response.xml
rename to javatests/google/registry/flows/testdata/generic_success_action_pending_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/generic_success_response.xml b/javatests/google/registry/flows/testdata/generic_success_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/generic_success_response.xml
rename to javatests/google/registry/flows/testdata/generic_success_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/greeting_crr.xml b/javatests/google/registry/flows/testdata/greeting_crr.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/greeting_crr.xml
rename to javatests/google/registry/flows/testdata/greeting_crr.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/hello.xml b/javatests/google/registry/flows/testdata/hello.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/hello.xml
rename to javatests/google/registry/flows/testdata/hello.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_create.xml b/javatests/google/registry/flows/testdata/host_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_create.xml
rename to javatests/google/registry/flows/testdata/host_create.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_create2.xml b/javatests/google/registry/flows/testdata/host_create2.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_create2.xml
rename to javatests/google/registry/flows/testdata/host_create2.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_create2_response.xml b/javatests/google/registry/flows/testdata/host_create2_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_create2_response.xml
rename to javatests/google/registry/flows/testdata/host_create2_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_create_fakesite.xml b/javatests/google/registry/flows/testdata/host_create_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_create_fakesite.xml
rename to javatests/google/registry/flows/testdata/host_create_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_create_response.xml b/javatests/google/registry/flows/testdata/host_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_create_response.xml
rename to javatests/google/registry/flows/testdata/host_create_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_create_response_fakesite.xml b/javatests/google/registry/flows/testdata/host_create_response_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_create_response_fakesite.xml
rename to javatests/google/registry/flows/testdata/host_create_response_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info.xml b/javatests/google/registry/flows/testdata/host_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info.xml
rename to javatests/google/registry/flows/testdata/host_info.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_fakesite.xml b/javatests/google/registry/flows/testdata/host_info_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_fakesite.xml
rename to javatests/google/registry/flows/testdata/host_info_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_ns1.xml b/javatests/google/registry/flows/testdata/host_info_ns1.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_ns1.xml
rename to javatests/google/registry/flows/testdata/host_info_ns1.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_ns2.xml b/javatests/google/registry/flows/testdata/host_info_ns2.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_ns2.xml
rename to javatests/google/registry/flows/testdata/host_info_ns2.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_ns9000_example.xml b/javatests/google/registry/flows/testdata/host_info_ns9000_example.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_ns9000_example.xml
rename to javatests/google/registry/flows/testdata/host_info_ns9000_example.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite.xml b/javatests/google/registry/flows/testdata/host_info_response_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite.xml
rename to javatests/google/registry/flows/testdata/host_info_response_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml b/javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml
rename to javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml b/javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml
rename to javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml b/javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml
rename to javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite_post_update.xml b/javatests/google/registry/flows/testdata/host_info_response_fakesite_post_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_response_fakesite_post_update.xml
rename to javatests/google/registry/flows/testdata/host_info_response_fakesite_post_update.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_response_ns1.xml b/javatests/google/registry/flows/testdata/host_info_response_ns1.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_response_ns1.xml
rename to javatests/google/registry/flows/testdata/host_info_response_ns1.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_response_ns2.xml b/javatests/google/registry/flows/testdata/host_info_response_ns2.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_response_ns2.xml
rename to javatests/google/registry/flows/testdata/host_info_response_ns2.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_info_response_ns9000_example.xml b/javatests/google/registry/flows/testdata/host_info_response_ns9000_example.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_info_response_ns9000_example.xml
rename to javatests/google/registry/flows/testdata/host_info_response_ns9000_example.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_update_failed_response.xml b/javatests/google/registry/flows/testdata/host_update_failed_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_update_failed_response.xml
rename to javatests/google/registry/flows/testdata/host_update_failed_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_update_fakesite.xml b/javatests/google/registry/flows/testdata/host_update_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_update_fakesite.xml
rename to javatests/google/registry/flows/testdata/host_update_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_update_ns1_to_fakesite.xml b/javatests/google/registry/flows/testdata/host_update_ns1_to_fakesite.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_update_ns1_to_fakesite.xml
rename to javatests/google/registry/flows/testdata/host_update_ns1_to_fakesite.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_update_ns1_to_ns2.xml b/javatests/google/registry/flows/testdata/host_update_ns1_to_ns2.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_update_ns1_to_ns2.xml
rename to javatests/google/registry/flows/testdata/host_update_ns1_to_ns2.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_update_rename_and_remove_addresses.xml b/javatests/google/registry/flows/testdata/host_update_rename_and_remove_addresses.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_update_rename_and_remove_addresses.xml
rename to javatests/google/registry/flows/testdata/host_update_rename_and_remove_addresses.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/host_update_rename_only.xml b/javatests/google/registry/flows/testdata/host_update_rename_only.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/host_update_rename_only.xml
rename to javatests/google/registry/flows/testdata/host_update_rename_only.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/login2_valid.xml b/javatests/google/registry/flows/testdata/login2_valid.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/login2_valid.xml
rename to javatests/google/registry/flows/testdata/login2_valid.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/login_response.xml b/javatests/google/registry/flows/testdata/login_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/login_response.xml
rename to javatests/google/registry/flows/testdata/login_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/login_response_bad_certificate.xml b/javatests/google/registry/flows/testdata/login_response_bad_certificate.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/login_response_bad_certificate.xml
rename to javatests/google/registry/flows/testdata/login_response_bad_certificate.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/login_response_missing_certificate.xml b/javatests/google/registry/flows/testdata/login_response_missing_certificate.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/login_response_missing_certificate.xml
rename to javatests/google/registry/flows/testdata/login_response_missing_certificate.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/login_response_unauthorized_role.xml b/javatests/google/registry/flows/testdata/login_response_unauthorized_role.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/login_response_unauthorized_role.xml
rename to javatests/google/registry/flows/testdata/login_response_unauthorized_role.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/login_response_unauthorized_tld.xml b/javatests/google/registry/flows/testdata/login_response_unauthorized_tld.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/login_response_unauthorized_tld.xml
rename to javatests/google/registry/flows/testdata/login_response_unauthorized_tld.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/login_valid.xml b/javatests/google/registry/flows/testdata/login_valid.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/login_valid.xml
rename to javatests/google/registry/flows/testdata/login_valid.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/login_valid_fee_extension.xml b/javatests/google/registry/flows/testdata/login_valid_fee_extension.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/login_valid_fee_extension.xml
rename to javatests/google/registry/flows/testdata/login_valid_fee_extension.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/logout.xml b/javatests/google/registry/flows/testdata/logout.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/logout.xml
rename to javatests/google/registry/flows/testdata/logout.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/logout_response.xml b/javatests/google/registry/flows/testdata/logout_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/logout_response.xml
rename to javatests/google/registry/flows/testdata/logout_response.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/pdt_login.xml b/javatests/google/registry/flows/testdata/pdt_login.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/pdt_login.xml
rename to javatests/google/registry/flows/testdata/pdt_login.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/poll.xml b/javatests/google/registry/flows/testdata/poll.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/poll.xml
rename to javatests/google/registry/flows/testdata/poll.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/poll_ack.xml b/javatests/google/registry/flows/testdata/poll_ack.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/poll_ack.xml
rename to javatests/google/registry/flows/testdata/poll_ack.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/poll_ack_response_empty.xml b/javatests/google/registry/flows/testdata/poll_ack_response_empty.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/poll_ack_response_empty.xml
rename to javatests/google/registry/flows/testdata/poll_ack_response_empty.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/poll_response_contact_transfer.xml b/javatests/google/registry/flows/testdata/poll_response_contact_transfer.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/poll_response_contact_transfer.xml
rename to javatests/google/registry/flows/testdata/poll_response_contact_transfer.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/poll_response_domain_transfer_request.xml b/javatests/google/registry/flows/testdata/poll_response_domain_transfer_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/poll_response_domain_transfer_request.xml
rename to javatests/google/registry/flows/testdata/poll_response_domain_transfer_request.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml b/javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml
rename to javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml b/javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml
rename to javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/syntax_error.xml b/javatests/google/registry/flows/testdata/syntax_error.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/syntax_error.xml
rename to javatests/google/registry/flows/testdata/syntax_error.xml
diff --git a/javatests/com/google/domain/registry/flows/testdata/syntax_error_response.xml b/javatests/google/registry/flows/testdata/syntax_error_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/flows/testdata/syntax_error_response.xml
rename to javatests/google/registry/flows/testdata/syntax_error_response.xml
diff --git a/javatests/com/google/domain/registry/groups/BUILD b/javatests/google/registry/groups/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/groups/BUILD
rename to javatests/google/registry/groups/BUILD
diff --git a/javatests/com/google/domain/registry/groups/DirectoryGroupsConnectionTest.java b/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/groups/DirectoryGroupsConnectionTest.java
rename to javatests/google/registry/groups/DirectoryGroupsConnectionTest.java
diff --git a/javatests/com/google/domain/registry/mapreduce/inputs/BUILD b/javatests/google/registry/mapreduce/inputs/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/mapreduce/inputs/BUILD
rename to javatests/google/registry/mapreduce/inputs/BUILD
diff --git a/javatests/com/google/domain/registry/mapreduce/inputs/ChildEntityInputTest.java b/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/mapreduce/inputs/ChildEntityInputTest.java
rename to javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java
diff --git a/javatests/com/google/domain/registry/mapreduce/inputs/EppResourceInputsTest.java b/javatests/google/registry/mapreduce/inputs/EppResourceInputsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/mapreduce/inputs/EppResourceInputsTest.java
rename to javatests/google/registry/mapreduce/inputs/EppResourceInputsTest.java
diff --git a/javatests/com/google/domain/registry/model/BUILD b/javatests/google/registry/model/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/model/BUILD
rename to javatests/google/registry/model/BUILD
diff --git a/javatests/com/google/domain/registry/model/CreateAutoTimestampTest.java b/javatests/google/registry/model/CreateAutoTimestampTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/CreateAutoTimestampTest.java
rename to javatests/google/registry/model/CreateAutoTimestampTest.java
diff --git a/javatests/com/google/domain/registry/model/EntityClassesTest.java b/javatests/google/registry/model/EntityClassesTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/EntityClassesTest.java
rename to javatests/google/registry/model/EntityClassesTest.java
diff --git a/javatests/com/google/domain/registry/model/EntityTestCase.java b/javatests/google/registry/model/EntityTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/EntityTestCase.java
rename to javatests/google/registry/model/EntityTestCase.java
diff --git a/javatests/com/google/domain/registry/model/EppResourceUtilsTest.java b/javatests/google/registry/model/EppResourceUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/EppResourceUtilsTest.java
rename to javatests/google/registry/model/EppResourceUtilsTest.java
diff --git a/javatests/com/google/domain/registry/model/ImmutableObjectTest.java b/javatests/google/registry/model/ImmutableObjectTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ImmutableObjectTest.java
rename to javatests/google/registry/model/ImmutableObjectTest.java
diff --git a/javatests/com/google/domain/registry/model/ModelUtilsTest.java b/javatests/google/registry/model/ModelUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ModelUtilsTest.java
rename to javatests/google/registry/model/ModelUtilsTest.java
diff --git a/javatests/com/google/domain/registry/model/ResourceCommandTestCase.java b/javatests/google/registry/model/ResourceCommandTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ResourceCommandTestCase.java
rename to javatests/google/registry/model/ResourceCommandTestCase.java
diff --git a/javatests/com/google/domain/registry/model/RoidSuffixesTest.java b/javatests/google/registry/model/RoidSuffixesTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/RoidSuffixesTest.java
rename to javatests/google/registry/model/RoidSuffixesTest.java
diff --git a/javatests/com/google/domain/registry/model/SchemaVersionTest.java b/javatests/google/registry/model/SchemaVersionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/SchemaVersionTest.java
rename to javatests/google/registry/model/SchemaVersionTest.java
diff --git a/javatests/com/google/domain/registry/model/UpdateAutoTimestampTest.java b/javatests/google/registry/model/UpdateAutoTimestampTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/UpdateAutoTimestampTest.java
rename to javatests/google/registry/model/UpdateAutoTimestampTest.java
diff --git a/javatests/com/google/domain/registry/model/billing/BillingEventTest.java b/javatests/google/registry/model/billing/BillingEventTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/billing/BillingEventTest.java
rename to javatests/google/registry/model/billing/BillingEventTest.java
diff --git a/javatests/com/google/domain/registry/model/billing/RegistrarBillingEntryTest.java b/javatests/google/registry/model/billing/RegistrarBillingEntryTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/billing/RegistrarBillingEntryTest.java
rename to javatests/google/registry/model/billing/RegistrarBillingEntryTest.java
diff --git a/javatests/com/google/domain/registry/model/billing/RegistrarBillingUtilsTest.java b/javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/billing/RegistrarBillingUtilsTest.java
rename to javatests/google/registry/model/billing/RegistrarBillingUtilsTest.java
diff --git a/javatests/com/google/domain/registry/model/billing/RegistrarCreditBalanceTest.java b/javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/billing/RegistrarCreditBalanceTest.java
rename to javatests/google/registry/model/billing/RegistrarCreditBalanceTest.java
diff --git a/javatests/com/google/domain/registry/model/billing/RegistrarCreditTest.java b/javatests/google/registry/model/billing/RegistrarCreditTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/billing/RegistrarCreditTest.java
rename to javatests/google/registry/model/billing/RegistrarCreditTest.java
diff --git a/javatests/com/google/domain/registry/model/common/GaeUserIdConverterTest.java b/javatests/google/registry/model/common/GaeUserIdConverterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/common/GaeUserIdConverterTest.java
rename to javatests/google/registry/model/common/GaeUserIdConverterTest.java
diff --git a/javatests/com/google/domain/registry/model/common/PersistedRangeLongTest.java b/javatests/google/registry/model/common/PersistedRangeLongTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/common/PersistedRangeLongTest.java
rename to javatests/google/registry/model/common/PersistedRangeLongTest.java
diff --git a/javatests/com/google/domain/registry/model/common/TimeOfYearTest.java b/javatests/google/registry/model/common/TimeOfYearTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/common/TimeOfYearTest.java
rename to javatests/google/registry/model/common/TimeOfYearTest.java
diff --git a/javatests/com/google/domain/registry/model/common/TimedTransitionPropertyTest.java b/javatests/google/registry/model/common/TimedTransitionPropertyTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/common/TimedTransitionPropertyTest.java
rename to javatests/google/registry/model/common/TimedTransitionPropertyTest.java
diff --git a/javatests/com/google/domain/registry/model/contact/ContactCommandTest.java b/javatests/google/registry/model/contact/ContactCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/ContactCommandTest.java
rename to javatests/google/registry/model/contact/ContactCommandTest.java
diff --git a/javatests/com/google/domain/registry/model/contact/ContactResourceTest.java b/javatests/google/registry/model/contact/ContactResourceTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/ContactResourceTest.java
rename to javatests/google/registry/model/contact/ContactResourceTest.java
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_check.xml b/javatests/google/registry/model/contact/testdata/contact_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_check.xml
rename to javatests/google/registry/model/contact/testdata/contact_check.xml
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_create.xml b/javatests/google/registry/model/contact/testdata/contact_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_create.xml
rename to javatests/google/registry/model/contact/testdata/contact_create.xml
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_delete.xml b/javatests/google/registry/model/contact/testdata/contact_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_delete.xml
rename to javatests/google/registry/model/contact/testdata/contact_delete.xml
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_info.xml b/javatests/google/registry/model/contact/testdata/contact_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_info.xml
rename to javatests/google/registry/model/contact/testdata/contact_info.xml
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_approve.xml b/javatests/google/registry/model/contact/testdata/contact_transfer_approve.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_approve.xml
rename to javatests/google/registry/model/contact/testdata/contact_transfer_approve.xml
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_cancel.xml b/javatests/google/registry/model/contact/testdata/contact_transfer_cancel.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_cancel.xml
rename to javatests/google/registry/model/contact/testdata/contact_transfer_cancel.xml
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_query.xml b/javatests/google/registry/model/contact/testdata/contact_transfer_query.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_query.xml
rename to javatests/google/registry/model/contact/testdata/contact_transfer_query.xml
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_reject.xml b/javatests/google/registry/model/contact/testdata/contact_transfer_reject.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_reject.xml
rename to javatests/google/registry/model/contact/testdata/contact_transfer_reject.xml
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_request.xml b/javatests/google/registry/model/contact/testdata/contact_transfer_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_transfer_request.xml
rename to javatests/google/registry/model/contact/testdata/contact_transfer_request.xml
diff --git a/javatests/com/google/domain/registry/model/contact/testdata/contact_update.xml b/javatests/google/registry/model/contact/testdata/contact_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/contact/testdata/contact_update.xml
rename to javatests/google/registry/model/contact/testdata/contact_update.xml
diff --git a/javatests/com/google/domain/registry/model/domain/DomainApplicationTest.java b/javatests/google/registry/model/domain/DomainApplicationTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/DomainApplicationTest.java
rename to javatests/google/registry/model/domain/DomainApplicationTest.java
diff --git a/javatests/com/google/domain/registry/model/domain/DomainCommandTest.java b/javatests/google/registry/model/domain/DomainCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/DomainCommandTest.java
rename to javatests/google/registry/model/domain/DomainCommandTest.java
diff --git a/javatests/com/google/domain/registry/model/domain/DomainResourceTest.java b/javatests/google/registry/model/domain/DomainResourceTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/DomainResourceTest.java
rename to javatests/google/registry/model/domain/DomainResourceTest.java
diff --git a/javatests/com/google/domain/registry/model/domain/GracePeriodTest.java b/javatests/google/registry/model/domain/GracePeriodTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/GracePeriodTest.java
rename to javatests/google/registry/model/domain/GracePeriodTest.java
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_check.xml b/javatests/google/registry/model/domain/testdata/domain_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_check.xml
rename to javatests/google/registry/model/domain/testdata/domain_check.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_check_avail.xml b/javatests/google/registry/model/domain/testdata/domain_check_avail.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_check_avail.xml
rename to javatests/google/registry/model/domain/testdata/domain_check_avail.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_check_claims.xml b/javatests/google/registry/model/domain/testdata/domain_check_claims.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_check_claims.xml
rename to javatests/google/registry/model/domain/testdata/domain_check_claims.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_check_fee.xml b/javatests/google/registry/model/domain/testdata/domain_check_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_check_fee.xml
rename to javatests/google/registry/model/domain/testdata/domain_check_fee.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_create.xml b/javatests/google/registry/model/domain/testdata/domain_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_create.xml
rename to javatests/google/registry/model/domain/testdata/domain_create.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_create_fee.xml b/javatests/google/registry/model/domain/testdata/domain_create_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_create_fee.xml
rename to javatests/google/registry/model/domain/testdata/domain_create_fee.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_create_landrush.xml b/javatests/google/registry/model/domain/testdata/domain_create_landrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_create_landrush.xml
rename to javatests/google/registry/model/domain/testdata/domain_create_landrush.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_code.xml b/javatests/google/registry/model/domain/testdata/domain_create_sunrise_code.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_code.xml
rename to javatests/google/registry/model/domain/testdata/domain_create_sunrise_code.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml b/javatests/google/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml
rename to javatests/google/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml b/javatests/google/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml
rename to javatests/google/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_mark.xml b/javatests/google/registry/model/domain/testdata/domain_create_sunrise_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_mark.xml
rename to javatests/google/registry/model/domain/testdata/domain_create_sunrise_mark.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml b/javatests/google/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml
rename to javatests/google/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_delete.xml b/javatests/google/registry/model/domain/testdata/domain_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_delete.xml
rename to javatests/google/registry/model/domain/testdata/domain_delete.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_info.xml b/javatests/google/registry/model/domain/testdata/domain_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_info.xml
rename to javatests/google/registry/model/domain/testdata/domain_info.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_info_fee.xml b/javatests/google/registry/model/domain/testdata/domain_info_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_info_fee.xml
rename to javatests/google/registry/model/domain/testdata/domain_info_fee.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_info_landrush.xml b/javatests/google/registry/model/domain/testdata/domain_info_landrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_info_landrush.xml
rename to javatests/google/registry/model/domain/testdata/domain_info_landrush.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_info_sunrise.xml b/javatests/google/registry/model/domain/testdata/domain_info_sunrise.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_info_sunrise.xml
rename to javatests/google/registry/model/domain/testdata/domain_info_sunrise.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_info_sunrise_no_application_id.xml b/javatests/google/registry/model/domain/testdata/domain_info_sunrise_no_application_id.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_info_sunrise_no_application_id.xml
rename to javatests/google/registry/model/domain/testdata/domain_info_sunrise_no_application_id.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_renew.xml b/javatests/google/registry/model/domain/testdata/domain_renew.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_renew.xml
rename to javatests/google/registry/model/domain/testdata/domain_renew.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_renew_fee.xml b/javatests/google/registry/model/domain/testdata/domain_renew_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_renew_fee.xml
rename to javatests/google/registry/model/domain/testdata/domain_renew_fee.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_approve.xml b/javatests/google/registry/model/domain/testdata/domain_transfer_approve.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_approve.xml
rename to javatests/google/registry/model/domain/testdata/domain_transfer_approve.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_cancel.xml b/javatests/google/registry/model/domain/testdata/domain_transfer_cancel.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_cancel.xml
rename to javatests/google/registry/model/domain/testdata/domain_transfer_cancel.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_query.xml b/javatests/google/registry/model/domain/testdata/domain_transfer_query.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_query.xml
rename to javatests/google/registry/model/domain/testdata/domain_transfer_query.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_reject.xml b/javatests/google/registry/model/domain/testdata/domain_transfer_reject.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_reject.xml
rename to javatests/google/registry/model/domain/testdata/domain_transfer_reject.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_request.xml b/javatests/google/registry/model/domain/testdata/domain_transfer_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_request.xml
rename to javatests/google/registry/model/domain/testdata/domain_transfer_request.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_request_fee.xml b/javatests/google/registry/model/domain/testdata/domain_transfer_request_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_transfer_request_fee.xml
rename to javatests/google/registry/model/domain/testdata/domain_transfer_request_fee.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_update.xml b/javatests/google/registry/model/domain/testdata/domain_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_update.xml
rename to javatests/google/registry/model/domain/testdata/domain_update.xml
diff --git a/javatests/com/google/domain/registry/model/domain/testdata/domain_update_fee.xml b/javatests/google/registry/model/domain/testdata/domain_update_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/domain/testdata/domain_update_fee.xml
rename to javatests/google/registry/model/domain/testdata/domain_update_fee.xml
diff --git a/javatests/com/google/domain/registry/model/eppoutput/ResultTest.java b/javatests/google/registry/model/eppoutput/ResultTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/eppoutput/ResultTest.java
rename to javatests/google/registry/model/eppoutput/ResultTest.java
diff --git a/javatests/com/google/domain/registry/model/export/LogsExportCursorTest.java b/javatests/google/registry/model/export/LogsExportCursorTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/export/LogsExportCursorTest.java
rename to javatests/google/registry/model/export/LogsExportCursorTest.java
diff --git a/javatests/com/google/domain/registry/model/host/HostCommandTest.java b/javatests/google/registry/model/host/HostCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/host/HostCommandTest.java
rename to javatests/google/registry/model/host/HostCommandTest.java
diff --git a/javatests/com/google/domain/registry/model/host/HostResourceTest.java b/javatests/google/registry/model/host/HostResourceTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/host/HostResourceTest.java
rename to javatests/google/registry/model/host/HostResourceTest.java
diff --git a/javatests/com/google/domain/registry/model/host/testdata/host_check.xml b/javatests/google/registry/model/host/testdata/host_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/host/testdata/host_check.xml
rename to javatests/google/registry/model/host/testdata/host_check.xml
diff --git a/javatests/com/google/domain/registry/model/host/testdata/host_create.xml b/javatests/google/registry/model/host/testdata/host_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/host/testdata/host_create.xml
rename to javatests/google/registry/model/host/testdata/host_create.xml
diff --git a/javatests/com/google/domain/registry/model/host/testdata/host_delete.xml b/javatests/google/registry/model/host/testdata/host_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/host/testdata/host_delete.xml
rename to javatests/google/registry/model/host/testdata/host_delete.xml
diff --git a/javatests/com/google/domain/registry/model/host/testdata/host_info.xml b/javatests/google/registry/model/host/testdata/host_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/host/testdata/host_info.xml
rename to javatests/google/registry/model/host/testdata/host_info.xml
diff --git a/javatests/com/google/domain/registry/model/host/testdata/host_update.xml b/javatests/google/registry/model/host/testdata/host_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/host/testdata/host_update.xml
rename to javatests/google/registry/model/host/testdata/host_update.xml
diff --git a/javatests/com/google/domain/registry/model/index/DomainApplicationIndexTest.java b/javatests/google/registry/model/index/DomainApplicationIndexTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/index/DomainApplicationIndexTest.java
rename to javatests/google/registry/model/index/DomainApplicationIndexTest.java
diff --git a/javatests/com/google/domain/registry/model/index/EppResourceIndexTest.java b/javatests/google/registry/model/index/EppResourceIndexTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/index/EppResourceIndexTest.java
rename to javatests/google/registry/model/index/EppResourceIndexTest.java
diff --git a/javatests/com/google/domain/registry/model/index/ForeignKeyIndexTest.java b/javatests/google/registry/model/index/ForeignKeyIndexTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/index/ForeignKeyIndexTest.java
rename to javatests/google/registry/model/index/ForeignKeyIndexTest.java
diff --git a/javatests/com/google/domain/registry/model/mark/MarkContactTest.java b/javatests/google/registry/model/mark/MarkContactTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/mark/MarkContactTest.java
rename to javatests/google/registry/model/mark/MarkContactTest.java
diff --git a/javatests/com/google/domain/registry/model/mark/MarkHolderTest.java b/javatests/google/registry/model/mark/MarkHolderTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/mark/MarkHolderTest.java
rename to javatests/google/registry/model/mark/MarkHolderTest.java
diff --git a/javatests/com/google/domain/registry/model/mark/MarkProtectionTest.java b/javatests/google/registry/model/mark/MarkProtectionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/mark/MarkProtectionTest.java
rename to javatests/google/registry/model/mark/MarkProtectionTest.java
diff --git a/javatests/com/google/domain/registry/model/ofy/CommitLogBucketTest.java b/javatests/google/registry/model/ofy/CommitLogBucketTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ofy/CommitLogBucketTest.java
rename to javatests/google/registry/model/ofy/CommitLogBucketTest.java
diff --git a/javatests/com/google/domain/registry/model/ofy/CommitLogCheckpointTest.java b/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ofy/CommitLogCheckpointTest.java
rename to javatests/google/registry/model/ofy/CommitLogCheckpointTest.java
diff --git a/javatests/com/google/domain/registry/model/ofy/CommitLogMutationTest.java b/javatests/google/registry/model/ofy/CommitLogMutationTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ofy/CommitLogMutationTest.java
rename to javatests/google/registry/model/ofy/CommitLogMutationTest.java
diff --git a/javatests/com/google/domain/registry/model/ofy/ObjectifyServiceTest.java b/javatests/google/registry/model/ofy/ObjectifyServiceTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ofy/ObjectifyServiceTest.java
rename to javatests/google/registry/model/ofy/ObjectifyServiceTest.java
diff --git a/javatests/com/google/domain/registry/model/ofy/OfyCommitLogTest.java b/javatests/google/registry/model/ofy/OfyCommitLogTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ofy/OfyCommitLogTest.java
rename to javatests/google/registry/model/ofy/OfyCommitLogTest.java
diff --git a/javatests/com/google/domain/registry/model/ofy/OfyFilterTest.java b/javatests/google/registry/model/ofy/OfyFilterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ofy/OfyFilterTest.java
rename to javatests/google/registry/model/ofy/OfyFilterTest.java
diff --git a/javatests/com/google/domain/registry/model/ofy/OfyTest.java b/javatests/google/registry/model/ofy/OfyTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/ofy/OfyTest.java
rename to javatests/google/registry/model/ofy/OfyTest.java
diff --git a/javatests/com/google/domain/registry/model/poll/MessageQueueInfoTest.java b/javatests/google/registry/model/poll/MessageQueueInfoTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/poll/MessageQueueInfoTest.java
rename to javatests/google/registry/model/poll/MessageQueueInfoTest.java
diff --git a/javatests/com/google/domain/registry/model/poll/PollMessageExternalKeyConverterTest.java b/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/poll/PollMessageExternalKeyConverterTest.java
rename to javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java
diff --git a/javatests/com/google/domain/registry/model/poll/PollMessageTest.java b/javatests/google/registry/model/poll/PollMessageTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/poll/PollMessageTest.java
rename to javatests/google/registry/model/poll/PollMessageTest.java
diff --git a/javatests/com/google/domain/registry/model/rde/RdeNamingUtilsTest.java b/javatests/google/registry/model/rde/RdeNamingUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/rde/RdeNamingUtilsTest.java
rename to javatests/google/registry/model/rde/RdeNamingUtilsTest.java
diff --git a/javatests/com/google/domain/registry/model/rde/RdeRevisionTest.java b/javatests/google/registry/model/rde/RdeRevisionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/rde/RdeRevisionTest.java
rename to javatests/google/registry/model/rde/RdeRevisionTest.java
diff --git a/javatests/com/google/domain/registry/model/registrar/RegistrarTest.java b/javatests/google/registry/model/registrar/RegistrarTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/registrar/RegistrarTest.java
rename to javatests/google/registry/model/registrar/RegistrarTest.java
diff --git a/javatests/com/google/domain/registry/model/registry/RegistriesTest.java b/javatests/google/registry/model/registry/RegistriesTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/registry/RegistriesTest.java
rename to javatests/google/registry/model/registry/RegistriesTest.java
diff --git a/javatests/com/google/domain/registry/model/registry/RegistryCursorTest.java b/javatests/google/registry/model/registry/RegistryCursorTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/registry/RegistryCursorTest.java
rename to javatests/google/registry/model/registry/RegistryCursorTest.java
diff --git a/javatests/com/google/domain/registry/model/registry/RegistryTest.java b/javatests/google/registry/model/registry/RegistryTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/registry/RegistryTest.java
rename to javatests/google/registry/model/registry/RegistryTest.java
diff --git a/javatests/com/google/domain/registry/model/registry/label/PremiumListTest.java b/javatests/google/registry/model/registry/label/PremiumListTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/registry/label/PremiumListTest.java
rename to javatests/google/registry/model/registry/label/PremiumListTest.java
diff --git a/javatests/com/google/domain/registry/model/registry/label/ReservedListTest.java b/javatests/google/registry/model/registry/label/ReservedListTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/registry/label/ReservedListTest.java
rename to javatests/google/registry/model/registry/label/ReservedListTest.java
diff --git a/javatests/com/google/domain/registry/model/reporting/HistoryEntryTest.java b/javatests/google/registry/model/reporting/HistoryEntryTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/reporting/HistoryEntryTest.java
rename to javatests/google/registry/model/reporting/HistoryEntryTest.java
diff --git a/javatests/com/google/domain/registry/model/schema.txt b/javatests/google/registry/model/schema.txt
similarity index 100%
rename from javatests/com/google/domain/registry/model/schema.txt
rename to javatests/google/registry/model/schema.txt
diff --git a/javatests/com/google/domain/registry/model/server/LockTest.java b/javatests/google/registry/model/server/LockTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/server/LockTest.java
rename to javatests/google/registry/model/server/LockTest.java
diff --git a/javatests/com/google/domain/registry/model/smd/IssuerInfoTest.java b/javatests/google/registry/model/smd/IssuerInfoTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/smd/IssuerInfoTest.java
rename to javatests/google/registry/model/smd/IssuerInfoTest.java
diff --git a/javatests/com/google/domain/registry/model/smd/SignedMarkRevocationListTest.java b/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/smd/SignedMarkRevocationListTest.java
rename to javatests/google/registry/model/smd/SignedMarkRevocationListTest.java
diff --git a/javatests/com/google/domain/registry/model/testdata/domain_create.xml b/javatests/google/registry/model/testdata/domain_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/testdata/domain_create.xml
rename to javatests/google/registry/model/testdata/domain_create.xml
diff --git a/javatests/com/google/domain/registry/model/testdata/domain_delete.xml b/javatests/google/registry/model/testdata/domain_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/testdata/domain_delete.xml
rename to javatests/google/registry/model/testdata/domain_delete.xml
diff --git a/javatests/com/google/domain/registry/model/testdata/domain_update_dsdata_add.xml b/javatests/google/registry/model/testdata/domain_update_dsdata_add.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/testdata/domain_update_dsdata_add.xml
rename to javatests/google/registry/model/testdata/domain_update_dsdata_add.xml
diff --git a/javatests/com/google/domain/registry/model/testdata/domain_update_dsdata_rem.xml b/javatests/google/registry/model/testdata/domain_update_dsdata_rem.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/testdata/domain_update_dsdata_rem.xml
rename to javatests/google/registry/model/testdata/domain_update_dsdata_rem.xml
diff --git a/javatests/com/google/domain/registry/model/tmch/ClaimsListShardTest.java b/javatests/google/registry/model/tmch/ClaimsListShardTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/tmch/ClaimsListShardTest.java
rename to javatests/google/registry/model/tmch/ClaimsListShardTest.java
diff --git a/javatests/com/google/domain/registry/model/tmch/TmchCrlTest.java b/javatests/google/registry/model/tmch/TmchCrlTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/tmch/TmchCrlTest.java
rename to javatests/google/registry/model/tmch/TmchCrlTest.java
diff --git a/javatests/com/google/domain/registry/model/transfer/TransferDataTest.java b/javatests/google/registry/model/transfer/TransferDataTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/transfer/TransferDataTest.java
rename to javatests/google/registry/model/transfer/TransferDataTest.java
diff --git a/javatests/com/google/domain/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java b/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java
rename to javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java
diff --git a/javatests/com/google/domain/registry/model/translators/StatusValueAdapterTest.java b/javatests/google/registry/model/translators/StatusValueAdapterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/model/translators/StatusValueAdapterTest.java
rename to javatests/google/registry/model/translators/StatusValueAdapterTest.java
diff --git a/javatests/com/google/domain/registry/model/translators/testdata/host_update.xml b/javatests/google/registry/model/translators/testdata/host_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/model/translators/testdata/host_update.xml
rename to javatests/google/registry/model/translators/testdata/host_update.xml
diff --git a/javatests/com/google/domain/registry/module/backend/BUILD b/javatests/google/registry/module/backend/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/module/backend/BUILD
rename to javatests/google/registry/module/backend/BUILD
diff --git a/javatests/com/google/domain/registry/module/backend/BackendServletTest.java b/javatests/google/registry/module/backend/BackendServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/module/backend/BackendServletTest.java
rename to javatests/google/registry/module/backend/BackendServletTest.java
diff --git a/javatests/com/google/domain/registry/module/frontend/BUILD b/javatests/google/registry/module/frontend/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/module/frontend/BUILD
rename to javatests/google/registry/module/frontend/BUILD
diff --git a/javatests/com/google/domain/registry/module/frontend/FrontendServletTest.java b/javatests/google/registry/module/frontend/FrontendServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/module/frontend/FrontendServletTest.java
rename to javatests/google/registry/module/frontend/FrontendServletTest.java
diff --git a/javatests/com/google/domain/registry/module/tools/BUILD b/javatests/google/registry/module/tools/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/module/tools/BUILD
rename to javatests/google/registry/module/tools/BUILD
diff --git a/javatests/com/google/domain/registry/module/tools/ToolsServletTest.java b/javatests/google/registry/module/tools/ToolsServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/module/tools/ToolsServletTest.java
rename to javatests/google/registry/module/tools/ToolsServletTest.java
diff --git a/javatests/com/google/domain/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/monitoring/whitebox/BUILD
rename to javatests/google/registry/monitoring/whitebox/BUILD
diff --git a/javatests/com/google/domain/registry/monitoring/whitebox/MetricsExportActionTest.java b/javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/monitoring/whitebox/MetricsExportActionTest.java
rename to javatests/google/registry/monitoring/whitebox/MetricsExportActionTest.java
diff --git a/javatests/com/google/domain/registry/monitoring/whitebox/MetricsTest.java b/javatests/google/registry/monitoring/whitebox/MetricsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/monitoring/whitebox/MetricsTest.java
rename to javatests/google/registry/monitoring/whitebox/MetricsTest.java
diff --git a/javatests/com/google/domain/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java b/javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java
rename to javatests/google/registry/monitoring/whitebox/VerifyEntityIntegrityActionTest.java
diff --git a/javatests/com/google/domain/registry/rdap/BUILD b/javatests/google/registry/rdap/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/BUILD
rename to javatests/google/registry/rdap/BUILD
diff --git a/javatests/com/google/domain/registry/rdap/RdapActionBaseTest.java b/javatests/google/registry/rdap/RdapActionBaseTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapActionBaseTest.java
rename to javatests/google/registry/rdap/RdapActionBaseTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapDomainActionTest.java b/javatests/google/registry/rdap/RdapDomainActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapDomainActionTest.java
rename to javatests/google/registry/rdap/RdapDomainActionTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapDomainSearchActionTest.java b/javatests/google/registry/rdap/RdapDomainSearchActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapDomainSearchActionTest.java
rename to javatests/google/registry/rdap/RdapDomainSearchActionTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapEntityActionTest.java b/javatests/google/registry/rdap/RdapEntityActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapEntityActionTest.java
rename to javatests/google/registry/rdap/RdapEntityActionTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapEntitySearchActionTest.java b/javatests/google/registry/rdap/RdapEntitySearchActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapEntitySearchActionTest.java
rename to javatests/google/registry/rdap/RdapEntitySearchActionTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapHelpActionTest.java b/javatests/google/registry/rdap/RdapHelpActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapHelpActionTest.java
rename to javatests/google/registry/rdap/RdapHelpActionTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapJsonFormatterTest.java b/javatests/google/registry/rdap/RdapJsonFormatterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapJsonFormatterTest.java
rename to javatests/google/registry/rdap/RdapJsonFormatterTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapNameserverActionTest.java b/javatests/google/registry/rdap/RdapNameserverActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapNameserverActionTest.java
rename to javatests/google/registry/rdap/RdapNameserverActionTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapNameserverSearchActionTest.java b/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapNameserverSearchActionTest.java
rename to javatests/google/registry/rdap/RdapNameserverSearchActionTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapSearchPatternTest.java b/javatests/google/registry/rdap/RdapSearchPatternTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapSearchPatternTest.java
rename to javatests/google/registry/rdap/RdapSearchPatternTest.java
diff --git a/javatests/com/google/domain/registry/rdap/RdapTestHelper.java b/javatests/google/registry/rdap/RdapTestHelper.java
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/RdapTestHelper.java
rename to javatests/google/registry/rdap/RdapTestHelper.java
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_contact.json b/javatests/google/registry/rdap/testdata/rdap_contact.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_contact.json
rename to javatests/google/registry/rdap/testdata/rdap_contact.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_domain.json b/javatests/google/registry/rdap/testdata/rdap_domain.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_domain.json
rename to javatests/google/registry/rdap/testdata/rdap_domain.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_domain_unicode.json b/javatests/google/registry/rdap/testdata/rdap_domain_unicode.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_domain_unicode.json
rename to javatests/google/registry/rdap/testdata/rdap_domain_unicode.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_error_400.json b/javatests/google/registry/rdap/testdata/rdap_error_400.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_error_400.json
rename to javatests/google/registry/rdap/testdata/rdap_error_400.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_error_404.json b/javatests/google/registry/rdap/testdata/rdap_error_404.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_error_404.json
rename to javatests/google/registry/rdap/testdata/rdap_error_404.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_error_422.json b/javatests/google/registry/rdap/testdata/rdap_error_422.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_error_422.json
rename to javatests/google/registry/rdap/testdata/rdap_error_422.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_error_501.json b/javatests/google/registry/rdap/testdata/rdap_error_501.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_error_501.json
rename to javatests/google/registry/rdap/testdata/rdap_error_501.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_help_index.json b/javatests/google/registry/rdap/testdata/rdap_help_index.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_help_index.json
rename to javatests/google/registry/rdap/testdata/rdap_help_index.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_help_tos.json b/javatests/google/registry/rdap/testdata/rdap_help_tos.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_help_tos.json
rename to javatests/google/registry/rdap/testdata/rdap_help_tos.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_host.json b/javatests/google/registry/rdap/testdata/rdap_host.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_host.json
rename to javatests/google/registry/rdap/testdata/rdap_host.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_host_external.json b/javatests/google/registry/rdap/testdata/rdap_host_external.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_host_external.json
rename to javatests/google/registry/rdap/testdata/rdap_host_external.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_host_unicode.json b/javatests/google/registry/rdap/testdata/rdap_host_unicode.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_host_unicode.json
rename to javatests/google/registry/rdap/testdata/rdap_host_unicode.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_multiple_contacts.json b/javatests/google/registry/rdap/testdata/rdap_multiple_contacts.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_multiple_contacts.json
rename to javatests/google/registry/rdap/testdata/rdap_multiple_contacts.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_multiple_domains.json b/javatests/google/registry/rdap/testdata/rdap_multiple_domains.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_multiple_domains.json
rename to javatests/google/registry/rdap/testdata/rdap_multiple_domains.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_multiple_hosts.json b/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_multiple_hosts.json
rename to javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdap_registrar.json b/javatests/google/registry/rdap/testdata/rdap_registrar.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdap_registrar.json
rename to javatests/google/registry/rdap/testdata/rdap_registrar.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_admincontact.json b/javatests/google/registry/rdap/testdata/rdapjson_admincontact.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_admincontact.json
rename to javatests/google/registry/rdap/testdata/rdapjson_admincontact.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_domain_full.json b/javatests/google/registry/rdap/testdata/rdapjson_domain_full.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_domain_full.json
rename to javatests/google/registry/rdap/testdata/rdapjson_domain_full.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_domain_no_contacts.json b/javatests/google/registry/rdap/testdata/rdapjson_domain_no_contacts.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_domain_no_contacts.json
rename to javatests/google/registry/rdap/testdata/rdapjson_domain_no_contacts.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_domain_no_nameservers.json b/javatests/google/registry/rdap/testdata/rdapjson_domain_no_nameservers.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_domain_no_nameservers.json
rename to javatests/google/registry/rdap/testdata/rdapjson_domain_no_nameservers.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_domain_no_registrant.json b/javatests/google/registry/rdap/testdata/rdapjson_domain_no_registrant.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_domain_no_registrant.json
rename to javatests/google/registry/rdap/testdata/rdapjson_domain_no_registrant.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_error.json b/javatests/google/registry/rdap/testdata/rdapjson_error.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_error.json
rename to javatests/google/registry/rdap/testdata/rdapjson_error.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_host_both.json b/javatests/google/registry/rdap/testdata/rdapjson_host_both.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_host_both.json
rename to javatests/google/registry/rdap/testdata/rdapjson_host_both.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_host_ipv4.json b/javatests/google/registry/rdap/testdata/rdapjson_host_ipv4.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_host_ipv4.json
rename to javatests/google/registry/rdap/testdata/rdapjson_host_ipv4.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_host_ipv6.json b/javatests/google/registry/rdap/testdata/rdapjson_host_ipv6.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_host_ipv6.json
rename to javatests/google/registry/rdap/testdata/rdapjson_host_ipv6.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_host_no_addresses.json b/javatests/google/registry/rdap/testdata/rdapjson_host_no_addresses.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_host_no_addresses.json
rename to javatests/google/registry/rdap/testdata/rdapjson_host_no_addresses.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_notice_alternate_link.json b/javatests/google/registry/rdap/testdata/rdapjson_notice_alternate_link.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_notice_alternate_link.json
rename to javatests/google/registry/rdap/testdata/rdapjson_notice_alternate_link.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_notice_self_link.json b/javatests/google/registry/rdap/testdata/rdapjson_notice_self_link.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_notice_self_link.json
rename to javatests/google/registry/rdap/testdata/rdapjson_notice_self_link.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_registrant.json b/javatests/google/registry/rdap/testdata/rdapjson_registrant.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_registrant.json
rename to javatests/google/registry/rdap/testdata/rdapjson_registrant.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_registrant_nobase.json b/javatests/google/registry/rdap/testdata/rdapjson_registrant_nobase.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_registrant_nobase.json
rename to javatests/google/registry/rdap/testdata/rdapjson_registrant_nobase.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_registrar.json b/javatests/google/registry/rdap/testdata/rdapjson_registrar.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_registrar.json
rename to javatests/google/registry/rdap/testdata/rdapjson_registrar.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_techcontact.json b/javatests/google/registry/rdap/testdata/rdapjson_techcontact.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_techcontact.json
rename to javatests/google/registry/rdap/testdata/rdapjson_techcontact.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_toplevel.json b/javatests/google/registry/rdap/testdata/rdapjson_toplevel.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_toplevel.json
rename to javatests/google/registry/rdap/testdata/rdapjson_toplevel.json
diff --git a/javatests/com/google/domain/registry/rdap/testdata/rdapjson_toplevel_domain.json b/javatests/google/registry/rdap/testdata/rdapjson_toplevel_domain.json
similarity index 100%
rename from javatests/com/google/domain/registry/rdap/testdata/rdapjson_toplevel_domain.json
rename to javatests/google/registry/rdap/testdata/rdapjson_toplevel_domain.json
diff --git a/javatests/com/google/domain/registry/rde/BUILD b/javatests/google/registry/rde/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/rde/BUILD
rename to javatests/google/registry/rde/BUILD
diff --git a/javatests/com/google/domain/registry/rde/BouncyCastleTest.java b/javatests/google/registry/rde/BouncyCastleTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/BouncyCastleTest.java
rename to javatests/google/registry/rde/BouncyCastleTest.java
diff --git a/javatests/com/google/domain/registry/rde/BrdaCopyActionTest.java b/javatests/google/registry/rde/BrdaCopyActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/BrdaCopyActionTest.java
rename to javatests/google/registry/rde/BrdaCopyActionTest.java
diff --git a/javatests/com/google/domain/registry/rde/ContactResourceToXjcConverterTest.java b/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/ContactResourceToXjcConverterTest.java
rename to javatests/google/registry/rde/ContactResourceToXjcConverterTest.java
diff --git a/javatests/com/google/domain/registry/rde/DomainResourceToXjcConverterTest.java b/javatests/google/registry/rde/DomainResourceToXjcConverterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/DomainResourceToXjcConverterTest.java
rename to javatests/google/registry/rde/DomainResourceToXjcConverterTest.java
diff --git a/javatests/com/google/domain/registry/rde/EscrowTaskRunnerTest.java b/javatests/google/registry/rde/EscrowTaskRunnerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/EscrowTaskRunnerTest.java
rename to javatests/google/registry/rde/EscrowTaskRunnerTest.java
diff --git a/javatests/com/google/domain/registry/rde/GhostrydeGpgIntegrationTest.java b/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/GhostrydeGpgIntegrationTest.java
rename to javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java
diff --git a/javatests/com/google/domain/registry/rde/GhostrydeTest.java b/javatests/google/registry/rde/GhostrydeTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/GhostrydeTest.java
rename to javatests/google/registry/rde/GhostrydeTest.java
diff --git a/javatests/com/google/domain/registry/rde/HostResourceToXjcConverterTest.java b/javatests/google/registry/rde/HostResourceToXjcConverterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/HostResourceToXjcConverterTest.java
rename to javatests/google/registry/rde/HostResourceToXjcConverterTest.java
diff --git a/javatests/com/google/domain/registry/rde/PendingDepositCheckerTest.java b/javatests/google/registry/rde/PendingDepositCheckerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/PendingDepositCheckerTest.java
rename to javatests/google/registry/rde/PendingDepositCheckerTest.java
diff --git a/javatests/com/google/domain/registry/rde/RdeFixtures.java b/javatests/google/registry/rde/RdeFixtures.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RdeFixtures.java
rename to javatests/google/registry/rde/RdeFixtures.java
diff --git a/javatests/com/google/domain/registry/rde/RdeKeyringModule.java b/javatests/google/registry/rde/RdeKeyringModule.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RdeKeyringModule.java
rename to javatests/google/registry/rde/RdeKeyringModule.java
diff --git a/javatests/com/google/domain/registry/rde/RdeMarshallerTest.java b/javatests/google/registry/rde/RdeMarshallerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RdeMarshallerTest.java
rename to javatests/google/registry/rde/RdeMarshallerTest.java
diff --git a/javatests/com/google/domain/registry/rde/RdeReportActionTest.java b/javatests/google/registry/rde/RdeReportActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RdeReportActionTest.java
rename to javatests/google/registry/rde/RdeReportActionTest.java
diff --git a/javatests/com/google/domain/registry/rde/RdeStagingActionTest.java b/javatests/google/registry/rde/RdeStagingActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RdeStagingActionTest.java
rename to javatests/google/registry/rde/RdeStagingActionTest.java
diff --git a/javatests/com/google/domain/registry/rde/RdeTestData.java b/javatests/google/registry/rde/RdeTestData.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RdeTestData.java
rename to javatests/google/registry/rde/RdeTestData.java
diff --git a/javatests/com/google/domain/registry/rde/RdeTestSuite.java b/javatests/google/registry/rde/RdeTestSuite.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RdeTestSuite.java
rename to javatests/google/registry/rde/RdeTestSuite.java
diff --git a/javatests/com/google/domain/registry/rde/RdeUploadActionTest.java b/javatests/google/registry/rde/RdeUploadActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RdeUploadActionTest.java
rename to javatests/google/registry/rde/RdeUploadActionTest.java
diff --git a/javatests/com/google/domain/registry/rde/RegistrarToXjcConverterTest.java b/javatests/google/registry/rde/RegistrarToXjcConverterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RegistrarToXjcConverterTest.java
rename to javatests/google/registry/rde/RegistrarToXjcConverterTest.java
diff --git a/javatests/com/google/domain/registry/rde/RydeGpgIntegrationTest.java b/javatests/google/registry/rde/RydeGpgIntegrationTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/rde/RydeGpgIntegrationTest.java
rename to javatests/google/registry/rde/RydeGpgIntegrationTest.java
diff --git a/javatests/com/google/domain/registry/rde/testdata/contact_create.xml b/javatests/google/registry/rde/testdata/contact_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/contact_create.xml
rename to javatests/google/registry/rde/testdata/contact_create.xml
diff --git a/javatests/com/google/domain/registry/rde/testdata/deposit_full.xml b/javatests/google/registry/rde/testdata/deposit_full.xml
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/deposit_full.xml
rename to javatests/google/registry/rde/testdata/deposit_full.xml
diff --git a/javatests/com/google/domain/registry/rde/testdata/deposit_full_badref.xml b/javatests/google/registry/rde/testdata/deposit_full_badref.xml
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/deposit_full_badref.xml
rename to javatests/google/registry/rde/testdata/deposit_full_badref.xml
diff --git a/javatests/com/google/domain/registry/rde/testdata/iirdea_bad.xml b/javatests/google/registry/rde/testdata/iirdea_bad.xml
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/iirdea_bad.xml
rename to javatests/google/registry/rde/testdata/iirdea_bad.xml
diff --git a/javatests/com/google/domain/registry/rde/testdata/iirdea_good.xml b/javatests/google/registry/rde/testdata/iirdea_good.xml
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/iirdea_good.xml
rename to javatests/google/registry/rde/testdata/iirdea_good.xml
diff --git a/javatests/com/google/domain/registry/rde/testdata/pgp-private-keyring-escrow.asc b/javatests/google/registry/rde/testdata/pgp-private-keyring-escrow.asc
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/pgp-private-keyring-escrow.asc
rename to javatests/google/registry/rde/testdata/pgp-private-keyring-escrow.asc
diff --git a/javatests/com/google/domain/registry/rde/testdata/pgp-private-keyring-registry.asc b/javatests/google/registry/rde/testdata/pgp-private-keyring-registry.asc
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/pgp-private-keyring-registry.asc
rename to javatests/google/registry/rde/testdata/pgp-private-keyring-registry.asc
diff --git a/javatests/com/google/domain/registry/rde/testdata/pgp-public-keyring.asc b/javatests/google/registry/rde/testdata/pgp-public-keyring.asc
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/pgp-public-keyring.asc
rename to javatests/google/registry/rde/testdata/pgp-public-keyring.asc
diff --git a/javatests/com/google/domain/registry/rde/testdata/registry-unittest.id_rsa b/javatests/google/registry/rde/testdata/registry-unittest.id_rsa
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/registry-unittest.id_rsa
rename to javatests/google/registry/rde/testdata/registry-unittest.id_rsa
diff --git a/javatests/com/google/domain/registry/rde/testdata/registry-unittest.id_rsa.pub b/javatests/google/registry/rde/testdata/registry-unittest.id_rsa.pub
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/registry-unittest.id_rsa.pub
rename to javatests/google/registry/rde/testdata/registry-unittest.id_rsa.pub
diff --git a/javatests/com/google/domain/registry/rde/testdata/report.xml b/javatests/google/registry/rde/testdata/report.xml
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/report.xml
rename to javatests/google/registry/rde/testdata/report.xml
diff --git a/javatests/com/google/domain/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml b/javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml
rename to javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml
diff --git a/javatests/com/google/domain/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml b/javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml
similarity index 100%
rename from javatests/com/google/domain/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml
rename to javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml
diff --git a/javatests/com/google/domain/registry/request/BUILD b/javatests/google/registry/request/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/request/BUILD
rename to javatests/google/registry/request/BUILD
diff --git a/javatests/com/google/domain/registry/request/JsonResponseTest.java b/javatests/google/registry/request/JsonResponseTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/request/JsonResponseTest.java
rename to javatests/google/registry/request/JsonResponseTest.java
diff --git a/javatests/com/google/domain/registry/request/RequestHandlerTest.java b/javatests/google/registry/request/RequestHandlerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/request/RequestHandlerTest.java
rename to javatests/google/registry/request/RequestHandlerTest.java
diff --git a/javatests/com/google/domain/registry/request/RequestModuleTest.java b/javatests/google/registry/request/RequestModuleTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/request/RequestModuleTest.java
rename to javatests/google/registry/request/RequestModuleTest.java
diff --git a/javatests/com/google/domain/registry/request/RequestParametersTest.java b/javatests/google/registry/request/RequestParametersTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/request/RequestParametersTest.java
rename to javatests/google/registry/request/RequestParametersTest.java
diff --git a/javatests/com/google/domain/registry/request/ResponseImplTest.java b/javatests/google/registry/request/ResponseImplTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/request/ResponseImplTest.java
rename to javatests/google/registry/request/ResponseImplTest.java
diff --git a/javatests/com/google/domain/registry/request/RouterTest.java b/javatests/google/registry/request/RouterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/request/RouterTest.java
rename to javatests/google/registry/request/RouterTest.java
diff --git a/javatests/com/google/domain/registry/security/BUILD b/javatests/google/registry/security/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/security/BUILD
rename to javatests/google/registry/security/BUILD
diff --git a/javatests/com/google/domain/registry/security/JsonHttpTest.java b/javatests/google/registry/security/JsonHttpTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/security/JsonHttpTest.java
rename to javatests/google/registry/security/JsonHttpTest.java
diff --git a/javatests/com/google/domain/registry/security/JsonHttpTestUtils.java b/javatests/google/registry/security/JsonHttpTestUtils.java
similarity index 100%
rename from javatests/com/google/domain/registry/security/JsonHttpTestUtils.java
rename to javatests/google/registry/security/JsonHttpTestUtils.java
diff --git a/javatests/com/google/domain/registry/security/JsonTransportServletTest.java b/javatests/google/registry/security/JsonTransportServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/security/JsonTransportServletTest.java
rename to javatests/google/registry/security/JsonTransportServletTest.java
diff --git a/javatests/com/google/domain/registry/security/XsrfProtectedServletTest.java b/javatests/google/registry/security/XsrfProtectedServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/security/XsrfProtectedServletTest.java
rename to javatests/google/registry/security/XsrfProtectedServletTest.java
diff --git a/javatests/com/google/domain/registry/security/XsrfTokenManagerTest.java b/javatests/google/registry/security/XsrfTokenManagerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/security/XsrfTokenManagerTest.java
rename to javatests/google/registry/security/XsrfTokenManagerTest.java
diff --git a/javatests/com/google/domain/registry/server/BUILD b/javatests/google/registry/server/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/server/BUILD
rename to javatests/google/registry/server/BUILD
diff --git a/javatests/com/google/domain/registry/server/Fixture.java b/javatests/google/registry/server/Fixture.java
similarity index 100%
rename from javatests/com/google/domain/registry/server/Fixture.java
rename to javatests/google/registry/server/Fixture.java
diff --git a/javatests/com/google/domain/registry/server/HealthzServlet.java b/javatests/google/registry/server/HealthzServlet.java
similarity index 100%
rename from javatests/com/google/domain/registry/server/HealthzServlet.java
rename to javatests/google/registry/server/HealthzServlet.java
diff --git a/javatests/com/google/domain/registry/server/RegistryTestServer.java b/javatests/google/registry/server/RegistryTestServer.java
similarity index 100%
rename from javatests/com/google/domain/registry/server/RegistryTestServer.java
rename to javatests/google/registry/server/RegistryTestServer.java
diff --git a/javatests/com/google/domain/registry/server/RegistryTestServerMain.java b/javatests/google/registry/server/RegistryTestServerMain.java
similarity index 100%
rename from javatests/com/google/domain/registry/server/RegistryTestServerMain.java
rename to javatests/google/registry/server/RegistryTestServerMain.java
diff --git a/javatests/com/google/domain/registry/server/Route.java b/javatests/google/registry/server/Route.java
similarity index 100%
rename from javatests/com/google/domain/registry/server/Route.java
rename to javatests/google/registry/server/Route.java
diff --git a/javatests/com/google/domain/registry/server/ServletWrapperDelegatorServlet.java b/javatests/google/registry/server/ServletWrapperDelegatorServlet.java
similarity index 100%
rename from javatests/com/google/domain/registry/server/ServletWrapperDelegatorServlet.java
rename to javatests/google/registry/server/ServletWrapperDelegatorServlet.java
diff --git a/javatests/com/google/domain/registry/server/StaticResourceServlet.java b/javatests/google/registry/server/StaticResourceServlet.java
similarity index 100%
rename from javatests/com/google/domain/registry/server/StaticResourceServlet.java
rename to javatests/google/registry/server/StaticResourceServlet.java
diff --git a/javatests/com/google/domain/registry/server/TestServer.java b/javatests/google/registry/server/TestServer.java
similarity index 100%
rename from javatests/com/google/domain/registry/server/TestServer.java
rename to javatests/google/registry/server/TestServer.java
diff --git a/javatests/com/google/domain/registry/server/UrlChecker.java b/javatests/google/registry/server/UrlChecker.java
similarity index 100%
rename from javatests/com/google/domain/registry/server/UrlChecker.java
rename to javatests/google/registry/server/UrlChecker.java
diff --git a/javatests/com/google/domain/registry/storage/drive/BUILD b/javatests/google/registry/storage/drive/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/storage/drive/BUILD
rename to javatests/google/registry/storage/drive/BUILD
diff --git a/javatests/com/google/domain/registry/storage/drive/DriveConnectionTest.java b/javatests/google/registry/storage/drive/DriveConnectionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/storage/drive/DriveConnectionTest.java
rename to javatests/google/registry/storage/drive/DriveConnectionTest.java
diff --git a/javatests/com/google/domain/registry/testing/AbstractDomainBaseSubject.java b/javatests/google/registry/testing/AbstractDomainBaseSubject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/AbstractDomainBaseSubject.java
rename to javatests/google/registry/testing/AbstractDomainBaseSubject.java
diff --git a/javatests/com/google/domain/registry/testing/AbstractEppResourceSubject.java b/javatests/google/registry/testing/AbstractEppResourceSubject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/AbstractEppResourceSubject.java
rename to javatests/google/registry/testing/AbstractEppResourceSubject.java
diff --git a/javatests/com/google/domain/registry/testing/AppEngineRule.java b/javatests/google/registry/testing/AppEngineRule.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/AppEngineRule.java
rename to javatests/google/registry/testing/AppEngineRule.java
diff --git a/javatests/com/google/domain/registry/testing/BUILD b/javatests/google/registry/testing/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/testing/BUILD
rename to javatests/google/registry/testing/BUILD
diff --git a/javatests/com/google/domain/registry/testing/BouncyCastleProviderRule.java b/javatests/google/registry/testing/BouncyCastleProviderRule.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/BouncyCastleProviderRule.java
rename to javatests/google/registry/testing/BouncyCastleProviderRule.java
diff --git a/javatests/com/google/domain/registry/testing/CertificateSamples.java b/javatests/google/registry/testing/CertificateSamples.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/CertificateSamples.java
rename to javatests/google/registry/testing/CertificateSamples.java
diff --git a/javatests/com/google/domain/registry/testing/ContactResourceSubject.java b/javatests/google/registry/testing/ContactResourceSubject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/ContactResourceSubject.java
rename to javatests/google/registry/testing/ContactResourceSubject.java
diff --git a/javatests/com/google/domain/registry/testing/DatastoreHelper.java b/javatests/google/registry/testing/DatastoreHelper.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/DatastoreHelper.java
rename to javatests/google/registry/testing/DatastoreHelper.java
diff --git a/javatests/com/google/domain/registry/testing/DomainApplicationSubject.java b/javatests/google/registry/testing/DomainApplicationSubject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/DomainApplicationSubject.java
rename to javatests/google/registry/testing/DomainApplicationSubject.java
diff --git a/javatests/com/google/domain/registry/testing/DomainResourceSubject.java b/javatests/google/registry/testing/DomainResourceSubject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/DomainResourceSubject.java
rename to javatests/google/registry/testing/DomainResourceSubject.java
diff --git a/javatests/com/google/domain/registry/testing/EppLoader.java b/javatests/google/registry/testing/EppLoader.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/EppLoader.java
rename to javatests/google/registry/testing/EppLoader.java
diff --git a/javatests/com/google/domain/registry/testing/ExceptionRule.java b/javatests/google/registry/testing/ExceptionRule.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/ExceptionRule.java
rename to javatests/google/registry/testing/ExceptionRule.java
diff --git a/javatests/com/google/domain/registry/testing/FailAnswer.java b/javatests/google/registry/testing/FailAnswer.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/FailAnswer.java
rename to javatests/google/registry/testing/FailAnswer.java
diff --git a/javatests/com/google/domain/registry/testing/FakeClock.java b/javatests/google/registry/testing/FakeClock.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/FakeClock.java
rename to javatests/google/registry/testing/FakeClock.java
diff --git a/javatests/com/google/domain/registry/testing/FakeJsonResponse.java b/javatests/google/registry/testing/FakeJsonResponse.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/FakeJsonResponse.java
rename to javatests/google/registry/testing/FakeJsonResponse.java
diff --git a/javatests/com/google/domain/registry/testing/FakeResponse.java b/javatests/google/registry/testing/FakeResponse.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/FakeResponse.java
rename to javatests/google/registry/testing/FakeResponse.java
diff --git a/javatests/com/google/domain/registry/testing/FakeServletInputStream.java b/javatests/google/registry/testing/FakeServletInputStream.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/FakeServletInputStream.java
rename to javatests/google/registry/testing/FakeServletInputStream.java
diff --git a/javatests/com/google/domain/registry/testing/FakeServletOutputStream.java b/javatests/google/registry/testing/FakeServletOutputStream.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/FakeServletOutputStream.java
rename to javatests/google/registry/testing/FakeServletOutputStream.java
diff --git a/javatests/com/google/domain/registry/testing/FakeSleeper.java b/javatests/google/registry/testing/FakeSleeper.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/FakeSleeper.java
rename to javatests/google/registry/testing/FakeSleeper.java
diff --git a/javatests/com/google/domain/registry/testing/FakeURLFetchService.java b/javatests/google/registry/testing/FakeURLFetchService.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/FakeURLFetchService.java
rename to javatests/google/registry/testing/FakeURLFetchService.java
diff --git a/javatests/com/google/domain/registry/testing/ForwardingURLFetchService.java b/javatests/google/registry/testing/ForwardingURLFetchService.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/ForwardingURLFetchService.java
rename to javatests/google/registry/testing/ForwardingURLFetchService.java
diff --git a/javatests/com/google/domain/registry/testing/FullFieldsTestEntityHelper.java b/javatests/google/registry/testing/FullFieldsTestEntityHelper.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/FullFieldsTestEntityHelper.java
rename to javatests/google/registry/testing/FullFieldsTestEntityHelper.java
diff --git a/javatests/com/google/domain/registry/testing/GcsTestingUtils.java b/javatests/google/registry/testing/GcsTestingUtils.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/GcsTestingUtils.java
rename to javatests/google/registry/testing/GcsTestingUtils.java
diff --git a/javatests/com/google/domain/registry/testing/GenericEppResourceSubject.java b/javatests/google/registry/testing/GenericEppResourceSubject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/GenericEppResourceSubject.java
rename to javatests/google/registry/testing/GenericEppResourceSubject.java
diff --git a/javatests/com/google/domain/registry/testing/GpgSystemCommandRule.java b/javatests/google/registry/testing/GpgSystemCommandRule.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/GpgSystemCommandRule.java
rename to javatests/google/registry/testing/GpgSystemCommandRule.java
diff --git a/javatests/com/google/domain/registry/testing/HistoryEntrySubject.java b/javatests/google/registry/testing/HistoryEntrySubject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/HistoryEntrySubject.java
rename to javatests/google/registry/testing/HistoryEntrySubject.java
diff --git a/javatests/com/google/domain/registry/testing/HostResourceSubject.java b/javatests/google/registry/testing/HostResourceSubject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/HostResourceSubject.java
rename to javatests/google/registry/testing/HostResourceSubject.java
diff --git a/javatests/com/google/domain/registry/testing/InjectRule.java b/javatests/google/registry/testing/InjectRule.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/InjectRule.java
rename to javatests/google/registry/testing/InjectRule.java
diff --git a/javatests/com/google/domain/registry/testing/IoSpyRule.java b/javatests/google/registry/testing/IoSpyRule.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/IoSpyRule.java
rename to javatests/google/registry/testing/IoSpyRule.java
diff --git a/javatests/com/google/domain/registry/testing/LogsSubject.java b/javatests/google/registry/testing/LogsSubject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/LogsSubject.java
rename to javatests/google/registry/testing/LogsSubject.java
diff --git a/javatests/com/google/domain/registry/testing/Providers.java b/javatests/google/registry/testing/Providers.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/Providers.java
rename to javatests/google/registry/testing/Providers.java
diff --git a/javatests/com/google/domain/registry/testing/ReflectiveFieldExtractor.java b/javatests/google/registry/testing/ReflectiveFieldExtractor.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/ReflectiveFieldExtractor.java
rename to javatests/google/registry/testing/ReflectiveFieldExtractor.java
diff --git a/javatests/com/google/domain/registry/testing/ReflectiveSubjectFactory.java b/javatests/google/registry/testing/ReflectiveSubjectFactory.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/ReflectiveSubjectFactory.java
rename to javatests/google/registry/testing/ReflectiveSubjectFactory.java
diff --git a/javatests/com/google/domain/registry/testing/RegistryConfigRule.java b/javatests/google/registry/testing/RegistryConfigRule.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/RegistryConfigRule.java
rename to javatests/google/registry/testing/RegistryConfigRule.java
diff --git a/javatests/com/google/domain/registry/testing/SlurpAnswer.java b/javatests/google/registry/testing/SlurpAnswer.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/SlurpAnswer.java
rename to javatests/google/registry/testing/SlurpAnswer.java
diff --git a/javatests/com/google/domain/registry/testing/SystemInfo.java b/javatests/google/registry/testing/SystemInfo.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/SystemInfo.java
rename to javatests/google/registry/testing/SystemInfo.java
diff --git a/javatests/com/google/domain/registry/testing/SystemPropertyRule.java b/javatests/google/registry/testing/SystemPropertyRule.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/SystemPropertyRule.java
rename to javatests/google/registry/testing/SystemPropertyRule.java
diff --git a/javatests/com/google/domain/registry/testing/TaskQueueHelper.java b/javatests/google/registry/testing/TaskQueueHelper.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/TaskQueueHelper.java
rename to javatests/google/registry/testing/TaskQueueHelper.java
diff --git a/javatests/com/google/domain/registry/testing/TestDataHelper.java b/javatests/google/registry/testing/TestDataHelper.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/TestDataHelper.java
rename to javatests/google/registry/testing/TestDataHelper.java
diff --git a/javatests/com/google/domain/registry/testing/TestObject.java b/javatests/google/registry/testing/TestObject.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/TestObject.java
rename to javatests/google/registry/testing/TestObject.java
diff --git a/javatests/com/google/domain/registry/testing/TestSessionMetadata.java b/javatests/google/registry/testing/TestSessionMetadata.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/TestSessionMetadata.java
rename to javatests/google/registry/testing/TestSessionMetadata.java
diff --git a/javatests/com/google/domain/registry/testing/TruthChainer.java b/javatests/google/registry/testing/TruthChainer.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/TruthChainer.java
rename to javatests/google/registry/testing/TruthChainer.java
diff --git a/javatests/com/google/domain/registry/testing/UriParameters.java b/javatests/google/registry/testing/UriParameters.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/UriParameters.java
rename to javatests/google/registry/testing/UriParameters.java
diff --git a/javatests/com/google/domain/registry/testing/UserInfo.java b/javatests/google/registry/testing/UserInfo.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/UserInfo.java
rename to javatests/google/registry/testing/UserInfo.java
diff --git a/javatests/com/google/domain/registry/testing/default_premium_list_testdata.csv b/javatests/google/registry/testing/default_premium_list_testdata.csv
similarity index 100%
rename from javatests/com/google/domain/registry/testing/default_premium_list_testdata.csv
rename to javatests/google/registry/testing/default_premium_list_testdata.csv
diff --git a/javatests/com/google/domain/registry/testing/logging.properties b/javatests/google/registry/testing/logging.properties
similarity index 100%
rename from javatests/com/google/domain/registry/testing/logging.properties
rename to javatests/google/registry/testing/logging.properties
diff --git a/javatests/com/google/domain/registry/testing/mapreduce/BUILD b/javatests/google/registry/testing/mapreduce/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/testing/mapreduce/BUILD
rename to javatests/google/registry/testing/mapreduce/BUILD
diff --git a/javatests/com/google/domain/registry/testing/mapreduce/MapreduceTestCase.java b/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/mapreduce/MapreduceTestCase.java
rename to javatests/google/registry/testing/mapreduce/MapreduceTestCase.java
diff --git a/javatests/com/google/domain/registry/testing/package-info.java b/javatests/google/registry/testing/package-info.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/package-info.java
rename to javatests/google/registry/testing/package-info.java
diff --git a/javatests/com/google/domain/registry/testing/sftp/BUILD b/javatests/google/registry/testing/sftp/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/testing/sftp/BUILD
rename to javatests/google/registry/testing/sftp/BUILD
diff --git a/javatests/com/google/domain/registry/testing/sftp/SftpServerRule.java b/javatests/google/registry/testing/sftp/SftpServerRule.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/sftp/SftpServerRule.java
rename to javatests/google/registry/testing/sftp/SftpServerRule.java
diff --git a/javatests/com/google/domain/registry/testing/sftp/TestSftpServer.java b/javatests/google/registry/testing/sftp/TestSftpServer.java
similarity index 100%
rename from javatests/com/google/domain/registry/testing/sftp/TestSftpServer.java
rename to javatests/google/registry/testing/sftp/TestSftpServer.java
diff --git a/javatests/com/google/domain/registry/tldconfig/idn/BUILD b/javatests/google/registry/tldconfig/idn/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/tldconfig/idn/BUILD
rename to javatests/google/registry/tldconfig/idn/BUILD
diff --git a/javatests/com/google/domain/registry/tldconfig/idn/IdnLabelValidatorTest.java b/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tldconfig/idn/IdnLabelValidatorTest.java
rename to javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java
diff --git a/javatests/com/google/domain/registry/tldconfig/idn/IdnTableTest.java b/javatests/google/registry/tldconfig/idn/IdnTableTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tldconfig/idn/IdnTableTest.java
rename to javatests/google/registry/tldconfig/idn/IdnTableTest.java
diff --git a/javatests/com/google/domain/registry/tmch/BUILD b/javatests/google/registry/tmch/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/BUILD
rename to javatests/google/registry/tmch/BUILD
diff --git a/javatests/com/google/domain/registry/tmch/LordnLogTest.java b/javatests/google/registry/tmch/LordnLogTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/LordnLogTest.java
rename to javatests/google/registry/tmch/LordnLogTest.java
diff --git a/javatests/com/google/domain/registry/tmch/LordnTaskTest.java b/javatests/google/registry/tmch/LordnTaskTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/LordnTaskTest.java
rename to javatests/google/registry/tmch/LordnTaskTest.java
diff --git a/javatests/com/google/domain/registry/tmch/NordnUploadActionTest.java b/javatests/google/registry/tmch/NordnUploadActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/NordnUploadActionTest.java
rename to javatests/google/registry/tmch/NordnUploadActionTest.java
diff --git a/javatests/com/google/domain/registry/tmch/NordnVerifyActionTest.java b/javatests/google/registry/tmch/NordnVerifyActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/NordnVerifyActionTest.java
rename to javatests/google/registry/tmch/NordnVerifyActionTest.java
diff --git a/javatests/com/google/domain/registry/tmch/SmdrlCsvParserTest.java b/javatests/google/registry/tmch/SmdrlCsvParserTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/SmdrlCsvParserTest.java
rename to javatests/google/registry/tmch/SmdrlCsvParserTest.java
diff --git a/javatests/com/google/domain/registry/tmch/TmchActionTestCase.java b/javatests/google/registry/tmch/TmchActionTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/TmchActionTestCase.java
rename to javatests/google/registry/tmch/TmchActionTestCase.java
diff --git a/javatests/com/google/domain/registry/tmch/TmchCertificateAuthorityTest.java b/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/TmchCertificateAuthorityTest.java
rename to javatests/google/registry/tmch/TmchCertificateAuthorityTest.java
diff --git a/javatests/com/google/domain/registry/tmch/TmchCrlActionTest.java b/javatests/google/registry/tmch/TmchCrlActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/TmchCrlActionTest.java
rename to javatests/google/registry/tmch/TmchCrlActionTest.java
diff --git a/javatests/com/google/domain/registry/tmch/TmchDnlActionTest.java b/javatests/google/registry/tmch/TmchDnlActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/TmchDnlActionTest.java
rename to javatests/google/registry/tmch/TmchDnlActionTest.java
diff --git a/javatests/com/google/domain/registry/tmch/TmchSmdrlActionTest.java b/javatests/google/registry/tmch/TmchSmdrlActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/TmchSmdrlActionTest.java
rename to javatests/google/registry/tmch/TmchSmdrlActionTest.java
diff --git a/javatests/com/google/domain/registry/tmch/TmchTestData.java b/javatests/google/registry/tmch/TmchTestData.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/TmchTestData.java
rename to javatests/google/registry/tmch/TmchTestData.java
diff --git a/javatests/com/google/domain/registry/tmch/TmchTestSuite.java b/javatests/google/registry/tmch/TmchTestSuite.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/TmchTestSuite.java
rename to javatests/google/registry/tmch/TmchTestSuite.java
diff --git a/javatests/com/google/domain/registry/tmch/TmchXmlSignatureTest.java b/javatests/google/registry/tmch/TmchXmlSignatureTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/TmchXmlSignatureTest.java
rename to javatests/google/registry/tmch/TmchXmlSignatureTest.java
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-Arabic-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Agent-Arabic-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-Arabic-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Agent-Arabic-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-English-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-English-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-French-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Agent-French-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-French-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Agent-French-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-Arabic-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Holder-Arabic-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-Arabic-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Holder-Arabic-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-English-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Holder-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-English-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Holder-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-French-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Holder-French-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-French-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Holder-French-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd b/javatests/google/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-Arabic-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Agent-Arabic-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-Arabic-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Agent-Arabic-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-Arabic-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Holder-Arabic-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-Arabic-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Holder-Arabic-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd b/javatests/google/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd
rename to javatests/google/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-Arabic-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Arabic-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-Arabic-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Arabic-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-Arabic-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Arabic-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-Arabic-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Arabic-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd b/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd
rename to javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/dnl-latest.csv b/javatests/google/registry/tmch/testdata/dnl-latest.csv
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/dnl-latest.csv
rename to javatests/google/registry/tmch/testdata/dnl-latest.csv
diff --git a/javatests/com/google/domain/registry/tmch/testdata/dnl-latest.sig b/javatests/google/registry/tmch/testdata/dnl-latest.sig
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/dnl-latest.sig
rename to javatests/google/registry/tmch/testdata/dnl-latest.sig
diff --git a/javatests/com/google/domain/registry/tmch/testdata/icann-tmch-test-good.crt b/javatests/google/registry/tmch/testdata/icann-tmch-test-good.crt
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/icann-tmch-test-good.crt
rename to javatests/google/registry/tmch/testdata/icann-tmch-test-good.crt
diff --git a/javatests/com/google/domain/registry/tmch/testdata/icann-tmch-test-revoked.crt b/javatests/google/registry/tmch/testdata/icann-tmch-test-revoked.crt
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/icann-tmch-test-revoked.crt
rename to javatests/google/registry/tmch/testdata/icann-tmch-test-revoked.crt
diff --git a/javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd b/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd
rename to javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd b/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd
rename to javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd b/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd
rename to javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd b/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd
rename to javatests/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd b/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd
rename to javatests/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/pubkey b/javatests/google/registry/tmch/testdata/pubkey
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/pubkey
rename to javatests/google/registry/tmch/testdata/pubkey
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-Arabic-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Arabic-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-Arabic-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Arabic-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-Arabic-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Arabic-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-Arabic-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Arabic-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arabic-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arabic-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arabic-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arabic-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arabic-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arabic-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arabic-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arabic-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arabic-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arabic-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arabic-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arabic-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arabic-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arabic-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arabic-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arabic-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd b/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd
rename to javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd b/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd
rename to javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd b/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd
rename to javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd b/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd
rename to javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd b/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd
rename to javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd b/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd
rename to javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tmch/testdata/smdrl-latest.csv b/javatests/google/registry/tmch/testdata/smdrl-latest.csv
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/smdrl-latest.csv
rename to javatests/google/registry/tmch/testdata/smdrl-latest.csv
diff --git a/javatests/com/google/domain/registry/tmch/testdata/smdrl-latest.sig b/javatests/google/registry/tmch/testdata/smdrl-latest.sig
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/smdrl-latest.sig
rename to javatests/google/registry/tmch/testdata/smdrl-latest.sig
diff --git a/javatests/com/google/domain/registry/tmch/testdata/tmch_test_smd_revocation_list.csv b/javatests/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv
similarity index 100%
rename from javatests/com/google/domain/registry/tmch/testdata/tmch_test_smd_revocation_list.csv
rename to javatests/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv
diff --git a/javatests/com/google/domain/registry/tools/AllocateDomainCommandTest.java b/javatests/google/registry/tools/AllocateDomainCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/AllocateDomainCommandTest.java
rename to javatests/google/registry/tools/AllocateDomainCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/BUILD b/javatests/google/registry/tools/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/tools/BUILD
rename to javatests/google/registry/tools/BUILD
diff --git a/javatests/com/google/domain/registry/tools/CommandTestCase.java b/javatests/google/registry/tools/CommandTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CommandTestCase.java
rename to javatests/google/registry/tools/CommandTestCase.java
diff --git a/javatests/com/google/domain/registry/tools/CreateAnchorTenantCommandTest.java b/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateAnchorTenantCommandTest.java
rename to javatests/google/registry/tools/CreateAnchorTenantCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/CreateContactCommandTest.java b/javatests/google/registry/tools/CreateContactCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateContactCommandTest.java
rename to javatests/google/registry/tools/CreateContactCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/CreateCreditBalanceCommandTest.java b/javatests/google/registry/tools/CreateCreditBalanceCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateCreditBalanceCommandTest.java
rename to javatests/google/registry/tools/CreateCreditBalanceCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/CreateCreditCommandTest.java b/javatests/google/registry/tools/CreateCreditCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateCreditCommandTest.java
rename to javatests/google/registry/tools/CreateCreditCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java b/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java
rename to javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java
diff --git a/javatests/com/google/domain/registry/tools/CreateOrUpdateReservedListCommandTestCase.java b/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateOrUpdateReservedListCommandTestCase.java
rename to javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java
diff --git a/javatests/com/google/domain/registry/tools/CreatePremiumListCommandTest.java b/javatests/google/registry/tools/CreatePremiumListCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreatePremiumListCommandTest.java
rename to javatests/google/registry/tools/CreatePremiumListCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/CreateRegistrarCommandTest.java b/javatests/google/registry/tools/CreateRegistrarCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateRegistrarCommandTest.java
rename to javatests/google/registry/tools/CreateRegistrarCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/CreateRegistrarGroupsCommandTest.java b/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateRegistrarGroupsCommandTest.java
rename to javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/CreateReservedListCommandTest.java b/javatests/google/registry/tools/CreateReservedListCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateReservedListCommandTest.java
rename to javatests/google/registry/tools/CreateReservedListCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/CreateTldCommandTest.java b/javatests/google/registry/tools/CreateTldCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/CreateTldCommandTest.java
rename to javatests/google/registry/tools/CreateTldCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/DeleteCreditCommandTest.java b/javatests/google/registry/tools/DeleteCreditCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/DeleteCreditCommandTest.java
rename to javatests/google/registry/tools/DeleteCreditCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/DeleteDomainCommandTest.java b/javatests/google/registry/tools/DeleteDomainCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/DeleteDomainCommandTest.java
rename to javatests/google/registry/tools/DeleteDomainCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/DeleteEntityCommandTest.java b/javatests/google/registry/tools/DeleteEntityCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/DeleteEntityCommandTest.java
rename to javatests/google/registry/tools/DeleteEntityCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/DeletePremiumListCommandTest.java b/javatests/google/registry/tools/DeletePremiumListCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/DeletePremiumListCommandTest.java
rename to javatests/google/registry/tools/DeletePremiumListCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/DeleteReservedListCommandTest.java b/javatests/google/registry/tools/DeleteReservedListCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/DeleteReservedListCommandTest.java
rename to javatests/google/registry/tools/DeleteReservedListCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/DomainApplicationInfoCommandTest.java b/javatests/google/registry/tools/DomainApplicationInfoCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/DomainApplicationInfoCommandTest.java
rename to javatests/google/registry/tools/DomainApplicationInfoCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/DomainCheckClaimsCommandTest.java b/javatests/google/registry/tools/DomainCheckClaimsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/DomainCheckClaimsCommandTest.java
rename to javatests/google/registry/tools/DomainCheckClaimsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/DomainCheckCommandTest.java b/javatests/google/registry/tools/DomainCheckCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/DomainCheckCommandTest.java
rename to javatests/google/registry/tools/DomainCheckCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/DomainCheckFeeCommandTest.java b/javatests/google/registry/tools/DomainCheckFeeCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/DomainCheckFeeCommandTest.java
rename to javatests/google/registry/tools/DomainCheckFeeCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/EncryptEscrowDepositCommandTest.java b/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/EncryptEscrowDepositCommandTest.java
rename to javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/EppToolCommandTest.java b/javatests/google/registry/tools/EppToolCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/EppToolCommandTest.java
rename to javatests/google/registry/tools/EppToolCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/EppToolCommandTestCase.java b/javatests/google/registry/tools/EppToolCommandTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/EppToolCommandTestCase.java
rename to javatests/google/registry/tools/EppToolCommandTestCase.java
diff --git a/javatests/com/google/domain/registry/tools/ExecuteEppCommandTest.java b/javatests/google/registry/tools/ExecuteEppCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ExecuteEppCommandTest.java
rename to javatests/google/registry/tools/ExecuteEppCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/FakePasswordGenerator.java b/javatests/google/registry/tools/FakePasswordGenerator.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/FakePasswordGenerator.java
rename to javatests/google/registry/tools/FakePasswordGenerator.java
diff --git a/javatests/com/google/domain/registry/tools/GenerateAuctionDataCommandTest.java b/javatests/google/registry/tools/GenerateAuctionDataCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GenerateAuctionDataCommandTest.java
rename to javatests/google/registry/tools/GenerateAuctionDataCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GenerateDnsReportCommandTest.java b/javatests/google/registry/tools/GenerateDnsReportCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GenerateDnsReportCommandTest.java
rename to javatests/google/registry/tools/GenerateDnsReportCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GenerateEscrowDepositCommandTest.java b/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GenerateEscrowDepositCommandTest.java
rename to javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GetApplicationCommandTest.java b/javatests/google/registry/tools/GetApplicationCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GetApplicationCommandTest.java
rename to javatests/google/registry/tools/GetApplicationCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GetApplicationIdsCommandTest.java b/javatests/google/registry/tools/GetApplicationIdsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GetApplicationIdsCommandTest.java
rename to javatests/google/registry/tools/GetApplicationIdsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GetClaimsListCommandTest.java b/javatests/google/registry/tools/GetClaimsListCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GetClaimsListCommandTest.java
rename to javatests/google/registry/tools/GetClaimsListCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GetContactCommandTest.java b/javatests/google/registry/tools/GetContactCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GetContactCommandTest.java
rename to javatests/google/registry/tools/GetContactCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GetDomainCommandTest.java b/javatests/google/registry/tools/GetDomainCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GetDomainCommandTest.java
rename to javatests/google/registry/tools/GetDomainCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GetHostCommandTest.java b/javatests/google/registry/tools/GetHostCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GetHostCommandTest.java
rename to javatests/google/registry/tools/GetHostCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GetRegistrarCommandTest.java b/javatests/google/registry/tools/GetRegistrarCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GetRegistrarCommandTest.java
rename to javatests/google/registry/tools/GetRegistrarCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GetResourceByKeyCommandTest.java b/javatests/google/registry/tools/GetResourceByKeyCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GetResourceByKeyCommandTest.java
rename to javatests/google/registry/tools/GetResourceByKeyCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GetTldCommandTest.java b/javatests/google/registry/tools/GetTldCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GetTldCommandTest.java
rename to javatests/google/registry/tools/GetTldCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GhostrydeCommandTest.java b/javatests/google/registry/tools/GhostrydeCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GhostrydeCommandTest.java
rename to javatests/google/registry/tools/GhostrydeCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/GtechToolTest.java b/javatests/google/registry/tools/GtechToolTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/GtechToolTest.java
rename to javatests/google/registry/tools/GtechToolTest.java
diff --git a/javatests/com/google/domain/registry/tools/ListCursorsCommandTest.java b/javatests/google/registry/tools/ListCursorsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ListCursorsCommandTest.java
rename to javatests/google/registry/tools/ListCursorsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/ListDomainsCommandTest.java b/javatests/google/registry/tools/ListDomainsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ListDomainsCommandTest.java
rename to javatests/google/registry/tools/ListDomainsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/ListHostsCommandTest.java b/javatests/google/registry/tools/ListHostsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ListHostsCommandTest.java
rename to javatests/google/registry/tools/ListHostsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/ListObjectsCommandTestCase.java b/javatests/google/registry/tools/ListObjectsCommandTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ListObjectsCommandTestCase.java
rename to javatests/google/registry/tools/ListObjectsCommandTestCase.java
diff --git a/javatests/com/google/domain/registry/tools/ListPremiumListsCommandTest.java b/javatests/google/registry/tools/ListPremiumListsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ListPremiumListsCommandTest.java
rename to javatests/google/registry/tools/ListPremiumListsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/ListRegistrarsCommandTest.java b/javatests/google/registry/tools/ListRegistrarsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ListRegistrarsCommandTest.java
rename to javatests/google/registry/tools/ListRegistrarsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/ListReservedListsCommandTest.java b/javatests/google/registry/tools/ListReservedListsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ListReservedListsCommandTest.java
rename to javatests/google/registry/tools/ListReservedListsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/ListTldsCommandTest.java b/javatests/google/registry/tools/ListTldsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ListTldsCommandTest.java
rename to javatests/google/registry/tools/ListTldsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/MutatingCommandTest.java b/javatests/google/registry/tools/MutatingCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/MutatingCommandTest.java
rename to javatests/google/registry/tools/MutatingCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/PublishDetailReportCommandTest.java b/javatests/google/registry/tools/PublishDetailReportCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/PublishDetailReportCommandTest.java
rename to javatests/google/registry/tools/PublishDetailReportCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/RegistrarContactCommandTest.java b/javatests/google/registry/tools/RegistrarContactCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/RegistrarContactCommandTest.java
rename to javatests/google/registry/tools/RegistrarContactCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/RegistryToolEnvironmentTest.java b/javatests/google/registry/tools/RegistryToolEnvironmentTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/RegistryToolEnvironmentTest.java
rename to javatests/google/registry/tools/RegistryToolEnvironmentTest.java
diff --git a/javatests/com/google/domain/registry/tools/RegistryToolTest.java b/javatests/google/registry/tools/RegistryToolTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/RegistryToolTest.java
rename to javatests/google/registry/tools/RegistryToolTest.java
diff --git a/javatests/com/google/domain/registry/tools/ResaveEnvironmentEntitiesCommandTest.java b/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ResaveEnvironmentEntitiesCommandTest.java
rename to javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/SetupOteCommandTest.java b/javatests/google/registry/tools/SetupOteCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/SetupOteCommandTest.java
rename to javatests/google/registry/tools/SetupOteCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UpdateApplicationStatusCommandTest.java b/javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UpdateApplicationStatusCommandTest.java
rename to javatests/google/registry/tools/UpdateApplicationStatusCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UpdateClaimsNoticeCommandTest.java b/javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UpdateClaimsNoticeCommandTest.java
rename to javatests/google/registry/tools/UpdateClaimsNoticeCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UpdateCursorsCommandTest.java b/javatests/google/registry/tools/UpdateCursorsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UpdateCursorsCommandTest.java
rename to javatests/google/registry/tools/UpdateCursorsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UpdatePremiumListCommandTest.java b/javatests/google/registry/tools/UpdatePremiumListCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UpdatePremiumListCommandTest.java
rename to javatests/google/registry/tools/UpdatePremiumListCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UpdateRegistrarCommandTest.java b/javatests/google/registry/tools/UpdateRegistrarCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UpdateRegistrarCommandTest.java
rename to javatests/google/registry/tools/UpdateRegistrarCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UpdateReservedListCommandTest.java b/javatests/google/registry/tools/UpdateReservedListCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UpdateReservedListCommandTest.java
rename to javatests/google/registry/tools/UpdateReservedListCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UpdateServerLocksCommandTest.java b/javatests/google/registry/tools/UpdateServerLocksCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UpdateServerLocksCommandTest.java
rename to javatests/google/registry/tools/UpdateServerLocksCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UpdateSmdCommandTest.java b/javatests/google/registry/tools/UpdateSmdCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UpdateSmdCommandTest.java
rename to javatests/google/registry/tools/UpdateSmdCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UpdateTldCommandTest.java b/javatests/google/registry/tools/UpdateTldCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UpdateTldCommandTest.java
rename to javatests/google/registry/tools/UpdateTldCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/UploadClaimsListCommandTest.java b/javatests/google/registry/tools/UploadClaimsListCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/UploadClaimsListCommandTest.java
rename to javatests/google/registry/tools/UploadClaimsListCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/ValidateEscrowDepositCommandTest.java b/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ValidateEscrowDepositCommandTest.java
rename to javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/ValidateLoginCredentialsCommandTest.java b/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/ValidateLoginCredentialsCommandTest.java
rename to javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java
diff --git a/javatests/com/google/domain/registry/tools/params/BUILD b/javatests/google/registry/tools/params/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/tools/params/BUILD
rename to javatests/google/registry/tools/params/BUILD
diff --git a/javatests/com/google/domain/registry/tools/params/DateTimeParameterTest.java b/javatests/google/registry/tools/params/DateTimeParameterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/params/DateTimeParameterTest.java
rename to javatests/google/registry/tools/params/DateTimeParameterTest.java
diff --git a/javatests/com/google/domain/registry/tools/params/DurationParameterTest.java b/javatests/google/registry/tools/params/DurationParameterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/params/DurationParameterTest.java
rename to javatests/google/registry/tools/params/DurationParameterTest.java
diff --git a/javatests/com/google/domain/registry/tools/params/HostAndPortParameterTest.java b/javatests/google/registry/tools/params/HostAndPortParameterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/params/HostAndPortParameterTest.java
rename to javatests/google/registry/tools/params/HostAndPortParameterTest.java
diff --git a/javatests/com/google/domain/registry/tools/params/MoneyParameterTest.java b/javatests/google/registry/tools/params/MoneyParameterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/params/MoneyParameterTest.java
rename to javatests/google/registry/tools/params/MoneyParameterTest.java
diff --git a/javatests/com/google/domain/registry/tools/params/PathParameterTest.java b/javatests/google/registry/tools/params/PathParameterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/params/PathParameterTest.java
rename to javatests/google/registry/tools/params/PathParameterTest.java
diff --git a/javatests/com/google/domain/registry/tools/params/PhoneNumberParameterTest.java b/javatests/google/registry/tools/params/PhoneNumberParameterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/params/PhoneNumberParameterTest.java
rename to javatests/google/registry/tools/params/PhoneNumberParameterTest.java
diff --git a/javatests/com/google/domain/registry/tools/params/YearMonthParameterTest.java b/javatests/google/registry/tools/params/YearMonthParameterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/params/YearMonthParameterTest.java
rename to javatests/google/registry/tools/params/YearMonthParameterTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/BUILD b/javatests/google/registry/tools/server/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/BUILD
rename to javatests/google/registry/tools/server/BUILD
diff --git a/javatests/com/google/domain/registry/tools/server/CreateGroupsActionTest.java b/javatests/google/registry/tools/server/CreateGroupsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/CreateGroupsActionTest.java
rename to javatests/google/registry/tools/server/CreateGroupsActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/CreatePremiumListActionTest.java b/javatests/google/registry/tools/server/CreatePremiumListActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/CreatePremiumListActionTest.java
rename to javatests/google/registry/tools/server/CreatePremiumListActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/DeleteEntityActionTest.java b/javatests/google/registry/tools/server/DeleteEntityActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/DeleteEntityActionTest.java
rename to javatests/google/registry/tools/server/DeleteEntityActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/DeleteProberDataActionTest.java b/javatests/google/registry/tools/server/DeleteProberDataActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/DeleteProberDataActionTest.java
rename to javatests/google/registry/tools/server/DeleteProberDataActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/GenerateZoneFilesActionTest.java b/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/GenerateZoneFilesActionTest.java
rename to javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/KillAllActionTestCase.java b/javatests/google/registry/tools/server/KillAllActionTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/KillAllActionTestCase.java
rename to javatests/google/registry/tools/server/KillAllActionTestCase.java
diff --git a/javatests/com/google/domain/registry/tools/server/KillAllCommitLogsActionTest.java b/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/KillAllCommitLogsActionTest.java
rename to javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/KillAllCrossTldEntitiesActionTest.java b/javatests/google/registry/tools/server/KillAllCrossTldEntitiesActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/KillAllCrossTldEntitiesActionTest.java
rename to javatests/google/registry/tools/server/KillAllCrossTldEntitiesActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/KillAllEppResourcesActionTest.java b/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/KillAllEppResourcesActionTest.java
rename to javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/ListActionTestCase.java b/javatests/google/registry/tools/server/ListActionTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/ListActionTestCase.java
rename to javatests/google/registry/tools/server/ListActionTestCase.java
diff --git a/javatests/com/google/domain/registry/tools/server/ListDomainsActionTest.java b/javatests/google/registry/tools/server/ListDomainsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/ListDomainsActionTest.java
rename to javatests/google/registry/tools/server/ListDomainsActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/ListHostsActionTest.java b/javatests/google/registry/tools/server/ListHostsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/ListHostsActionTest.java
rename to javatests/google/registry/tools/server/ListHostsActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/ListPremiumListsActionTest.java b/javatests/google/registry/tools/server/ListPremiumListsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/ListPremiumListsActionTest.java
rename to javatests/google/registry/tools/server/ListPremiumListsActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/ListRegistrarsActionTest.java b/javatests/google/registry/tools/server/ListRegistrarsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/ListRegistrarsActionTest.java
rename to javatests/google/registry/tools/server/ListRegistrarsActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/ListReservedListsActionTest.java b/javatests/google/registry/tools/server/ListReservedListsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/ListReservedListsActionTest.java
rename to javatests/google/registry/tools/server/ListReservedListsActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/ListTldsActionTest.java b/javatests/google/registry/tools/server/ListTldsActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/ListTldsActionTest.java
rename to javatests/google/registry/tools/server/ListTldsActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/ResaveAllEppResourcesActionTest.java b/javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/ResaveAllEppResourcesActionTest.java
rename to javatests/google/registry/tools/server/ResaveAllEppResourcesActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/UpdatePremiumListActionTest.java b/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/UpdatePremiumListActionTest.java
rename to javatests/google/registry/tools/server/UpdatePremiumListActionTest.java
diff --git a/javatests/com/google/domain/registry/tools/server/testdata/tld.zone b/javatests/google/registry/tools/server/testdata/tld.zone
similarity index 100%
rename from javatests/com/google/domain/registry/tools/server/testdata/tld.zone
rename to javatests/google/registry/tools/server/testdata/tld.zone
diff --git a/javatests/com/google/domain/registry/tools/testdata/Court-Agent-Chinese-Active.smd b/javatests/google/registry/tools/testdata/Court-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/Court-Agent-Chinese-Active.smd
rename to javatests/google/registry/tools/testdata/Court-Agent-Chinese-Active.smd
diff --git a/javatests/com/google/domain/registry/tools/testdata/Court-Agent-English-Active.smd b/javatests/google/registry/tools/testdata/Court-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/Court-Agent-English-Active.smd
rename to javatests/google/registry/tools/testdata/Court-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tools/testdata/InvalidSignature-Trademark-Agent-English-Active.smd b/javatests/google/registry/tools/testdata/InvalidSignature-Trademark-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/InvalidSignature-Trademark-Agent-English-Active.smd
rename to javatests/google/registry/tools/testdata/InvalidSignature-Trademark-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tools/testdata/TMVRevoked-Trademark-Agent-English-Active.smd b/javatests/google/registry/tools/testdata/TMVRevoked-Trademark-Agent-English-Active.smd
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/TMVRevoked-Trademark-Agent-English-Active.smd
rename to javatests/google/registry/tools/testdata/TMVRevoked-Trademark-Agent-English-Active.smd
diff --git a/javatests/com/google/domain/registry/tools/testdata/allocate_domain.xml b/javatests/google/registry/tools/testdata/allocate_domain.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/allocate_domain.xml
rename to javatests/google/registry/tools/testdata/allocate_domain.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/allocate_domain2.xml b/javatests/google/registry/tools/testdata/allocate_domain2.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/allocate_domain2.xml
rename to javatests/google/registry/tools/testdata/allocate_domain2.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/contact_create.xml b/javatests/google/registry/tools/testdata/contact_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/contact_create.xml
rename to javatests/google/registry/tools/testdata/contact_create.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/contact_create_complete.xml b/javatests/google/registry/tools/testdata/contact_create_complete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/contact_create_complete.xml
rename to javatests/google/registry/tools/testdata/contact_create_complete.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/contact_create_minimal.xml b/javatests/google/registry/tools/testdata/contact_create_minimal.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/contact_create_minimal.xml
rename to javatests/google/registry/tools/testdata/contact_create_minimal.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_check.xml b/javatests/google/registry/tools/testdata/domain_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_check.xml
rename to javatests/google/registry/tools/testdata/domain_check.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_check_claims.xml b/javatests/google/registry/tools/testdata/domain_check_claims.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_check_claims.xml
rename to javatests/google/registry/tools/testdata/domain_check_claims.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_check_claims_multiple.xml b/javatests/google/registry/tools/testdata/domain_check_claims_multiple.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_check_claims_multiple.xml
rename to javatests/google/registry/tools/testdata/domain_check_claims_multiple.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_check_claims_second_tld.xml b/javatests/google/registry/tools/testdata/domain_check_claims_second_tld.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_check_claims_second_tld.xml
rename to javatests/google/registry/tools/testdata/domain_check_claims_second_tld.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_check_fee.xml b/javatests/google/registry/tools/testdata/domain_check_fee.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_check_fee.xml
rename to javatests/google/registry/tools/testdata/domain_check_fee.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_check_fee_multiple.xml b/javatests/google/registry/tools/testdata/domain_check_fee_multiple.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_check_fee_multiple.xml
rename to javatests/google/registry/tools/testdata/domain_check_fee_multiple.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_check_fee_second_tld.xml b/javatests/google/registry/tools/testdata/domain_check_fee_second_tld.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_check_fee_second_tld.xml
rename to javatests/google/registry/tools/testdata/domain_check_fee_second_tld.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_check_multiple.xml b/javatests/google/registry/tools/testdata/domain_check_multiple.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_check_multiple.xml
rename to javatests/google/registry/tools/testdata/domain_check_multiple.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_check_second_tld.xml b/javatests/google/registry/tools/testdata/domain_check_second_tld.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_check_second_tld.xml
rename to javatests/google/registry/tools/testdata/domain_check_second_tld.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant.xml
rename to javatests/google/registry/tools/testdata/domain_create_anchor_tenant.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_fee_premium.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_premium.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_fee_premium.xml
rename to javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_premium.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_fee_standard.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_standard.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_fee_standard.xml
rename to javatests/google/registry/tools/testdata/domain_create_anchor_tenant_fee_standard.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_multiple_word_reason.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_multiple_word_reason.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_multiple_word_reason.xml
rename to javatests/google/registry/tools/testdata/domain_create_anchor_tenant_multiple_word_reason.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_no_reason.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_no_reason.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_no_reason.xml
rename to javatests/google/registry/tools/testdata/domain_create_anchor_tenant_no_reason.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_password.xml b/javatests/google/registry/tools/testdata/domain_create_anchor_tenant_password.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_create_anchor_tenant_password.xml
rename to javatests/google/registry/tools/testdata/domain_create_anchor_tenant_password.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_create_no_hosts_or_dsdata.xml b/javatests/google/registry/tools/testdata/domain_create_no_hosts_or_dsdata.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_create_no_hosts_or_dsdata.xml
rename to javatests/google/registry/tools/testdata/domain_create_no_hosts_or_dsdata.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_create_sunrush.xml b/javatests/google/registry/tools/testdata/domain_create_sunrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_create_sunrush.xml
rename to javatests/google/registry/tools/testdata/domain_create_sunrush.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_create_sunrush2.xml b/javatests/google/registry/tools/testdata/domain_create_sunrush2.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_create_sunrush2.xml
rename to javatests/google/registry/tools/testdata/domain_create_sunrush2.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_delete.xml b/javatests/google/registry/tools/testdata/domain_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_delete.xml
rename to javatests/google/registry/tools/testdata/domain_delete.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_delete_by_registrar.xml b/javatests/google/registry/tools/testdata/domain_delete_by_registrar.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_delete_by_registrar.xml
rename to javatests/google/registry/tools/testdata/domain_delete_by_registrar.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_delete_multiple_word_reason.xml b/javatests/google/registry/tools/testdata/domain_delete_multiple_word_reason.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_delete_multiple_word_reason.xml
rename to javatests/google/registry/tools/testdata/domain_delete_multiple_word_reason.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_info_landrush.xml b/javatests/google/registry/tools/testdata/domain_info_landrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_info_landrush.xml
rename to javatests/google/registry/tools/testdata/domain_info_landrush.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/domain_info_sunrush.xml b/javatests/google/registry/tools/testdata/domain_info_sunrush.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/domain_info_sunrush.xml
rename to javatests/google/registry/tools/testdata/domain_info_sunrush.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/example_invalid_premium_terms.csv b/javatests/google/registry/tools/testdata/example_invalid_premium_terms.csv
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/example_invalid_premium_terms.csv
rename to javatests/google/registry/tools/testdata/example_invalid_premium_terms.csv
diff --git a/javatests/com/google/domain/registry/tools/testdata/example_premium_terms.csv b/javatests/google/registry/tools/testdata/example_premium_terms.csv
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/example_premium_terms.csv
rename to javatests/google/registry/tools/testdata/example_premium_terms.csv
diff --git a/javatests/com/google/domain/registry/tools/testdata/example_reserved_terms.csv b/javatests/google/registry/tools/testdata/example_reserved_terms.csv
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/example_reserved_terms.csv
rename to javatests/google/registry/tools/testdata/example_reserved_terms.csv
diff --git a/javatests/com/google/domain/registry/tools/testdata/new-tlds.txt b/javatests/google/registry/tools/testdata/new-tlds.txt
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/new-tlds.txt
rename to javatests/google/registry/tools/testdata/new-tlds.txt
diff --git a/javatests/com/google/domain/registry/tools/testdata/old-tlds.txt b/javatests/google/registry/tools/testdata/old-tlds.txt
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/old-tlds.txt
rename to javatests/google/registry/tools/testdata/old-tlds.txt
diff --git a/javatests/com/google/domain/registry/tools/testdata/update_server_locks_apply_all.xml b/javatests/google/registry/tools/testdata/update_server_locks_apply_all.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/update_server_locks_apply_all.xml
rename to javatests/google/registry/tools/testdata/update_server_locks_apply_all.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/update_server_locks_apply_all_remove_one.xml b/javatests/google/registry/tools/testdata/update_server_locks_apply_all_remove_one.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/update_server_locks_apply_all_remove_one.xml
rename to javatests/google/registry/tools/testdata/update_server_locks_apply_all_remove_one.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/update_server_locks_apply_one.xml b/javatests/google/registry/tools/testdata/update_server_locks_apply_one.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/update_server_locks_apply_one.xml
rename to javatests/google/registry/tools/testdata/update_server_locks_apply_one.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/update_server_locks_multiple_word_reason.xml b/javatests/google/registry/tools/testdata/update_server_locks_multiple_word_reason.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/update_server_locks_multiple_word_reason.xml
rename to javatests/google/registry/tools/testdata/update_server_locks_multiple_word_reason.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/update_server_locks_remove_all.xml b/javatests/google/registry/tools/testdata/update_server_locks_remove_all.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/update_server_locks_remove_all.xml
rename to javatests/google/registry/tools/testdata/update_server_locks_remove_all.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/update_server_locks_remove_one.xml b/javatests/google/registry/tools/testdata/update_server_locks_remove_one.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/update_server_locks_remove_one.xml
rename to javatests/google/registry/tools/testdata/update_server_locks_remove_one.xml
diff --git a/javatests/com/google/domain/registry/tools/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml b/javatests/google/registry/tools/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
similarity index 100%
rename from javatests/com/google/domain/registry/tools/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
rename to javatests/google/registry/tools/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
diff --git a/javatests/com/google/domain/registry/ui/forms/BUILD b/javatests/google/registry/ui/forms/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/ui/forms/BUILD
rename to javatests/google/registry/ui/forms/BUILD
diff --git a/javatests/com/google/domain/registry/ui/forms/FormFieldExceptionTest.java b/javatests/google/registry/ui/forms/FormFieldExceptionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/forms/FormFieldExceptionTest.java
rename to javatests/google/registry/ui/forms/FormFieldExceptionTest.java
diff --git a/javatests/com/google/domain/registry/ui/forms/FormFieldTest.java b/javatests/google/registry/ui/forms/FormFieldTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/forms/FormFieldTest.java
rename to javatests/google/registry/ui/forms/FormFieldTest.java
diff --git a/javatests/com/google/domain/registry/ui/forms/FormFieldsTest.java b/javatests/google/registry/ui/forms/FormFieldsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/forms/FormFieldsTest.java
rename to javatests/google/registry/ui/forms/FormFieldsTest.java
diff --git a/javatests/com/google/domain/registry/ui/js/BUILD b/javatests/google/registry/ui/js/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/BUILD
rename to javatests/google/registry/ui/js/BUILD
diff --git a/javatests/com/google/domain/registry/ui/js/component_test.js b/javatests/google/registry/ui/js/component_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/component_test.js
rename to javatests/google/registry/ui/js/component_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/BUILD b/javatests/google/registry/ui/js/registrar/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/BUILD
rename to javatests/google/registry/ui/js/registrar/BUILD
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/brainframe_test.js b/javatests/google/registry/ui/js/registrar/brainframe_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/brainframe_test.js
rename to javatests/google/registry/ui/js/registrar/brainframe_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/console_test.js b/javatests/google/registry/ui/js/registrar/console_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/console_test.js
rename to javatests/google/registry/ui/js/registrar/console_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/console_test_util.js b/javatests/google/registry/ui/js/registrar/console_test_util.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/console_test_util.js
rename to javatests/google/registry/ui/js/registrar/console_test_util.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/contact_settings_test.js b/javatests/google/registry/ui/js/registrar/contact_settings_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/contact_settings_test.js
rename to javatests/google/registry/ui/js/registrar/contact_settings_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/contact_test.js b/javatests/google/registry/ui/js/registrar/contact_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/contact_test.js
rename to javatests/google/registry/ui/js/registrar/contact_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/domain_test.js b/javatests/google/registry/ui/js/registrar/domain_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/domain_test.js
rename to javatests/google/registry/ui/js/registrar/domain_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/host_test.js b/javatests/google/registry/ui/js/registrar/host_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/host_test.js
rename to javatests/google/registry/ui/js/registrar/host_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/payment_test.js b/javatests/google/registry/ui/js/registrar/payment_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/payment_test.js
rename to javatests/google/registry/ui/js/registrar/payment_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/security_settings_test.js b/javatests/google/registry/ui/js/registrar/security_settings_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/security_settings_test.js
rename to javatests/google/registry/ui/js/registrar/security_settings_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/registrar/whois_settings_test.js b/javatests/google/registry/ui/js/registrar/whois_settings_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/registrar/whois_settings_test.js
rename to javatests/google/registry/ui/js/registrar/whois_settings_test.js
diff --git a/javatests/com/google/domain/registry/ui/js/testing.js b/javatests/google/registry/ui/js/testing.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/testing.js
rename to javatests/google/registry/ui/js/testing.js
diff --git a/javatests/com/google/domain/registry/ui/js/xml_test.js b/javatests/google/registry/ui/js/xml_test.js
similarity index 100%
rename from javatests/com/google/domain/registry/ui/js/xml_test.js
rename to javatests/google/registry/ui/js/xml_test.js
diff --git a/javatests/com/google/domain/registry/ui/server/BUILD b/javatests/google/registry/ui/server/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/BUILD
rename to javatests/google/registry/ui/server/BUILD
diff --git a/javatests/com/google/domain/registry/ui/server/RegistrarFormFieldsTest.java b/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/RegistrarFormFieldsTest.java
rename to javatests/google/registry/ui/server/RegistrarFormFieldsTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/api/BUILD b/javatests/google/registry/ui/server/api/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/api/BUILD
rename to javatests/google/registry/ui/server/api/BUILD
diff --git a/javatests/com/google/domain/registry/ui/server/api/CheckApiServletTest.java b/javatests/google/registry/ui/server/api/CheckApiServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/api/CheckApiServletTest.java
rename to javatests/google/registry/ui/server/api/CheckApiServletTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/BUILD b/javatests/google/registry/ui/server/registrar/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/BUILD
rename to javatests/google/registry/ui/server/registrar/BUILD
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/ConsoleUiActionTest.java b/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/ConsoleUiActionTest.java
rename to javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/ContactSettingsTest.java b/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/ContactSettingsTest.java
rename to javatests/google/registry/ui/server/registrar/ContactSettingsTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/RegistrarPaymentActionTest.java b/javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/RegistrarPaymentActionTest.java
rename to javatests/google/registry/ui/server/registrar/RegistrarPaymentActionTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java b/javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java
rename to javatests/google/registry/ui/server/registrar/RegistrarPaymentSetupActionTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/RegistrarServletTest.java b/javatests/google/registry/ui/server/registrar/RegistrarServletTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/RegistrarServletTest.java
rename to javatests/google/registry/ui/server/registrar/RegistrarServletTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/RegistrarServletTestCase.java b/javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/RegistrarServletTestCase.java
rename to javatests/google/registry/ui/server/registrar/RegistrarServletTestCase.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/SecuritySettingsTest.java b/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/SecuritySettingsTest.java
rename to javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/SessionUtilsTest.java b/javatests/google/registry/ui/server/registrar/SessionUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/SessionUtilsTest.java
rename to javatests/google/registry/ui/server/registrar/SessionUtilsTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/WhoisSettingsTest.java b/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/WhoisSettingsTest.java
rename to javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/testdata/update_registrar.json b/javatests/google/registry/ui/server/registrar/testdata/update_registrar.json
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/testdata/update_registrar.json
rename to javatests/google/registry/ui/server/registrar/testdata/update_registrar.json
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json b/javatests/google/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json
rename to javatests/google/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json
diff --git a/javatests/com/google/domain/registry/ui/server/registrar/testdata/update_registrar_email.txt b/javatests/google/registry/ui/server/registrar/testdata/update_registrar_email.txt
similarity index 100%
rename from javatests/com/google/domain/registry/ui/server/registrar/testdata/update_registrar_email.txt
rename to javatests/google/registry/ui/server/registrar/testdata/update_registrar_email.txt
diff --git a/javatests/com/google/domain/registry/util/BUILD b/javatests/google/registry/util/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/util/BUILD
rename to javatests/google/registry/util/BUILD
diff --git a/javatests/com/google/domain/registry/util/CidrAddressBlockTest.java b/javatests/google/registry/util/CidrAddressBlockTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/CidrAddressBlockTest.java
rename to javatests/google/registry/util/CidrAddressBlockTest.java
diff --git a/javatests/com/google/domain/registry/util/CollectionUtilsTest.java b/javatests/google/registry/util/CollectionUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/CollectionUtilsTest.java
rename to javatests/google/registry/util/CollectionUtilsTest.java
diff --git a/javatests/com/google/domain/registry/util/ConcurrentTest.java b/javatests/google/registry/util/ConcurrentTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/ConcurrentTest.java
rename to javatests/google/registry/util/ConcurrentTest.java
diff --git a/javatests/com/google/domain/registry/util/DateTimeUtilsTest.java b/javatests/google/registry/util/DateTimeUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/DateTimeUtilsTest.java
rename to javatests/google/registry/util/DateTimeUtilsTest.java
diff --git a/javatests/com/google/domain/registry/util/DiffUtilsTest.java b/javatests/google/registry/util/DiffUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/DiffUtilsTest.java
rename to javatests/google/registry/util/DiffUtilsTest.java
diff --git a/javatests/com/google/domain/registry/util/DomainNameUtilsTest.java b/javatests/google/registry/util/DomainNameUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/DomainNameUtilsTest.java
rename to javatests/google/registry/util/DomainNameUtilsTest.java
diff --git a/javatests/com/google/domain/registry/util/HexDumperTest.java b/javatests/google/registry/util/HexDumperTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/HexDumperTest.java
rename to javatests/google/registry/util/HexDumperTest.java
diff --git a/javatests/com/google/domain/registry/util/PathargMatcherTest.java b/javatests/google/registry/util/PathargMatcherTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/PathargMatcherTest.java
rename to javatests/google/registry/util/PathargMatcherTest.java
diff --git a/javatests/com/google/domain/registry/util/PosixTarHeaderSystemTest.java b/javatests/google/registry/util/PosixTarHeaderSystemTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/PosixTarHeaderSystemTest.java
rename to javatests/google/registry/util/PosixTarHeaderSystemTest.java
diff --git a/javatests/com/google/domain/registry/util/PosixTarHeaderTest.java b/javatests/google/registry/util/PosixTarHeaderTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/PosixTarHeaderTest.java
rename to javatests/google/registry/util/PosixTarHeaderTest.java
diff --git a/javatests/com/google/domain/registry/util/RetrierTest.java b/javatests/google/registry/util/RetrierTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/RetrierTest.java
rename to javatests/google/registry/util/RetrierTest.java
diff --git a/javatests/com/google/domain/registry/util/SendEmailUtilsTest.java b/javatests/google/registry/util/SendEmailUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/SendEmailUtilsTest.java
rename to javatests/google/registry/util/SendEmailUtilsTest.java
diff --git a/javatests/com/google/domain/registry/util/SerializeUtilsTest.java b/javatests/google/registry/util/SerializeUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/SerializeUtilsTest.java
rename to javatests/google/registry/util/SerializeUtilsTest.java
diff --git a/javatests/com/google/domain/registry/util/SqlTemplateTest.java b/javatests/google/registry/util/SqlTemplateTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/SqlTemplateTest.java
rename to javatests/google/registry/util/SqlTemplateTest.java
diff --git a/javatests/com/google/domain/registry/util/TaskEnqueuerTest.java b/javatests/google/registry/util/TaskEnqueuerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/TaskEnqueuerTest.java
rename to javatests/google/registry/util/TaskEnqueuerTest.java
diff --git a/javatests/com/google/domain/registry/util/TeeOutputStreamTest.java b/javatests/google/registry/util/TeeOutputStreamTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/TeeOutputStreamTest.java
rename to javatests/google/registry/util/TeeOutputStreamTest.java
diff --git a/javatests/com/google/domain/registry/util/UrlFetchUtilsTest.java b/javatests/google/registry/util/UrlFetchUtilsTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/util/UrlFetchUtilsTest.java
rename to javatests/google/registry/util/UrlFetchUtilsTest.java
diff --git a/javatests/com/google/domain/registry/whois/BUILD b/javatests/google/registry/whois/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/whois/BUILD
rename to javatests/google/registry/whois/BUILD
diff --git a/javatests/com/google/domain/registry/whois/DomainWhoisResponseTest.java b/javatests/google/registry/whois/DomainWhoisResponseTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/whois/DomainWhoisResponseTest.java
rename to javatests/google/registry/whois/DomainWhoisResponseTest.java
diff --git a/javatests/com/google/domain/registry/whois/NameserverWhoisResponseTest.java b/javatests/google/registry/whois/NameserverWhoisResponseTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/whois/NameserverWhoisResponseTest.java
rename to javatests/google/registry/whois/NameserverWhoisResponseTest.java
diff --git a/javatests/com/google/domain/registry/whois/RegistrarWhoisResponseTest.java b/javatests/google/registry/whois/RegistrarWhoisResponseTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/whois/RegistrarWhoisResponseTest.java
rename to javatests/google/registry/whois/RegistrarWhoisResponseTest.java
diff --git a/javatests/com/google/domain/registry/whois/WhoisHelper.java b/javatests/google/registry/whois/WhoisHelper.java
similarity index 100%
rename from javatests/com/google/domain/registry/whois/WhoisHelper.java
rename to javatests/google/registry/whois/WhoisHelper.java
diff --git a/javatests/com/google/domain/registry/whois/WhoisHttpServerTest.java b/javatests/google/registry/whois/WhoisHttpServerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/whois/WhoisHttpServerTest.java
rename to javatests/google/registry/whois/WhoisHttpServerTest.java
diff --git a/javatests/com/google/domain/registry/whois/WhoisInjectionTest.java b/javatests/google/registry/whois/WhoisInjectionTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/whois/WhoisInjectionTest.java
rename to javatests/google/registry/whois/WhoisInjectionTest.java
diff --git a/javatests/com/google/domain/registry/whois/WhoisReaderTest.java b/javatests/google/registry/whois/WhoisReaderTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/whois/WhoisReaderTest.java
rename to javatests/google/registry/whois/WhoisReaderTest.java
diff --git a/javatests/com/google/domain/registry/whois/WhoisServerTest.java b/javatests/google/registry/whois/WhoisServerTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/whois/WhoisServerTest.java
rename to javatests/google/registry/whois/WhoisServerTest.java
diff --git a/javatests/com/google/domain/registry/whois/WhoisTestComponent.java b/javatests/google/registry/whois/WhoisTestComponent.java
similarity index 100%
rename from javatests/com/google/domain/registry/whois/WhoisTestComponent.java
rename to javatests/google/registry/whois/WhoisTestComponent.java
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_domain.txt b/javatests/google/registry/whois/testdata/whois_domain.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_domain.txt
rename to javatests/google/registry/whois/testdata/whois_domain.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_multiple_nameservers.txt b/javatests/google/registry/whois/testdata/whois_multiple_nameservers.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_multiple_nameservers.txt
rename to javatests/google/registry/whois/testdata/whois_multiple_nameservers.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_nameserver.txt b/javatests/google/registry/whois/testdata/whois_nameserver.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_nameserver.txt
rename to javatests/google/registry/whois/testdata/whois_nameserver.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_registrar.txt b/javatests/google/registry/whois/testdata/whois_registrar.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_registrar.txt
rename to javatests/google/registry/whois/testdata/whois_registrar.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_domain.txt b/javatests/google/registry/whois/testdata/whois_server_domain.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_domain.txt
rename to javatests/google/registry/whois/testdata/whois_server_domain.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_domain_not_found.txt b/javatests/google/registry/whois/testdata/whois_server_domain_not_found.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_domain_not_found.txt
rename to javatests/google/registry/whois/testdata/whois_server_domain_not_found.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_idn_punycode.txt b/javatests/google/registry/whois/testdata/whois_server_idn_punycode.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_idn_punycode.txt
rename to javatests/google/registry/whois/testdata/whois_server_idn_punycode.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_idn_utf8.txt b/javatests/google/registry/whois/testdata/whois_server_idn_utf8.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_idn_utf8.txt
rename to javatests/google/registry/whois/testdata/whois_server_idn_utf8.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_ip_not_found.txt b/javatests/google/registry/whois/testdata/whois_server_ip_not_found.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_ip_not_found.txt
rename to javatests/google/registry/whois/testdata/whois_server_ip_not_found.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_malformed_path.txt b/javatests/google/registry/whois/testdata/whois_server_malformed_path.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_malformed_path.txt
rename to javatests/google/registry/whois/testdata/whois_server_malformed_path.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_nameserver.txt b/javatests/google/registry/whois/testdata/whois_server_nameserver.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_nameserver.txt
rename to javatests/google/registry/whois/testdata/whois_server_nameserver.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_nameserver_not_found.txt b/javatests/google/registry/whois/testdata/whois_server_nameserver_not_found.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_nameserver_not_found.txt
rename to javatests/google/registry/whois/testdata/whois_server_nameserver_not_found.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_no_command.txt b/javatests/google/registry/whois/testdata/whois_server_no_command.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_no_command.txt
rename to javatests/google/registry/whois/testdata/whois_server_no_command.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_registrar.txt b/javatests/google/registry/whois/testdata/whois_server_registrar.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_registrar.txt
rename to javatests/google/registry/whois/testdata/whois_server_registrar.txt
diff --git a/javatests/com/google/domain/registry/whois/testdata/whois_server_registrar_not_found.txt b/javatests/google/registry/whois/testdata/whois_server_registrar_not_found.txt
similarity index 100%
rename from javatests/com/google/domain/registry/whois/testdata/whois_server_registrar_not_found.txt
rename to javatests/google/registry/whois/testdata/whois_server_registrar_not_found.txt
diff --git a/javatests/com/google/domain/registry/xjc/BUILD b/javatests/google/registry/xjc/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/BUILD
rename to javatests/google/registry/xjc/BUILD
diff --git a/javatests/com/google/domain/registry/xjc/XjcObjectTest.java b/javatests/google/registry/xjc/XjcObjectTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/XjcObjectTest.java
rename to javatests/google/registry/xjc/XjcObjectTest.java
diff --git a/javatests/com/google/domain/registry/xjc/XmlTestdataTest.java b/javatests/google/registry/xjc/XmlTestdataTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/XmlTestdataTest.java
rename to javatests/google/registry/xjc/XmlTestdataTest.java
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_check.xml b/javatests/google/registry/xjc/testdata/contact_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_check.xml
rename to javatests/google/registry/xjc/testdata/contact_check.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_check_response.xml b/javatests/google/registry/xjc/testdata/contact_check_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_check_response.xml
rename to javatests/google/registry/xjc/testdata/contact_check_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_create.xml b/javatests/google/registry/xjc/testdata/contact_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_create.xml
rename to javatests/google/registry/xjc/testdata/contact_create.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_create_response.xml b/javatests/google/registry/xjc/testdata/contact_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_create_response.xml
rename to javatests/google/registry/xjc/testdata/contact_create_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_create_response_offline_review.xml b/javatests/google/registry/xjc/testdata/contact_create_response_offline_review.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_create_response_offline_review.xml
rename to javatests/google/registry/xjc/testdata/contact_create_response_offline_review.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_create_response_offline_review_completed.xml b/javatests/google/registry/xjc/testdata/contact_create_response_offline_review_completed.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_create_response_offline_review_completed.xml
rename to javatests/google/registry/xjc/testdata/contact_create_response_offline_review_completed.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_delete.xml b/javatests/google/registry/xjc/testdata/contact_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_delete.xml
rename to javatests/google/registry/xjc/testdata/contact_delete.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_delete_response.xml b/javatests/google/registry/xjc/testdata/contact_delete_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_delete_response.xml
rename to javatests/google/registry/xjc/testdata/contact_delete_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_info.xml b/javatests/google/registry/xjc/testdata/contact_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_info.xml
rename to javatests/google/registry/xjc/testdata/contact_info.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_info_response.xml b/javatests/google/registry/xjc/testdata/contact_info_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_info_response.xml
rename to javatests/google/registry/xjc/testdata/contact_info_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_transfer_query.xml b/javatests/google/registry/xjc/testdata/contact_transfer_query.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_transfer_query.xml
rename to javatests/google/registry/xjc/testdata/contact_transfer_query.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_transfer_query_response.xml b/javatests/google/registry/xjc/testdata/contact_transfer_query_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_transfer_query_response.xml
rename to javatests/google/registry/xjc/testdata/contact_transfer_query_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_transfer_request.xml b/javatests/google/registry/xjc/testdata/contact_transfer_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_transfer_request.xml
rename to javatests/google/registry/xjc/testdata/contact_transfer_request.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_transfer_request_response.xml b/javatests/google/registry/xjc/testdata/contact_transfer_request_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_transfer_request_response.xml
rename to javatests/google/registry/xjc/testdata/contact_transfer_request_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_update.xml b/javatests/google/registry/xjc/testdata/contact_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_update.xml
rename to javatests/google/registry/xjc/testdata/contact_update.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/contact_update_response.xml b/javatests/google/registry/xjc/testdata/contact_update_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/contact_update_response.xml
rename to javatests/google/registry/xjc/testdata/contact_update_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_check.xml b/javatests/google/registry/xjc/testdata/domain_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_check.xml
rename to javatests/google/registry/xjc/testdata/domain_check.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_check_response.xml b/javatests/google/registry/xjc/testdata/domain_check_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_check_response.xml
rename to javatests/google/registry/xjc/testdata/domain_check_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_create.xml b/javatests/google/registry/xjc/testdata/domain_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_create.xml
rename to javatests/google/registry/xjc/testdata/domain_create.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_create_response.xml b/javatests/google/registry/xjc/testdata/domain_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_create_response.xml
rename to javatests/google/registry/xjc/testdata/domain_create_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_create_response_offline_review.xml b/javatests/google/registry/xjc/testdata/domain_create_response_offline_review.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_create_response_offline_review.xml
rename to javatests/google/registry/xjc/testdata/domain_create_response_offline_review.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_create_response_offline_review_completed.xml b/javatests/google/registry/xjc/testdata/domain_create_response_offline_review_completed.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_create_response_offline_review_completed.xml
rename to javatests/google/registry/xjc/testdata/domain_create_response_offline_review_completed.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_delete.xml b/javatests/google/registry/xjc/testdata/domain_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_delete.xml
rename to javatests/google/registry/xjc/testdata/domain_delete.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_delete_response.xml b/javatests/google/registry/xjc/testdata/domain_delete_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_delete_response.xml
rename to javatests/google/registry/xjc/testdata/domain_delete_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_info.xml b/javatests/google/registry/xjc/testdata/domain_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_info.xml
rename to javatests/google/registry/xjc/testdata/domain_info.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_info_response.xml b/javatests/google/registry/xjc/testdata/domain_info_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_info_response.xml
rename to javatests/google/registry/xjc/testdata/domain_info_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_info_response_addperiod.xml b/javatests/google/registry/xjc/testdata/domain_info_response_addperiod.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_info_response_addperiod.xml
rename to javatests/google/registry/xjc/testdata/domain_info_response_addperiod.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_info_response_pendingdelete.xml b/javatests/google/registry/xjc/testdata/domain_info_response_pendingdelete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_info_response_pendingdelete.xml
rename to javatests/google/registry/xjc/testdata/domain_info_response_pendingdelete.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_info_response_pendingrestore.xml b/javatests/google/registry/xjc/testdata/domain_info_response_pendingrestore.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_info_response_pendingrestore.xml
rename to javatests/google/registry/xjc/testdata/domain_info_response_pendingrestore.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_info_response_redemptionperiod.xml b/javatests/google/registry/xjc/testdata/domain_info_response_redemptionperiod.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_info_response_redemptionperiod.xml
rename to javatests/google/registry/xjc/testdata/domain_info_response_redemptionperiod.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_info_response_unauthorized.xml b/javatests/google/registry/xjc/testdata/domain_info_response_unauthorized.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_info_response_unauthorized.xml
rename to javatests/google/registry/xjc/testdata/domain_info_response_unauthorized.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_info_with_auth.xml b/javatests/google/registry/xjc/testdata/domain_info_with_auth.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_info_with_auth.xml
rename to javatests/google/registry/xjc/testdata/domain_info_with_auth.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_renew.xml b/javatests/google/registry/xjc/testdata/domain_renew.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_renew.xml
rename to javatests/google/registry/xjc/testdata/domain_renew.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_renew_response.xml b/javatests/google/registry/xjc/testdata/domain_renew_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_renew_response.xml
rename to javatests/google/registry/xjc/testdata/domain_renew_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_transfer_query.xml b/javatests/google/registry/xjc/testdata/domain_transfer_query.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_transfer_query.xml
rename to javatests/google/registry/xjc/testdata/domain_transfer_query.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_transfer_query_response.xml b/javatests/google/registry/xjc/testdata/domain_transfer_query_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_transfer_query_response.xml
rename to javatests/google/registry/xjc/testdata/domain_transfer_query_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_transfer_request.xml b/javatests/google/registry/xjc/testdata/domain_transfer_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_transfer_request.xml
rename to javatests/google/registry/xjc/testdata/domain_transfer_request.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_transfer_request_response.xml b/javatests/google/registry/xjc/testdata/domain_transfer_request_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_transfer_request_response.xml
rename to javatests/google/registry/xjc/testdata/domain_transfer_request_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_update.xml b/javatests/google/registry/xjc/testdata/domain_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_update.xml
rename to javatests/google/registry/xjc/testdata/domain_update.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_update_response.xml b/javatests/google/registry/xjc/testdata/domain_update_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_update_response.xml
rename to javatests/google/registry/xjc/testdata/domain_update_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_update_restore_report.xml b/javatests/google/registry/xjc/testdata/domain_update_restore_report.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_update_restore_report.xml
rename to javatests/google/registry/xjc/testdata/domain_update_restore_report.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_update_restore_request.xml b/javatests/google/registry/xjc/testdata/domain_update_restore_request.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_update_restore_request.xml
rename to javatests/google/registry/xjc/testdata/domain_update_restore_request.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/domain_update_restore_request_response.xml b/javatests/google/registry/xjc/testdata/domain_update_restore_request_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/domain_update_restore_request_response.xml
rename to javatests/google/registry/xjc/testdata/domain_update_restore_request_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/greeting.xml b/javatests/google/registry/xjc/testdata/greeting.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/greeting.xml
rename to javatests/google/registry/xjc/testdata/greeting.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_check.xml b/javatests/google/registry/xjc/testdata/host_check.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_check.xml
rename to javatests/google/registry/xjc/testdata/host_check.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_check_response.xml b/javatests/google/registry/xjc/testdata/host_check_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_check_response.xml
rename to javatests/google/registry/xjc/testdata/host_check_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_create.xml b/javatests/google/registry/xjc/testdata/host_create.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_create.xml
rename to javatests/google/registry/xjc/testdata/host_create.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_create_response.xml b/javatests/google/registry/xjc/testdata/host_create_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_create_response.xml
rename to javatests/google/registry/xjc/testdata/host_create_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_create_response_offline_review.xml b/javatests/google/registry/xjc/testdata/host_create_response_offline_review.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_create_response_offline_review.xml
rename to javatests/google/registry/xjc/testdata/host_create_response_offline_review.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_create_response_offline_review_complete.xml b/javatests/google/registry/xjc/testdata/host_create_response_offline_review_complete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_create_response_offline_review_complete.xml
rename to javatests/google/registry/xjc/testdata/host_create_response_offline_review_complete.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_delete.xml b/javatests/google/registry/xjc/testdata/host_delete.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_delete.xml
rename to javatests/google/registry/xjc/testdata/host_delete.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_delete_response.xml b/javatests/google/registry/xjc/testdata/host_delete_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_delete_response.xml
rename to javatests/google/registry/xjc/testdata/host_delete_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_info.xml b/javatests/google/registry/xjc/testdata/host_info.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_info.xml
rename to javatests/google/registry/xjc/testdata/host_info.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_info_response.xml b/javatests/google/registry/xjc/testdata/host_info_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_info_response.xml
rename to javatests/google/registry/xjc/testdata/host_info_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_update.xml b/javatests/google/registry/xjc/testdata/host_update.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_update.xml
rename to javatests/google/registry/xjc/testdata/host_update.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/host_update_response.xml b/javatests/google/registry/xjc/testdata/host_update_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/host_update_response.xml
rename to javatests/google/registry/xjc/testdata/host_update_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/invalid_greeting.xml b/javatests/google/registry/xjc/testdata/invalid_greeting.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/invalid_greeting.xml
rename to javatests/google/registry/xjc/testdata/invalid_greeting.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/login.xml b/javatests/google/registry/xjc/testdata/login.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/login.xml
rename to javatests/google/registry/xjc/testdata/login.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/login_response.xml b/javatests/google/registry/xjc/testdata/login_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/login_response.xml
rename to javatests/google/registry/xjc/testdata/login_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/logout.xml b/javatests/google/registry/xjc/testdata/logout.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/logout.xml
rename to javatests/google/registry/xjc/testdata/logout.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/logout_response.xml b/javatests/google/registry/xjc/testdata/logout_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/logout_response.xml
rename to javatests/google/registry/xjc/testdata/logout_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/poll.xml b/javatests/google/registry/xjc/testdata/poll.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/poll.xml
rename to javatests/google/registry/xjc/testdata/poll.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/poll_ack.xml b/javatests/google/registry/xjc/testdata/poll_ack.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/poll_ack.xml
rename to javatests/google/registry/xjc/testdata/poll_ack.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/poll_ack_response.xml b/javatests/google/registry/xjc/testdata/poll_ack_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/poll_ack_response.xml
rename to javatests/google/registry/xjc/testdata/poll_ack_response.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/poll_response_empty.xml b/javatests/google/registry/xjc/testdata/poll_response_empty.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/poll_response_empty.xml
rename to javatests/google/registry/xjc/testdata/poll_response_empty.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/poll_response_mixed.xml b/javatests/google/registry/xjc/testdata/poll_response_mixed.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/poll_response_mixed.xml
rename to javatests/google/registry/xjc/testdata/poll_response_mixed.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/rde_deposit_differential.xml b/javatests/google/registry/xjc/testdata/rde_deposit_differential.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/rde_deposit_differential.xml
rename to javatests/google/registry/xjc/testdata/rde_deposit_differential.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/rde_deposit_full.xml b/javatests/google/registry/xjc/testdata/rde_deposit_full.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/rde_deposit_full.xml
rename to javatests/google/registry/xjc/testdata/rde_deposit_full.xml
diff --git a/javatests/com/google/domain/registry/xjc/testdata/restore_request_response.xml b/javatests/google/registry/xjc/testdata/restore_request_response.xml
similarity index 100%
rename from javatests/com/google/domain/registry/xjc/testdata/restore_request_response.xml
rename to javatests/google/registry/xjc/testdata/restore_request_response.xml
diff --git a/javatests/com/google/domain/registry/xml/BUILD b/javatests/google/registry/xml/BUILD
similarity index 100%
rename from javatests/com/google/domain/registry/xml/BUILD
rename to javatests/google/registry/xml/BUILD
diff --git a/javatests/com/google/domain/registry/xml/DateAdapterTest.java b/javatests/google/registry/xml/DateAdapterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/xml/DateAdapterTest.java
rename to javatests/google/registry/xml/DateAdapterTest.java
diff --git a/javatests/com/google/domain/registry/xml/UtcDateTimeAdapterTest.java b/javatests/google/registry/xml/UtcDateTimeAdapterTest.java
similarity index 100%
rename from javatests/com/google/domain/registry/xml/UtcDateTimeAdapterTest.java
rename to javatests/google/registry/xml/UtcDateTimeAdapterTest.java
diff --git a/javatests/com/google/domain/registry/xml/XmlTestUtils.java b/javatests/google/registry/xml/XmlTestUtils.java
similarity index 100%
rename from javatests/com/google/domain/registry/xml/XmlTestUtils.java
rename to javatests/google/registry/xml/XmlTestUtils.java