diff --git a/.gitignore b/.gitignore
index 25a9d6fdd..ec18d3275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,9 @@ local.properties
 # Auto-generated java files
 autogenerated/
 
+# IDEA
+nomulus.iml
+
 ######################################################################
 # Python Ignores
 
@@ -83,11 +86,9 @@ autogenerated/
 # Gradle Ignores
 
 # We don't want to ignore the gradle jar files
-!/gradle/gradle/wrapper/**/*.jar
+!/gradle/wrapper/**/*.jar
 .gradle/
-/gradle/.gradle
-/gradle/**/WEB-INF
-/gradle/**/build
-/gradle/node_modules/**
-!/gradle/node_modules/soyutils_usegoog.js
+**/build
+node_modules/**
+!node_modules/soyutils_usegoog.js
 /repos/
diff --git a/.travis.yml b/.travis.yml
index 3110c9959..e4f9d3919 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,4 +55,4 @@ env:
 # output, instead of the default 10.
 # See notes on the CREDZ and REPORT_GCS_BUCKET environment variable in the
 # comments at the top of the file.
-script: cd gradle && echo "$CREDZ" >credz.json && chmod 755 ./gradlew && travis_wait 45 ./gradlew build --continue -P uploaderDestination="$REPORT_GCS_DESTINATION" -P uploaderCredentialsFile=credz.json -P uploaderMultithreadedUpload=yes -P mavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven -P pluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins
+script: echo "$CREDZ" >credz.json && chmod 755 ./gradlew && travis_wait 45 ./gradlew build --continue -P uploaderDestination="$REPORT_GCS_DESTINATION" -P uploaderCredentialsFile=credz.json -P uploaderMultithreadedUpload=yes -P mavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven -P pluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins
diff --git a/gradle/appengine_war.gradle b/appengine_war.gradle
similarity index 92%
rename from gradle/appengine_war.gradle
rename to appengine_war.gradle
index 852973cc8..d8cc53326 100644
--- a/gradle/appengine_war.gradle
+++ b/appengine_war.gradle
@@ -21,14 +21,14 @@ apply plugin: 'war'
 // plugin will recognize this as an app-engine standard app (and also
 // obtains the appengine-web.xml from the correct location)
 project.convention.plugins['war'].webAppDirName =
-        "../../../java/google/registry/env/${environment}/${project.name}"
+        "../../java/google/registry/env/${environment}/${project.name}"
 
 apply plugin: 'com.google.cloud.tools.appengine'
 
 // Get the web.xml file for the service.
 war {
     webInf {
-        from "../../../java/google/registry/env/common/${project.name}/WEB-INF"
+        from "../../java/google/registry/env/common/${project.name}/WEB-INF"
     }
 }
 
diff --git a/gradle/build.gradle b/build.gradle
similarity index 91%
rename from gradle/build.gradle
rename to build.gradle
index c0c04b174..edfb56dca 100644
--- a/gradle/build.gradle
+++ b/build.gradle
@@ -65,9 +65,7 @@ if (!project.hasProperty('showAllOutput')) {
 gradleLint.autoLintAfterFailure = false
 
 // Paths to main and test sources.
-ext.projectRootDir = "${rootDir}/.."
-ext.javaDir = "${rootDir}/../java"
-ext.javatestsDir = "${rootDir}/../javatests"
+ext.projectRootDir = "${rootDir}"
 
 // Tasks to deploy/stage all App Engine services
 task deploy {
@@ -161,43 +159,42 @@ subprojects {
 
   def commonlyExcludedResources = ['**/*.java', '**/BUILD']
 
+  project.ext.javaDir = "${project.projectDir}/src/main/java"
+  project.ext.javaTestDir = "${project.projectDir}/src/test/java"
+
   sourceSets {
     main {
       java {
-        srcDirs = [
-            rootProject.javaDir,
-            aptGeneratedDir
-        ]
+        srcDirs += aptGeneratedDir
       }
       resources {
         srcDirs = [
-            rootProject.javaDir
+            project.ext.javaDir
         ]
         exclude commonlyExcludedResources
       }
     }
     test {
       java {
-        srcDirs = [
-            rootProject.javatestsDir,
-            aptGeneratedTestDir
-        ]
+        srcDirs += aptGeneratedTestDir
       }
       resources {
         srcDirs = [
-            rootProject.javatestsDir,
+            project.ext.javaTestDir
         ]
         exclude commonlyExcludedResources
       }
     }
   }
 
+  if (project.name == 'util') return
+  if (project.name == 'proxy') return
+  if (project.name == 'core') return
+
   test {
     testLogging.showStandardStreams = Boolean.parseBoolean(showAllOutput)
   }
 
-  if (project.name == 'core') return
-
   ext.relativePath = "google/registry/${project.name}"
 
   sourceSets.each {
@@ -208,13 +205,5 @@ subprojects {
       include "${project.relativePath}/"
     }
   }
-  project(':core').sourceSets.each {
-    it.java {
-      exclude "${project.relativePath}/"
-    }
-    it.resources {
-      exclude "${project.relativePath}/"
-    }
-  }
 }
 
diff --git a/gradle/buildSrc/build.gradle b/buildSrc/build.gradle
similarity index 90%
rename from gradle/buildSrc/build.gradle
rename to buildSrc/build.gradle
index 0ab13ea5d..96cf02743 100644
--- a/gradle/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -41,6 +41,14 @@ repositories {
 apply from: '../dependencies.gradle'
 apply from: '../java_common.gradle'
 
+sourceSets {
+  main {
+    java {
+      srcDirs += "${project.buildDir}/generated/source/apt/main"
+    }
+  }
+}
+
 checkstyle {
   configDir file('../config/checkstyle')
 }
@@ -50,6 +58,10 @@ checkstyle {
 // - Format in place: ../gradlew spotlessApply
 spotless {
   java {
+    target project.fileTree("${project.rootDir}/") {
+      include "src/main/java/**/*.java"
+      include "src/test/java/**/*.java"
+    }
     googleJavaFormat('1.7')
   }
   format 'misc', {
diff --git a/gradle/buildSrc/gradle.properties b/buildSrc/gradle.properties
similarity index 100%
rename from gradle/buildSrc/gradle.properties
rename to buildSrc/gradle.properties
diff --git a/gradle/buildSrc/gradle/dependency-locks/annotationProcessor.lockfile b/buildSrc/gradle/dependency-locks/annotationProcessor.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/annotationProcessor.lockfile
rename to buildSrc/gradle/dependency-locks/annotationProcessor.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile b/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile
rename to buildSrc/gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/checkstyle.lockfile b/buildSrc/gradle/dependency-locks/checkstyle.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/checkstyle.lockfile
rename to buildSrc/gradle/dependency-locks/checkstyle.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/compile.lockfile b/buildSrc/gradle/dependency-locks/compile.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/compile.lockfile
rename to buildSrc/gradle/dependency-locks/compile.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/compileClasspath.lockfile b/buildSrc/gradle/dependency-locks/compileClasspath.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/compileClasspath.lockfile
rename to buildSrc/gradle/dependency-locks/compileClasspath.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/errorproneJavac.lockfile b/buildSrc/gradle/dependency-locks/errorproneJavac.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/errorproneJavac.lockfile
rename to buildSrc/gradle/dependency-locks/errorproneJavac.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile b/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile
rename to buildSrc/gradle/dependency-locks/runtimeClasspath.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/testAnnotationProcessor.lockfile b/buildSrc/gradle/dependency-locks/testAnnotationProcessor.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/testAnnotationProcessor.lockfile
rename to buildSrc/gradle/dependency-locks/testAnnotationProcessor.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/testCompile.lockfile b/buildSrc/gradle/dependency-locks/testCompile.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/testCompile.lockfile
rename to buildSrc/gradle/dependency-locks/testCompile.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile b/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile
rename to buildSrc/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/gradle/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile b/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile
similarity index 100%
rename from gradle/buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile
rename to buildSrc/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/gradle/buildSrc/src/main/java/google/registry/gradle/plugin/CoverPageGenerator.java b/buildSrc/src/main/java/google/registry/gradle/plugin/CoverPageGenerator.java
similarity index 100%
rename from gradle/buildSrc/src/main/java/google/registry/gradle/plugin/CoverPageGenerator.java
rename to buildSrc/src/main/java/google/registry/gradle/plugin/CoverPageGenerator.java
diff --git a/gradle/buildSrc/src/main/java/google/registry/gradle/plugin/FilesWithEntryPoint.java b/buildSrc/src/main/java/google/registry/gradle/plugin/FilesWithEntryPoint.java
similarity index 100%
rename from gradle/buildSrc/src/main/java/google/registry/gradle/plugin/FilesWithEntryPoint.java
rename to buildSrc/src/main/java/google/registry/gradle/plugin/FilesWithEntryPoint.java
diff --git a/gradle/buildSrc/src/main/java/google/registry/gradle/plugin/GcsPluginUtils.java b/buildSrc/src/main/java/google/registry/gradle/plugin/GcsPluginUtils.java
similarity index 100%
rename from gradle/buildSrc/src/main/java/google/registry/gradle/plugin/GcsPluginUtils.java
rename to buildSrc/src/main/java/google/registry/gradle/plugin/GcsPluginUtils.java
diff --git a/gradle/buildSrc/src/main/java/google/registry/gradle/plugin/ProjectData.java b/buildSrc/src/main/java/google/registry/gradle/plugin/ProjectData.java
similarity index 100%
rename from gradle/buildSrc/src/main/java/google/registry/gradle/plugin/ProjectData.java
rename to buildSrc/src/main/java/google/registry/gradle/plugin/ProjectData.java
diff --git a/gradle/buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploader.java b/buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploader.java
similarity index 100%
rename from gradle/buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploader.java
rename to buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploader.java
diff --git a/gradle/buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploaderPlugin.java b/buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploaderPlugin.java
similarity index 100%
rename from gradle/buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploaderPlugin.java
rename to buildSrc/src/main/java/google/registry/gradle/plugin/ReportUploaderPlugin.java
diff --git a/gradle/buildSrc/src/main/resources/google/registry/gradle/plugin/css/style.css b/buildSrc/src/main/resources/google/registry/gradle/plugin/css/style.css
similarity index 100%
rename from gradle/buildSrc/src/main/resources/google/registry/gradle/plugin/css/style.css
rename to buildSrc/src/main/resources/google/registry/gradle/plugin/css/style.css
diff --git a/gradle/buildSrc/src/main/resources/google/registry/gradle/plugin/soy/coverpage.soy b/buildSrc/src/main/resources/google/registry/gradle/plugin/soy/coverpage.soy
similarity index 100%
rename from gradle/buildSrc/src/main/resources/google/registry/gradle/plugin/soy/coverpage.soy
rename to buildSrc/src/main/resources/google/registry/gradle/plugin/soy/coverpage.soy
diff --git a/gradle/buildSrc/src/test/java/google/registry/gradle/plugin/CoverPageGeneratorTest.java b/buildSrc/src/test/java/google/registry/gradle/plugin/CoverPageGeneratorTest.java
similarity index 100%
rename from gradle/buildSrc/src/test/java/google/registry/gradle/plugin/CoverPageGeneratorTest.java
rename to buildSrc/src/test/java/google/registry/gradle/plugin/CoverPageGeneratorTest.java
diff --git a/gradle/buildSrc/src/test/java/google/registry/gradle/plugin/GcsPluginUtilsTest.java b/buildSrc/src/test/java/google/registry/gradle/plugin/GcsPluginUtilsTest.java
similarity index 100%
rename from gradle/buildSrc/src/test/java/google/registry/gradle/plugin/GcsPluginUtilsTest.java
rename to buildSrc/src/test/java/google/registry/gradle/plugin/GcsPluginUtilsTest.java
diff --git a/gradle/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
similarity index 100%
rename from gradle/config/checkstyle/checkstyle.xml
rename to config/checkstyle/checkstyle.xml
diff --git a/gradle/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
similarity index 81%
rename from gradle/config/checkstyle/suppressions.xml
rename to config/checkstyle/suppressions.xml
index 549987a53..cd993cc2e 100644
--- a/gradle/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -8,5 +8,5 @@
   <!-- Ignore generated files in Checkstyle -->
   <suppress files="[/\\].*[/\\]generated.*[/\\]" checks="."/>
   <!-- Ignore Javadoc checks in test files -->
-  <suppress files="[/\\].*[/\\]javatests.*[/\\]" checks="JavadocType"/>
+  <suppress files="[/\\].*[/\\]src/test/java/.*[/\\]" checks="JavadocType"/>
 </suppressions>
diff --git a/core/.gitignore b/core/.gitignore
new file mode 100644
index 000000000..89f9ac04a
--- /dev/null
+++ b/core/.gitignore
@@ -0,0 +1 @@
+out/
diff --git a/gradle/core/build.gradle b/core/build.gradle
similarity index 99%
rename from gradle/core/build.gradle
rename to core/build.gradle
index d2fe42a65..3799a7161 100644
--- a/gradle/core/build.gradle
+++ b/core/build.gradle
@@ -10,7 +10,7 @@ def screenshotsDir = "${project.buildDir}/screenshots"
 def screenshotsForGoldensDir = "${project.buildDir}/screenshots_for_goldens"
 def newGoldensDir = "${project.buildDir}/new_golden_images"
 def goldensDir =
-  "${javatestsDir}/google/registry/webdriver/goldens/chrome-linux"
+  "${javaTestDir}/google/registry/webdriver/goldens/chrome-linux"
 
 // Tests that conflict with (mostly unidentified) members of the main test
 // suite. It is unclear if they are offenders (i.e., those that pollute global
@@ -110,7 +110,7 @@ dependencies {
   // Custom-built objectify jar at commit ecd5165, included in Nomulus
   // release.
   implementation files(
-      "${rootDir}/../third_party/objectify/v4_1/objectify-4.1.3.jar")
+      "${rootDir}/third_party/objectify/v4_1/objectify-4.1.3.jar")
   testImplementation project(':third_party')
 
   compile deps['com.beust:jcommander']
diff --git a/gradle/core/gradle/dependency-locks/annotationProcessor.lockfile b/core/gradle/dependency-locks/annotationProcessor.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/annotationProcessor.lockfile
rename to core/gradle/dependency-locks/annotationProcessor.lockfile
diff --git a/gradle/core/gradle/dependency-locks/buildscript-classpath.lockfile b/core/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/buildscript-classpath.lockfile
rename to core/gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/core/gradle/dependency-locks/checkstyle.lockfile b/core/gradle/dependency-locks/checkstyle.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/checkstyle.lockfile
rename to core/gradle/dependency-locks/checkstyle.lockfile
diff --git a/gradle/core/gradle/dependency-locks/closureCompiler.lockfile b/core/gradle/dependency-locks/closureCompiler.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/closureCompiler.lockfile
rename to core/gradle/dependency-locks/closureCompiler.lockfile
diff --git a/gradle/core/gradle/dependency-locks/compile.lockfile b/core/gradle/dependency-locks/compile.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/compile.lockfile
rename to core/gradle/dependency-locks/compile.lockfile
diff --git a/gradle/core/gradle/dependency-locks/compileClasspath.lockfile b/core/gradle/dependency-locks/compileClasspath.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/compileClasspath.lockfile
rename to core/gradle/dependency-locks/compileClasspath.lockfile
diff --git a/gradle/core/gradle/dependency-locks/css.lockfile b/core/gradle/dependency-locks/css.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/css.lockfile
rename to core/gradle/dependency-locks/css.lockfile
diff --git a/gradle/core/gradle/dependency-locks/errorproneJavac.lockfile b/core/gradle/dependency-locks/errorproneJavac.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/errorproneJavac.lockfile
rename to core/gradle/dependency-locks/errorproneJavac.lockfile
diff --git a/gradle/core/gradle/dependency-locks/jaxb.lockfile b/core/gradle/dependency-locks/jaxb.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/jaxb.lockfile
rename to core/gradle/dependency-locks/jaxb.lockfile
diff --git a/gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile b/core/gradle/dependency-locks/runtimeClasspath.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/runtimeClasspath.lockfile
rename to core/gradle/dependency-locks/runtimeClasspath.lockfile
diff --git a/gradle/core/gradle/dependency-locks/soy.lockfile b/core/gradle/dependency-locks/soy.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/soy.lockfile
rename to core/gradle/dependency-locks/soy.lockfile
diff --git a/gradle/core/gradle/dependency-locks/testAnnotationProcessor.lockfile b/core/gradle/dependency-locks/testAnnotationProcessor.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/testAnnotationProcessor.lockfile
rename to core/gradle/dependency-locks/testAnnotationProcessor.lockfile
diff --git a/gradle/core/gradle/dependency-locks/testCompile.lockfile b/core/gradle/dependency-locks/testCompile.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/testCompile.lockfile
rename to core/gradle/dependency-locks/testCompile.lockfile
diff --git a/gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile b/core/gradle/dependency-locks/testCompileClasspath.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/testCompileClasspath.lockfile
rename to core/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile b/core/gradle/dependency-locks/testRuntimeClasspath.lockfile
similarity index 100%
rename from gradle/core/gradle/dependency-locks/testRuntimeClasspath.lockfile
rename to core/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/java/com/google/testing/builddefs/BUILD b/core/src/main/java/com/google/testing/builddefs/BUILD
similarity index 100%
rename from java/com/google/testing/builddefs/BUILD
rename to core/src/main/java/com/google/testing/builddefs/BUILD
diff --git a/java/com/google/testing/builddefs/GenTestRules.bzl b/core/src/main/java/com/google/testing/builddefs/GenTestRules.bzl
similarity index 100%
rename from java/com/google/testing/builddefs/GenTestRules.bzl
rename to core/src/main/java/com/google/testing/builddefs/GenTestRules.bzl
diff --git a/java/google/registry/BUILD b/core/src/main/java/google/registry/BUILD
similarity index 100%
rename from java/google/registry/BUILD
rename to core/src/main/java/google/registry/BUILD
diff --git a/java/google/registry/backup/BUILD b/core/src/main/java/google/registry/backup/BUILD
similarity index 100%
rename from java/google/registry/backup/BUILD
rename to core/src/main/java/google/registry/backup/BUILD
diff --git a/java/google/registry/backup/BackupModule.java b/core/src/main/java/google/registry/backup/BackupModule.java
similarity index 100%
rename from java/google/registry/backup/BackupModule.java
rename to core/src/main/java/google/registry/backup/BackupModule.java
diff --git a/java/google/registry/backup/BackupUtils.java b/core/src/main/java/google/registry/backup/BackupUtils.java
similarity index 100%
rename from java/google/registry/backup/BackupUtils.java
rename to core/src/main/java/google/registry/backup/BackupUtils.java
diff --git a/java/google/registry/backup/CommitLogCheckpointAction.java b/core/src/main/java/google/registry/backup/CommitLogCheckpointAction.java
similarity index 100%
rename from java/google/registry/backup/CommitLogCheckpointAction.java
rename to core/src/main/java/google/registry/backup/CommitLogCheckpointAction.java
diff --git a/java/google/registry/backup/CommitLogCheckpointStrategy.java b/core/src/main/java/google/registry/backup/CommitLogCheckpointStrategy.java
similarity index 100%
rename from java/google/registry/backup/CommitLogCheckpointStrategy.java
rename to core/src/main/java/google/registry/backup/CommitLogCheckpointStrategy.java
diff --git a/java/google/registry/backup/DeleteOldCommitLogsAction.java b/core/src/main/java/google/registry/backup/DeleteOldCommitLogsAction.java
similarity index 100%
rename from java/google/registry/backup/DeleteOldCommitLogsAction.java
rename to core/src/main/java/google/registry/backup/DeleteOldCommitLogsAction.java
diff --git a/java/google/registry/backup/ExportCommitLogDiffAction.java b/core/src/main/java/google/registry/backup/ExportCommitLogDiffAction.java
similarity index 100%
rename from java/google/registry/backup/ExportCommitLogDiffAction.java
rename to core/src/main/java/google/registry/backup/ExportCommitLogDiffAction.java
diff --git a/java/google/registry/backup/GcsDiffFileLister.java b/core/src/main/java/google/registry/backup/GcsDiffFileLister.java
similarity index 100%
rename from java/google/registry/backup/GcsDiffFileLister.java
rename to core/src/main/java/google/registry/backup/GcsDiffFileLister.java
diff --git a/java/google/registry/backup/RestoreCommitLogsAction.java b/core/src/main/java/google/registry/backup/RestoreCommitLogsAction.java
similarity index 100%
rename from java/google/registry/backup/RestoreCommitLogsAction.java
rename to core/src/main/java/google/registry/backup/RestoreCommitLogsAction.java
diff --git a/java/google/registry/backup/package-info.java b/core/src/main/java/google/registry/backup/package-info.java
similarity index 100%
rename from java/google/registry/backup/package-info.java
rename to core/src/main/java/google/registry/backup/package-info.java
diff --git a/java/google/registry/batch/AsyncTaskEnqueuer.java b/core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java
similarity index 100%
rename from java/google/registry/batch/AsyncTaskEnqueuer.java
rename to core/src/main/java/google/registry/batch/AsyncTaskEnqueuer.java
diff --git a/java/google/registry/batch/AsyncTaskMetrics.java b/core/src/main/java/google/registry/batch/AsyncTaskMetrics.java
similarity index 100%
rename from java/google/registry/batch/AsyncTaskMetrics.java
rename to core/src/main/java/google/registry/batch/AsyncTaskMetrics.java
diff --git a/java/google/registry/batch/BUILD b/core/src/main/java/google/registry/batch/BUILD
similarity index 100%
rename from java/google/registry/batch/BUILD
rename to core/src/main/java/google/registry/batch/BUILD
diff --git a/java/google/registry/batch/BatchModule.java b/core/src/main/java/google/registry/batch/BatchModule.java
similarity index 100%
rename from java/google/registry/batch/BatchModule.java
rename to core/src/main/java/google/registry/batch/BatchModule.java
diff --git a/java/google/registry/batch/DeleteContactsAndHostsAction.java b/core/src/main/java/google/registry/batch/DeleteContactsAndHostsAction.java
similarity index 100%
rename from java/google/registry/batch/DeleteContactsAndHostsAction.java
rename to core/src/main/java/google/registry/batch/DeleteContactsAndHostsAction.java
diff --git a/java/google/registry/batch/DeleteLoadTestDataAction.java b/core/src/main/java/google/registry/batch/DeleteLoadTestDataAction.java
similarity index 100%
rename from java/google/registry/batch/DeleteLoadTestDataAction.java
rename to core/src/main/java/google/registry/batch/DeleteLoadTestDataAction.java
diff --git a/java/google/registry/batch/DeleteProberDataAction.java b/core/src/main/java/google/registry/batch/DeleteProberDataAction.java
similarity index 100%
rename from java/google/registry/batch/DeleteProberDataAction.java
rename to core/src/main/java/google/registry/batch/DeleteProberDataAction.java
diff --git a/java/google/registry/batch/ExpandRecurringBillingEventsAction.java b/core/src/main/java/google/registry/batch/ExpandRecurringBillingEventsAction.java
similarity index 100%
rename from java/google/registry/batch/ExpandRecurringBillingEventsAction.java
rename to core/src/main/java/google/registry/batch/ExpandRecurringBillingEventsAction.java
diff --git a/java/google/registry/batch/RefreshDnsOnHostRenameAction.java b/core/src/main/java/google/registry/batch/RefreshDnsOnHostRenameAction.java
similarity index 100%
rename from java/google/registry/batch/RefreshDnsOnHostRenameAction.java
rename to core/src/main/java/google/registry/batch/RefreshDnsOnHostRenameAction.java
diff --git a/java/google/registry/batch/ResaveAllEppResourcesAction.java b/core/src/main/java/google/registry/batch/ResaveAllEppResourcesAction.java
similarity index 100%
rename from java/google/registry/batch/ResaveAllEppResourcesAction.java
rename to core/src/main/java/google/registry/batch/ResaveAllEppResourcesAction.java
diff --git a/java/google/registry/batch/ResaveEntityAction.java b/core/src/main/java/google/registry/batch/ResaveEntityAction.java
similarity index 100%
rename from java/google/registry/batch/ResaveEntityAction.java
rename to core/src/main/java/google/registry/batch/ResaveEntityAction.java
diff --git a/java/google/registry/beam/BUILD b/core/src/main/java/google/registry/beam/BUILD
similarity index 100%
rename from java/google/registry/beam/BUILD
rename to core/src/main/java/google/registry/beam/BUILD
diff --git a/java/google/registry/beam/BeamUtils.java b/core/src/main/java/google/registry/beam/BeamUtils.java
similarity index 100%
rename from java/google/registry/beam/BeamUtils.java
rename to core/src/main/java/google/registry/beam/BeamUtils.java
diff --git a/java/google/registry/beam/invoicing/BUILD b/core/src/main/java/google/registry/beam/invoicing/BUILD
similarity index 100%
rename from java/google/registry/beam/invoicing/BUILD
rename to core/src/main/java/google/registry/beam/invoicing/BUILD
diff --git a/java/google/registry/beam/invoicing/BillingEvent.java b/core/src/main/java/google/registry/beam/invoicing/BillingEvent.java
similarity index 100%
rename from java/google/registry/beam/invoicing/BillingEvent.java
rename to core/src/main/java/google/registry/beam/invoicing/BillingEvent.java
diff --git a/java/google/registry/beam/invoicing/InvoicingPipeline.java b/core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java
similarity index 100%
rename from java/google/registry/beam/invoicing/InvoicingPipeline.java
rename to core/src/main/java/google/registry/beam/invoicing/InvoicingPipeline.java
diff --git a/java/google/registry/beam/invoicing/InvoicingUtils.java b/core/src/main/java/google/registry/beam/invoicing/InvoicingUtils.java
similarity index 100%
rename from java/google/registry/beam/invoicing/InvoicingUtils.java
rename to core/src/main/java/google/registry/beam/invoicing/InvoicingUtils.java
diff --git a/java/google/registry/beam/invoicing/sql/billing_events.sql b/core/src/main/java/google/registry/beam/invoicing/sql/billing_events.sql
similarity index 100%
rename from java/google/registry/beam/invoicing/sql/billing_events.sql
rename to core/src/main/java/google/registry/beam/invoicing/sql/billing_events.sql
diff --git a/java/google/registry/beam/spec11/BUILD b/core/src/main/java/google/registry/beam/spec11/BUILD
similarity index 100%
rename from java/google/registry/beam/spec11/BUILD
rename to core/src/main/java/google/registry/beam/spec11/BUILD
diff --git a/java/google/registry/beam/spec11/SafeBrowsingTransforms.java b/core/src/main/java/google/registry/beam/spec11/SafeBrowsingTransforms.java
similarity index 100%
rename from java/google/registry/beam/spec11/SafeBrowsingTransforms.java
rename to core/src/main/java/google/registry/beam/spec11/SafeBrowsingTransforms.java
diff --git a/java/google/registry/beam/spec11/Spec11Pipeline.java b/core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java
similarity index 100%
rename from java/google/registry/beam/spec11/Spec11Pipeline.java
rename to core/src/main/java/google/registry/beam/spec11/Spec11Pipeline.java
diff --git a/java/google/registry/beam/spec11/Subdomain.java b/core/src/main/java/google/registry/beam/spec11/Subdomain.java
similarity index 100%
rename from java/google/registry/beam/spec11/Subdomain.java
rename to core/src/main/java/google/registry/beam/spec11/Subdomain.java
diff --git a/java/google/registry/beam/spec11/ThreatMatch.java b/core/src/main/java/google/registry/beam/spec11/ThreatMatch.java
similarity index 100%
rename from java/google/registry/beam/spec11/ThreatMatch.java
rename to core/src/main/java/google/registry/beam/spec11/ThreatMatch.java
diff --git a/java/google/registry/beam/spec11/sql/subdomains.sql b/core/src/main/java/google/registry/beam/spec11/sql/subdomains.sql
similarity index 100%
rename from java/google/registry/beam/spec11/sql/subdomains.sql
rename to core/src/main/java/google/registry/beam/spec11/sql/subdomains.sql
diff --git a/java/google/registry/bigquery/BUILD b/core/src/main/java/google/registry/bigquery/BUILD
similarity index 100%
rename from java/google/registry/bigquery/BUILD
rename to core/src/main/java/google/registry/bigquery/BUILD
diff --git a/java/google/registry/bigquery/BigqueryConnection.java b/core/src/main/java/google/registry/bigquery/BigqueryConnection.java
similarity index 100%
rename from java/google/registry/bigquery/BigqueryConnection.java
rename to core/src/main/java/google/registry/bigquery/BigqueryConnection.java
diff --git a/java/google/registry/bigquery/BigqueryJobFailureException.java b/core/src/main/java/google/registry/bigquery/BigqueryJobFailureException.java
similarity index 100%
rename from java/google/registry/bigquery/BigqueryJobFailureException.java
rename to core/src/main/java/google/registry/bigquery/BigqueryJobFailureException.java
diff --git a/java/google/registry/bigquery/BigqueryModule.java b/core/src/main/java/google/registry/bigquery/BigqueryModule.java
similarity index 100%
rename from java/google/registry/bigquery/BigqueryModule.java
rename to core/src/main/java/google/registry/bigquery/BigqueryModule.java
diff --git a/java/google/registry/bigquery/BigqueryUtils.java b/core/src/main/java/google/registry/bigquery/BigqueryUtils.java
similarity index 100%
rename from java/google/registry/bigquery/BigqueryUtils.java
rename to core/src/main/java/google/registry/bigquery/BigqueryUtils.java
diff --git a/java/google/registry/bigquery/CheckedBigquery.java b/core/src/main/java/google/registry/bigquery/CheckedBigquery.java
similarity index 100%
rename from java/google/registry/bigquery/CheckedBigquery.java
rename to core/src/main/java/google/registry/bigquery/CheckedBigquery.java
diff --git a/java/google/registry/bigquery/package-info.java b/core/src/main/java/google/registry/bigquery/package-info.java
similarity index 100%
rename from java/google/registry/bigquery/package-info.java
rename to core/src/main/java/google/registry/bigquery/package-info.java
diff --git a/java/google/registry/builddefs/BUILD b/core/src/main/java/google/registry/builddefs/BUILD
similarity index 100%
rename from java/google/registry/builddefs/BUILD
rename to core/src/main/java/google/registry/builddefs/BUILD
diff --git a/java/google/registry/builddefs/defs.bzl b/core/src/main/java/google/registry/builddefs/defs.bzl
similarity index 100%
rename from java/google/registry/builddefs/defs.bzl
rename to core/src/main/java/google/registry/builddefs/defs.bzl
diff --git a/java/google/registry/builddefs/registry_ear_file.bzl b/core/src/main/java/google/registry/builddefs/registry_ear_file.bzl
similarity index 100%
rename from java/google/registry/builddefs/registry_ear_file.bzl
rename to core/src/main/java/google/registry/builddefs/registry_ear_file.bzl
diff --git a/java/google/registry/builddefs/zip_file.bzl b/core/src/main/java/google/registry/builddefs/zip_file.bzl
similarity index 100%
rename from java/google/registry/builddefs/zip_file.bzl
rename to core/src/main/java/google/registry/builddefs/zip_file.bzl
diff --git a/java/google/registry/config/BUILD b/core/src/main/java/google/registry/config/BUILD
similarity index 100%
rename from java/google/registry/config/BUILD
rename to core/src/main/java/google/registry/config/BUILD
diff --git a/java/google/registry/config/ConfigUtils.java b/core/src/main/java/google/registry/config/ConfigUtils.java
similarity index 100%
rename from java/google/registry/config/ConfigUtils.java
rename to core/src/main/java/google/registry/config/ConfigUtils.java
diff --git a/java/google/registry/config/CredentialModule.java b/core/src/main/java/google/registry/config/CredentialModule.java
similarity index 100%
rename from java/google/registry/config/CredentialModule.java
rename to core/src/main/java/google/registry/config/CredentialModule.java
diff --git a/java/google/registry/config/RegistryConfig.java b/core/src/main/java/google/registry/config/RegistryConfig.java
similarity index 100%
rename from java/google/registry/config/RegistryConfig.java
rename to core/src/main/java/google/registry/config/RegistryConfig.java
diff --git a/java/google/registry/config/RegistryConfigSettings.java b/core/src/main/java/google/registry/config/RegistryConfigSettings.java
similarity index 100%
rename from java/google/registry/config/RegistryConfigSettings.java
rename to core/src/main/java/google/registry/config/RegistryConfigSettings.java
diff --git a/java/google/registry/config/RegistryEnvironment.java b/core/src/main/java/google/registry/config/RegistryEnvironment.java
similarity index 100%
rename from java/google/registry/config/RegistryEnvironment.java
rename to core/src/main/java/google/registry/config/RegistryEnvironment.java
diff --git a/java/google/registry/config/SystemPropertySetter.java b/core/src/main/java/google/registry/config/SystemPropertySetter.java
similarity index 100%
rename from java/google/registry/config/SystemPropertySetter.java
rename to core/src/main/java/google/registry/config/SystemPropertySetter.java
diff --git a/java/google/registry/config/files/default-config.yaml b/core/src/main/java/google/registry/config/files/default-config.yaml
similarity index 100%
rename from java/google/registry/config/files/default-config.yaml
rename to core/src/main/java/google/registry/config/files/default-config.yaml
diff --git a/java/google/registry/config/files/nomulus-config-alpha.yaml b/core/src/main/java/google/registry/config/files/nomulus-config-alpha.yaml
similarity index 100%
rename from java/google/registry/config/files/nomulus-config-alpha.yaml
rename to core/src/main/java/google/registry/config/files/nomulus-config-alpha.yaml
diff --git a/java/google/registry/config/files/nomulus-config-crash.yaml b/core/src/main/java/google/registry/config/files/nomulus-config-crash.yaml
similarity index 100%
rename from java/google/registry/config/files/nomulus-config-crash.yaml
rename to core/src/main/java/google/registry/config/files/nomulus-config-crash.yaml
diff --git a/java/google/registry/config/files/nomulus-config-local.yaml b/core/src/main/java/google/registry/config/files/nomulus-config-local.yaml
similarity index 100%
rename from java/google/registry/config/files/nomulus-config-local.yaml
rename to core/src/main/java/google/registry/config/files/nomulus-config-local.yaml
diff --git a/java/google/registry/config/files/nomulus-config-production-sample.yaml b/core/src/main/java/google/registry/config/files/nomulus-config-production-sample.yaml
similarity index 100%
rename from java/google/registry/config/files/nomulus-config-production-sample.yaml
rename to core/src/main/java/google/registry/config/files/nomulus-config-production-sample.yaml
diff --git a/java/google/registry/config/files/nomulus-config-production.yaml b/core/src/main/java/google/registry/config/files/nomulus-config-production.yaml
similarity index 100%
rename from java/google/registry/config/files/nomulus-config-production.yaml
rename to core/src/main/java/google/registry/config/files/nomulus-config-production.yaml
diff --git a/java/google/registry/config/files/nomulus-config-qa.yaml b/core/src/main/java/google/registry/config/files/nomulus-config-qa.yaml
similarity index 100%
rename from java/google/registry/config/files/nomulus-config-qa.yaml
rename to core/src/main/java/google/registry/config/files/nomulus-config-qa.yaml
diff --git a/java/google/registry/config/files/nomulus-config-sandbox.yaml b/core/src/main/java/google/registry/config/files/nomulus-config-sandbox.yaml
similarity index 100%
rename from java/google/registry/config/files/nomulus-config-sandbox.yaml
rename to core/src/main/java/google/registry/config/files/nomulus-config-sandbox.yaml
diff --git a/java/google/registry/config/files/nomulus-config-unittest.yaml b/core/src/main/java/google/registry/config/files/nomulus-config-unittest.yaml
similarity index 100%
rename from java/google/registry/config/files/nomulus-config-unittest.yaml
rename to core/src/main/java/google/registry/config/files/nomulus-config-unittest.yaml
diff --git a/java/google/registry/config/files/premium/BUILD b/core/src/main/java/google/registry/config/files/premium/BUILD
similarity index 100%
rename from java/google/registry/config/files/premium/BUILD
rename to core/src/main/java/google/registry/config/files/premium/BUILD
diff --git a/java/google/registry/config/files/premium/example.txt b/core/src/main/java/google/registry/config/files/premium/example.txt
similarity index 100%
rename from java/google/registry/config/files/premium/example.txt
rename to core/src/main/java/google/registry/config/files/premium/example.txt
diff --git a/java/google/registry/config/files/reserved/BUILD b/core/src/main/java/google/registry/config/files/reserved/BUILD
similarity index 100%
rename from java/google/registry/config/files/reserved/BUILD
rename to core/src/main/java/google/registry/config/files/reserved/BUILD
diff --git a/java/google/registry/config/files/reserved/common_example.txt b/core/src/main/java/google/registry/config/files/reserved/common_example.txt
similarity index 100%
rename from java/google/registry/config/files/reserved/common_example.txt
rename to core/src/main/java/google/registry/config/files/reserved/common_example.txt
diff --git a/java/google/registry/config/package-info.java b/core/src/main/java/google/registry/config/package-info.java
similarity index 100%
rename from java/google/registry/config/package-info.java
rename to core/src/main/java/google/registry/config/package-info.java
diff --git a/java/google/registry/cron/BUILD b/core/src/main/java/google/registry/cron/BUILD
similarity index 100%
rename from java/google/registry/cron/BUILD
rename to core/src/main/java/google/registry/cron/BUILD
diff --git a/java/google/registry/cron/CommitLogFanoutAction.java b/core/src/main/java/google/registry/cron/CommitLogFanoutAction.java
similarity index 100%
rename from java/google/registry/cron/CommitLogFanoutAction.java
rename to core/src/main/java/google/registry/cron/CommitLogFanoutAction.java
diff --git a/java/google/registry/cron/CronModule.java b/core/src/main/java/google/registry/cron/CronModule.java
similarity index 100%
rename from java/google/registry/cron/CronModule.java
rename to core/src/main/java/google/registry/cron/CronModule.java
diff --git a/java/google/registry/cron/TldFanoutAction.java b/core/src/main/java/google/registry/cron/TldFanoutAction.java
similarity index 100%
rename from java/google/registry/cron/TldFanoutAction.java
rename to core/src/main/java/google/registry/cron/TldFanoutAction.java
diff --git a/java/google/registry/cron/package-info.java b/core/src/main/java/google/registry/cron/package-info.java
similarity index 100%
rename from java/google/registry/cron/package-info.java
rename to core/src/main/java/google/registry/cron/package-info.java
diff --git a/java/google/registry/dns/BUILD b/core/src/main/java/google/registry/dns/BUILD
similarity index 100%
rename from java/google/registry/dns/BUILD
rename to core/src/main/java/google/registry/dns/BUILD
diff --git a/java/google/registry/dns/DnsConstants.java b/core/src/main/java/google/registry/dns/DnsConstants.java
similarity index 100%
rename from java/google/registry/dns/DnsConstants.java
rename to core/src/main/java/google/registry/dns/DnsConstants.java
diff --git a/java/google/registry/dns/DnsMetrics.java b/core/src/main/java/google/registry/dns/DnsMetrics.java
similarity index 100%
rename from java/google/registry/dns/DnsMetrics.java
rename to core/src/main/java/google/registry/dns/DnsMetrics.java
diff --git a/java/google/registry/dns/DnsModule.java b/core/src/main/java/google/registry/dns/DnsModule.java
similarity index 100%
rename from java/google/registry/dns/DnsModule.java
rename to core/src/main/java/google/registry/dns/DnsModule.java
diff --git a/java/google/registry/dns/DnsQueue.java b/core/src/main/java/google/registry/dns/DnsQueue.java
similarity index 100%
rename from java/google/registry/dns/DnsQueue.java
rename to core/src/main/java/google/registry/dns/DnsQueue.java
diff --git a/java/google/registry/dns/DnsWriterProxy.java b/core/src/main/java/google/registry/dns/DnsWriterProxy.java
similarity index 100%
rename from java/google/registry/dns/DnsWriterProxy.java
rename to core/src/main/java/google/registry/dns/DnsWriterProxy.java
diff --git a/java/google/registry/dns/PublishDnsUpdatesAction.java b/core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java
similarity index 100%
rename from java/google/registry/dns/PublishDnsUpdatesAction.java
rename to core/src/main/java/google/registry/dns/PublishDnsUpdatesAction.java
diff --git a/java/google/registry/dns/ReadDnsQueueAction.java b/core/src/main/java/google/registry/dns/ReadDnsQueueAction.java
similarity index 100%
rename from java/google/registry/dns/ReadDnsQueueAction.java
rename to core/src/main/java/google/registry/dns/ReadDnsQueueAction.java
diff --git a/java/google/registry/dns/RefreshDnsAction.java b/core/src/main/java/google/registry/dns/RefreshDnsAction.java
similarity index 100%
rename from java/google/registry/dns/RefreshDnsAction.java
rename to core/src/main/java/google/registry/dns/RefreshDnsAction.java
diff --git a/java/google/registry/dns/writer/BUILD b/core/src/main/java/google/registry/dns/writer/BUILD
similarity index 100%
rename from java/google/registry/dns/writer/BUILD
rename to core/src/main/java/google/registry/dns/writer/BUILD
diff --git a/java/google/registry/dns/writer/BaseDnsWriter.java b/core/src/main/java/google/registry/dns/writer/BaseDnsWriter.java
similarity index 100%
rename from java/google/registry/dns/writer/BaseDnsWriter.java
rename to core/src/main/java/google/registry/dns/writer/BaseDnsWriter.java
diff --git a/java/google/registry/dns/writer/DnsWriter.java b/core/src/main/java/google/registry/dns/writer/DnsWriter.java
similarity index 100%
rename from java/google/registry/dns/writer/DnsWriter.java
rename to core/src/main/java/google/registry/dns/writer/DnsWriter.java
diff --git a/java/google/registry/dns/writer/DnsWriterZone.java b/core/src/main/java/google/registry/dns/writer/DnsWriterZone.java
similarity index 100%
rename from java/google/registry/dns/writer/DnsWriterZone.java
rename to core/src/main/java/google/registry/dns/writer/DnsWriterZone.java
diff --git a/java/google/registry/dns/writer/VoidDnsWriter.java b/core/src/main/java/google/registry/dns/writer/VoidDnsWriter.java
similarity index 100%
rename from java/google/registry/dns/writer/VoidDnsWriter.java
rename to core/src/main/java/google/registry/dns/writer/VoidDnsWriter.java
diff --git a/java/google/registry/dns/writer/VoidDnsWriterModule.java b/core/src/main/java/google/registry/dns/writer/VoidDnsWriterModule.java
similarity index 100%
rename from java/google/registry/dns/writer/VoidDnsWriterModule.java
rename to core/src/main/java/google/registry/dns/writer/VoidDnsWriterModule.java
diff --git a/java/google/registry/dns/writer/clouddns/BUILD b/core/src/main/java/google/registry/dns/writer/clouddns/BUILD
similarity index 100%
rename from java/google/registry/dns/writer/clouddns/BUILD
rename to core/src/main/java/google/registry/dns/writer/clouddns/BUILD
diff --git a/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java
similarity index 100%
rename from java/google/registry/dns/writer/clouddns/CloudDnsWriter.java
rename to core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriter.java
diff --git a/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java b/core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java
similarity index 100%
rename from java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java
rename to core/src/main/java/google/registry/dns/writer/clouddns/CloudDnsWriterModule.java
diff --git a/java/google/registry/dns/writer/dnsupdate/BUILD b/core/src/main/java/google/registry/dns/writer/dnsupdate/BUILD
similarity index 100%
rename from java/google/registry/dns/writer/dnsupdate/BUILD
rename to core/src/main/java/google/registry/dns/writer/dnsupdate/BUILD
diff --git a/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java
similarity index 100%
rename from java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java
rename to core/src/main/java/google/registry/dns/writer/dnsupdate/DnsMessageTransport.java
diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java
similarity index 100%
rename from java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java
rename to core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateConfigModule.java
diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
similarity index 100%
rename from java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
rename to core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java b/core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java
similarity index 100%
rename from java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java
rename to core/src/main/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java
diff --git a/java/google/registry/documentation/DocumentationGenerator.java b/core/src/main/java/google/registry/documentation/DocumentationGenerator.java
similarity index 100%
rename from java/google/registry/documentation/DocumentationGenerator.java
rename to core/src/main/java/google/registry/documentation/DocumentationGenerator.java
diff --git a/java/google/registry/documentation/FlowDocumentation.java b/core/src/main/java/google/registry/documentation/FlowDocumentation.java
similarity index 100%
rename from java/google/registry/documentation/FlowDocumentation.java
rename to core/src/main/java/google/registry/documentation/FlowDocumentation.java
diff --git a/java/google/registry/documentation/FlowDocumentationTool.java b/core/src/main/java/google/registry/documentation/FlowDocumentationTool.java
similarity index 100%
rename from java/google/registry/documentation/FlowDocumentationTool.java
rename to core/src/main/java/google/registry/documentation/FlowDocumentationTool.java
diff --git a/java/google/registry/documentation/JavadocWrapper.java b/core/src/main/java/google/registry/documentation/JavadocWrapper.java
similarity index 99%
rename from java/google/registry/documentation/JavadocWrapper.java
rename to core/src/main/java/google/registry/documentation/JavadocWrapper.java
index bcdb90eb8..a34bd8562 100644
--- a/java/google/registry/documentation/JavadocWrapper.java
+++ b/core/src/main/java/google/registry/documentation/JavadocWrapper.java
@@ -54,7 +54,8 @@ public final class JavadocWrapper {
       Modifier.PUBLIC | Modifier.PROTECTED | ModifierFilter.PACKAGE;
 
   /** Root directory for source files. If null, will use the current directory. */
-  private static final String SOURCE_PATH = getProjectRoot().resolve("java").toString();
+  private static final String SOURCE_PATH = getProjectRoot().resolve("core/src/main/java")
+      .toString();
   /** Specific source files to generate documentation for. */
   private static final ImmutableSet<String> SOURCE_FILE_NAMES = ImmutableSet.of();
 
diff --git a/java/google/registry/documentation/MarkdownDocumentationFormatter.java b/core/src/main/java/google/registry/documentation/MarkdownDocumentationFormatter.java
similarity index 100%
rename from java/google/registry/documentation/MarkdownDocumentationFormatter.java
rename to core/src/main/java/google/registry/documentation/MarkdownDocumentationFormatter.java
diff --git a/java/google/registry/documentation/generate_javadoc.sh b/core/src/main/java/google/registry/documentation/generate_javadoc.sh
similarity index 100%
rename from java/google/registry/documentation/generate_javadoc.sh
rename to core/src/main/java/google/registry/documentation/generate_javadoc.sh
diff --git a/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/alpha/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml
similarity index 100%
rename from java/google/registry/env/alpha/default/WEB-INF/cron.xml
rename to core/src/main/java/google/registry/env/alpha/default/WEB-INF/cron.xml
diff --git a/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/common/META-INF/appengine-application.xml b/core/src/main/java/google/registry/env/common/META-INF/appengine-application.xml
similarity index 100%
rename from java/google/registry/env/common/META-INF/appengine-application.xml
rename to core/src/main/java/google/registry/env/common/META-INF/appengine-application.xml
diff --git a/java/google/registry/env/common/META-INF/application.xml b/core/src/main/java/google/registry/env/common/META-INF/application.xml
similarity index 100%
rename from java/google/registry/env/common/META-INF/application.xml
rename to core/src/main/java/google/registry/env/common/META-INF/application.xml
diff --git a/java/google/registry/env/common/backend/WEB-INF/logging.properties b/core/src/main/java/google/registry/env/common/backend/WEB-INF/logging.properties
similarity index 100%
rename from java/google/registry/env/common/backend/WEB-INF/logging.properties
rename to core/src/main/java/google/registry/env/common/backend/WEB-INF/logging.properties
diff --git a/java/google/registry/env/common/backend/WEB-INF/web.xml b/core/src/main/java/google/registry/env/common/backend/WEB-INF/web.xml
similarity index 100%
rename from java/google/registry/env/common/backend/WEB-INF/web.xml
rename to core/src/main/java/google/registry/env/common/backend/WEB-INF/web.xml
diff --git a/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml b/core/src/main/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
similarity index 100%
rename from java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
rename to core/src/main/java/google/registry/env/common/default/WEB-INF/datastore-indexes.xml
diff --git a/java/google/registry/env/common/default/WEB-INF/dispatch.xml b/core/src/main/java/google/registry/env/common/default/WEB-INF/dispatch.xml
similarity index 100%
rename from java/google/registry/env/common/default/WEB-INF/dispatch.xml
rename to core/src/main/java/google/registry/env/common/default/WEB-INF/dispatch.xml
diff --git a/java/google/registry/env/common/default/WEB-INF/dos.xml b/core/src/main/java/google/registry/env/common/default/WEB-INF/dos.xml
similarity index 100%
rename from java/google/registry/env/common/default/WEB-INF/dos.xml
rename to core/src/main/java/google/registry/env/common/default/WEB-INF/dos.xml
diff --git a/java/google/registry/env/common/default/WEB-INF/logging.properties b/core/src/main/java/google/registry/env/common/default/WEB-INF/logging.properties
similarity index 100%
rename from java/google/registry/env/common/default/WEB-INF/logging.properties
rename to core/src/main/java/google/registry/env/common/default/WEB-INF/logging.properties
diff --git a/java/google/registry/env/common/default/WEB-INF/queue.xml b/core/src/main/java/google/registry/env/common/default/WEB-INF/queue.xml
similarity index 100%
rename from java/google/registry/env/common/default/WEB-INF/queue.xml
rename to core/src/main/java/google/registry/env/common/default/WEB-INF/queue.xml
diff --git a/java/google/registry/env/common/default/WEB-INF/web.xml b/core/src/main/java/google/registry/env/common/default/WEB-INF/web.xml
similarity index 100%
rename from java/google/registry/env/common/default/WEB-INF/web.xml
rename to core/src/main/java/google/registry/env/common/default/WEB-INF/web.xml
diff --git a/java/google/registry/env/common/pubapi/WEB-INF/dos.xml b/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/dos.xml
similarity index 100%
rename from java/google/registry/env/common/pubapi/WEB-INF/dos.xml
rename to core/src/main/java/google/registry/env/common/pubapi/WEB-INF/dos.xml
diff --git a/java/google/registry/env/common/pubapi/WEB-INF/logging.properties b/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/logging.properties
similarity index 100%
rename from java/google/registry/env/common/pubapi/WEB-INF/logging.properties
rename to core/src/main/java/google/registry/env/common/pubapi/WEB-INF/logging.properties
diff --git a/java/google/registry/env/common/pubapi/WEB-INF/web.xml b/core/src/main/java/google/registry/env/common/pubapi/WEB-INF/web.xml
similarity index 100%
rename from java/google/registry/env/common/pubapi/WEB-INF/web.xml
rename to core/src/main/java/google/registry/env/common/pubapi/WEB-INF/web.xml
diff --git a/java/google/registry/env/common/tools/WEB-INF/logging.properties b/core/src/main/java/google/registry/env/common/tools/WEB-INF/logging.properties
similarity index 100%
rename from java/google/registry/env/common/tools/WEB-INF/logging.properties
rename to core/src/main/java/google/registry/env/common/tools/WEB-INF/logging.properties
diff --git a/java/google/registry/env/common/tools/WEB-INF/web.xml b/core/src/main/java/google/registry/env/common/tools/WEB-INF/web.xml
similarity index 100%
rename from java/google/registry/env/common/tools/WEB-INF/web.xml
rename to core/src/main/java/google/registry/env/common/tools/WEB-INF/web.xml
diff --git a/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/crash/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml
similarity index 100%
rename from java/google/registry/env/crash/default/WEB-INF/cron.xml
rename to core/src/main/java/google/registry/env/crash/default/WEB-INF/cron.xml
diff --git a/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/local/backend/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/local/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/local/default/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/local/default/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/local/tools/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/production/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/production/default/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/production/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml
similarity index 100%
rename from java/google/registry/env/production/default/WEB-INF/cron.xml
rename to core/src/main/java/google/registry/env/production/default/WEB-INF/cron.xml
diff --git a/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/qa/default/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/qa/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/qa/default/WEB-INF/cron.xml
similarity index 100%
rename from java/google/registry/env/qa/default/WEB-INF/cron.xml
rename to core/src/main/java/google/registry/env/qa/default/WEB-INF/cron.xml
diff --git a/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/sandbox/default/WEB-INF/cron.xml b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml
similarity index 100%
rename from java/google/registry/env/sandbox/default/WEB-INF/cron.xml
rename to core/src/main/java/google/registry/env/sandbox/default/WEB-INF/cron.xml
diff --git a/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml
rename to core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml
diff --git a/java/google/registry/export/BUILD b/core/src/main/java/google/registry/export/BUILD
similarity index 100%
rename from java/google/registry/export/BUILD
rename to core/src/main/java/google/registry/export/BUILD
diff --git a/java/google/registry/export/BackupDatastoreAction.java b/core/src/main/java/google/registry/export/BackupDatastoreAction.java
similarity index 100%
rename from java/google/registry/export/BackupDatastoreAction.java
rename to core/src/main/java/google/registry/export/BackupDatastoreAction.java
diff --git a/java/google/registry/export/BigqueryPollJobAction.java b/core/src/main/java/google/registry/export/BigqueryPollJobAction.java
similarity index 100%
rename from java/google/registry/export/BigqueryPollJobAction.java
rename to core/src/main/java/google/registry/export/BigqueryPollJobAction.java
diff --git a/java/google/registry/export/CheckBackupAction.java b/core/src/main/java/google/registry/export/CheckBackupAction.java
similarity index 100%
rename from java/google/registry/export/CheckBackupAction.java
rename to core/src/main/java/google/registry/export/CheckBackupAction.java
diff --git a/java/google/registry/export/DriveModule.java b/core/src/main/java/google/registry/export/DriveModule.java
similarity index 100%
rename from java/google/registry/export/DriveModule.java
rename to core/src/main/java/google/registry/export/DriveModule.java
diff --git a/java/google/registry/export/ExportConstants.java b/core/src/main/java/google/registry/export/ExportConstants.java
similarity index 100%
rename from java/google/registry/export/ExportConstants.java
rename to core/src/main/java/google/registry/export/ExportConstants.java
diff --git a/java/google/registry/export/ExportDomainListsAction.java b/core/src/main/java/google/registry/export/ExportDomainListsAction.java
similarity index 100%
rename from java/google/registry/export/ExportDomainListsAction.java
rename to core/src/main/java/google/registry/export/ExportDomainListsAction.java
diff --git a/java/google/registry/export/ExportPremiumTermsAction.java b/core/src/main/java/google/registry/export/ExportPremiumTermsAction.java
similarity index 100%
rename from java/google/registry/export/ExportPremiumTermsAction.java
rename to core/src/main/java/google/registry/export/ExportPremiumTermsAction.java
diff --git a/java/google/registry/export/ExportRequestModule.java b/core/src/main/java/google/registry/export/ExportRequestModule.java
similarity index 100%
rename from java/google/registry/export/ExportRequestModule.java
rename to core/src/main/java/google/registry/export/ExportRequestModule.java
diff --git a/java/google/registry/export/ExportReservedTermsAction.java b/core/src/main/java/google/registry/export/ExportReservedTermsAction.java
similarity index 100%
rename from java/google/registry/export/ExportReservedTermsAction.java
rename to core/src/main/java/google/registry/export/ExportReservedTermsAction.java
diff --git a/java/google/registry/export/ExportUtils.java b/core/src/main/java/google/registry/export/ExportUtils.java
similarity index 100%
rename from java/google/registry/export/ExportUtils.java
rename to core/src/main/java/google/registry/export/ExportUtils.java
diff --git a/java/google/registry/export/SyncGroupMembersAction.java b/core/src/main/java/google/registry/export/SyncGroupMembersAction.java
similarity index 100%
rename from java/google/registry/export/SyncGroupMembersAction.java
rename to core/src/main/java/google/registry/export/SyncGroupMembersAction.java
diff --git a/java/google/registry/export/UpdateSnapshotViewAction.java b/core/src/main/java/google/registry/export/UpdateSnapshotViewAction.java
similarity index 100%
rename from java/google/registry/export/UpdateSnapshotViewAction.java
rename to core/src/main/java/google/registry/export/UpdateSnapshotViewAction.java
diff --git a/java/google/registry/export/UploadDatastoreBackupAction.java b/core/src/main/java/google/registry/export/UploadDatastoreBackupAction.java
similarity index 100%
rename from java/google/registry/export/UploadDatastoreBackupAction.java
rename to core/src/main/java/google/registry/export/UploadDatastoreBackupAction.java
diff --git a/java/google/registry/export/datastore/BUILD b/core/src/main/java/google/registry/export/datastore/BUILD
similarity index 100%
rename from java/google/registry/export/datastore/BUILD
rename to core/src/main/java/google/registry/export/datastore/BUILD
diff --git a/java/google/registry/export/datastore/DatastoreAdmin.java b/core/src/main/java/google/registry/export/datastore/DatastoreAdmin.java
similarity index 100%
rename from java/google/registry/export/datastore/DatastoreAdmin.java
rename to core/src/main/java/google/registry/export/datastore/DatastoreAdmin.java
diff --git a/java/google/registry/export/datastore/DatastoreAdminModule.java b/core/src/main/java/google/registry/export/datastore/DatastoreAdminModule.java
similarity index 100%
rename from java/google/registry/export/datastore/DatastoreAdminModule.java
rename to core/src/main/java/google/registry/export/datastore/DatastoreAdminModule.java
diff --git a/java/google/registry/export/datastore/EntityFilter.java b/core/src/main/java/google/registry/export/datastore/EntityFilter.java
similarity index 100%
rename from java/google/registry/export/datastore/EntityFilter.java
rename to core/src/main/java/google/registry/export/datastore/EntityFilter.java
diff --git a/java/google/registry/export/datastore/Operation.java b/core/src/main/java/google/registry/export/datastore/Operation.java
similarity index 100%
rename from java/google/registry/export/datastore/Operation.java
rename to core/src/main/java/google/registry/export/datastore/Operation.java
diff --git a/java/google/registry/export/package-info.java b/core/src/main/java/google/registry/export/package-info.java
similarity index 100%
rename from java/google/registry/export/package-info.java
rename to core/src/main/java/google/registry/export/package-info.java
diff --git a/java/google/registry/export/sheet/BUILD b/core/src/main/java/google/registry/export/sheet/BUILD
similarity index 100%
rename from java/google/registry/export/sheet/BUILD
rename to core/src/main/java/google/registry/export/sheet/BUILD
diff --git a/java/google/registry/export/sheet/SheetModule.java b/core/src/main/java/google/registry/export/sheet/SheetModule.java
similarity index 100%
rename from java/google/registry/export/sheet/SheetModule.java
rename to core/src/main/java/google/registry/export/sheet/SheetModule.java
diff --git a/java/google/registry/export/sheet/SheetSynchronizer.java b/core/src/main/java/google/registry/export/sheet/SheetSynchronizer.java
similarity index 100%
rename from java/google/registry/export/sheet/SheetSynchronizer.java
rename to core/src/main/java/google/registry/export/sheet/SheetSynchronizer.java
diff --git a/java/google/registry/export/sheet/SheetsServiceModule.java b/core/src/main/java/google/registry/export/sheet/SheetsServiceModule.java
similarity index 100%
rename from java/google/registry/export/sheet/SheetsServiceModule.java
rename to core/src/main/java/google/registry/export/sheet/SheetsServiceModule.java
diff --git a/java/google/registry/export/sheet/SyncRegistrarsSheet.java b/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheet.java
similarity index 100%
rename from java/google/registry/export/sheet/SyncRegistrarsSheet.java
rename to core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheet.java
diff --git a/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java b/core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java
similarity index 100%
rename from java/google/registry/export/sheet/SyncRegistrarsSheetAction.java
rename to core/src/main/java/google/registry/export/sheet/SyncRegistrarsSheetAction.java
diff --git a/java/google/registry/export/sheet/package-info.java b/core/src/main/java/google/registry/export/sheet/package-info.java
similarity index 100%
rename from java/google/registry/export/sheet/package-info.java
rename to core/src/main/java/google/registry/export/sheet/package-info.java
diff --git a/java/google/registry/flows/BUILD b/core/src/main/java/google/registry/flows/BUILD
similarity index 100%
rename from java/google/registry/flows/BUILD
rename to core/src/main/java/google/registry/flows/BUILD
diff --git a/java/google/registry/flows/CheckApiAction.java b/core/src/main/java/google/registry/flows/CheckApiAction.java
similarity index 100%
rename from java/google/registry/flows/CheckApiAction.java
rename to core/src/main/java/google/registry/flows/CheckApiAction.java
diff --git a/java/google/registry/flows/CheckApiMetrics.java b/core/src/main/java/google/registry/flows/CheckApiMetrics.java
similarity index 100%
rename from java/google/registry/flows/CheckApiMetrics.java
rename to core/src/main/java/google/registry/flows/CheckApiMetrics.java
diff --git a/java/google/registry/flows/EppController.java b/core/src/main/java/google/registry/flows/EppController.java
similarity index 100%
rename from java/google/registry/flows/EppController.java
rename to core/src/main/java/google/registry/flows/EppController.java
diff --git a/java/google/registry/flows/EppException.java b/core/src/main/java/google/registry/flows/EppException.java
similarity index 100%
rename from java/google/registry/flows/EppException.java
rename to core/src/main/java/google/registry/flows/EppException.java
diff --git a/java/google/registry/flows/EppMetrics.java b/core/src/main/java/google/registry/flows/EppMetrics.java
similarity index 100%
rename from java/google/registry/flows/EppMetrics.java
rename to core/src/main/java/google/registry/flows/EppMetrics.java
diff --git a/java/google/registry/flows/EppRequestHandler.java b/core/src/main/java/google/registry/flows/EppRequestHandler.java
similarity index 100%
rename from java/google/registry/flows/EppRequestHandler.java
rename to core/src/main/java/google/registry/flows/EppRequestHandler.java
diff --git a/java/google/registry/flows/EppRequestSource.java b/core/src/main/java/google/registry/flows/EppRequestSource.java
similarity index 100%
rename from java/google/registry/flows/EppRequestSource.java
rename to core/src/main/java/google/registry/flows/EppRequestSource.java
diff --git a/java/google/registry/flows/EppTlsAction.java b/core/src/main/java/google/registry/flows/EppTlsAction.java
similarity index 100%
rename from java/google/registry/flows/EppTlsAction.java
rename to core/src/main/java/google/registry/flows/EppTlsAction.java
diff --git a/java/google/registry/flows/EppToolAction.java b/core/src/main/java/google/registry/flows/EppToolAction.java
similarity index 100%
rename from java/google/registry/flows/EppToolAction.java
rename to core/src/main/java/google/registry/flows/EppToolAction.java
diff --git a/java/google/registry/flows/EppXmlSanitizer.java b/core/src/main/java/google/registry/flows/EppXmlSanitizer.java
similarity index 100%
rename from java/google/registry/flows/EppXmlSanitizer.java
rename to core/src/main/java/google/registry/flows/EppXmlSanitizer.java
diff --git a/java/google/registry/flows/ExtensionManager.java b/core/src/main/java/google/registry/flows/ExtensionManager.java
similarity index 100%
rename from java/google/registry/flows/ExtensionManager.java
rename to core/src/main/java/google/registry/flows/ExtensionManager.java
diff --git a/java/google/registry/flows/Flow.java b/core/src/main/java/google/registry/flows/Flow.java
similarity index 100%
rename from java/google/registry/flows/Flow.java
rename to core/src/main/java/google/registry/flows/Flow.java
diff --git a/java/google/registry/flows/FlowComponent.java b/core/src/main/java/google/registry/flows/FlowComponent.java
similarity index 100%
rename from java/google/registry/flows/FlowComponent.java
rename to core/src/main/java/google/registry/flows/FlowComponent.java
diff --git a/java/google/registry/flows/FlowMetadata.java b/core/src/main/java/google/registry/flows/FlowMetadata.java
similarity index 100%
rename from java/google/registry/flows/FlowMetadata.java
rename to core/src/main/java/google/registry/flows/FlowMetadata.java
diff --git a/java/google/registry/flows/FlowModule.java b/core/src/main/java/google/registry/flows/FlowModule.java
similarity index 100%
rename from java/google/registry/flows/FlowModule.java
rename to core/src/main/java/google/registry/flows/FlowModule.java
diff --git a/java/google/registry/flows/FlowReporter.java b/core/src/main/java/google/registry/flows/FlowReporter.java
similarity index 100%
rename from java/google/registry/flows/FlowReporter.java
rename to core/src/main/java/google/registry/flows/FlowReporter.java
diff --git a/java/google/registry/flows/FlowRunner.java b/core/src/main/java/google/registry/flows/FlowRunner.java
similarity index 100%
rename from java/google/registry/flows/FlowRunner.java
rename to core/src/main/java/google/registry/flows/FlowRunner.java
diff --git a/java/google/registry/flows/FlowScope.java b/core/src/main/java/google/registry/flows/FlowScope.java
similarity index 100%
rename from java/google/registry/flows/FlowScope.java
rename to core/src/main/java/google/registry/flows/FlowScope.java
diff --git a/java/google/registry/flows/FlowUtils.java b/core/src/main/java/google/registry/flows/FlowUtils.java
similarity index 100%
rename from java/google/registry/flows/FlowUtils.java
rename to core/src/main/java/google/registry/flows/FlowUtils.java
diff --git a/java/google/registry/flows/HttpSessionMetadata.java b/core/src/main/java/google/registry/flows/HttpSessionMetadata.java
similarity index 100%
rename from java/google/registry/flows/HttpSessionMetadata.java
rename to core/src/main/java/google/registry/flows/HttpSessionMetadata.java
diff --git a/java/google/registry/flows/PasswordOnlyTransportCredentials.java b/core/src/main/java/google/registry/flows/PasswordOnlyTransportCredentials.java
similarity index 100%
rename from java/google/registry/flows/PasswordOnlyTransportCredentials.java
rename to core/src/main/java/google/registry/flows/PasswordOnlyTransportCredentials.java
diff --git a/java/google/registry/flows/ResourceFlowUtils.java b/core/src/main/java/google/registry/flows/ResourceFlowUtils.java
similarity index 100%
rename from java/google/registry/flows/ResourceFlowUtils.java
rename to core/src/main/java/google/registry/flows/ResourceFlowUtils.java
diff --git a/java/google/registry/flows/ServerTridProvider.java b/core/src/main/java/google/registry/flows/ServerTridProvider.java
similarity index 100%
rename from java/google/registry/flows/ServerTridProvider.java
rename to core/src/main/java/google/registry/flows/ServerTridProvider.java
diff --git a/java/google/registry/flows/ServerTridProviderImpl.java b/core/src/main/java/google/registry/flows/ServerTridProviderImpl.java
similarity index 100%
rename from java/google/registry/flows/ServerTridProviderImpl.java
rename to core/src/main/java/google/registry/flows/ServerTridProviderImpl.java
diff --git a/java/google/registry/flows/ServerTridProviderModule.java b/core/src/main/java/google/registry/flows/ServerTridProviderModule.java
similarity index 100%
rename from java/google/registry/flows/ServerTridProviderModule.java
rename to core/src/main/java/google/registry/flows/ServerTridProviderModule.java
diff --git a/java/google/registry/flows/SessionMetadata.java b/core/src/main/java/google/registry/flows/SessionMetadata.java
similarity index 100%
rename from java/google/registry/flows/SessionMetadata.java
rename to core/src/main/java/google/registry/flows/SessionMetadata.java
diff --git a/java/google/registry/flows/StatelessRequestSessionMetadata.java b/core/src/main/java/google/registry/flows/StatelessRequestSessionMetadata.java
similarity index 100%
rename from java/google/registry/flows/StatelessRequestSessionMetadata.java
rename to core/src/main/java/google/registry/flows/StatelessRequestSessionMetadata.java
diff --git a/java/google/registry/flows/TlsCredentials.java b/core/src/main/java/google/registry/flows/TlsCredentials.java
similarity index 100%
rename from java/google/registry/flows/TlsCredentials.java
rename to core/src/main/java/google/registry/flows/TlsCredentials.java
diff --git a/java/google/registry/flows/TransactionalFlow.java b/core/src/main/java/google/registry/flows/TransactionalFlow.java
similarity index 100%
rename from java/google/registry/flows/TransactionalFlow.java
rename to core/src/main/java/google/registry/flows/TransactionalFlow.java
diff --git a/java/google/registry/flows/TransportCredentials.java b/core/src/main/java/google/registry/flows/TransportCredentials.java
similarity index 100%
rename from java/google/registry/flows/TransportCredentials.java
rename to core/src/main/java/google/registry/flows/TransportCredentials.java
diff --git a/java/google/registry/flows/annotations/ReportingSpec.java b/core/src/main/java/google/registry/flows/annotations/ReportingSpec.java
similarity index 100%
rename from java/google/registry/flows/annotations/ReportingSpec.java
rename to core/src/main/java/google/registry/flows/annotations/ReportingSpec.java
diff --git a/java/google/registry/flows/contact/ContactCheckFlow.java b/core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactCheckFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactCheckFlow.java
diff --git a/java/google/registry/flows/contact/ContactCreateFlow.java b/core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactCreateFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactCreateFlow.java
diff --git a/java/google/registry/flows/contact/ContactDeleteFlow.java b/core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactDeleteFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactDeleteFlow.java
diff --git a/java/google/registry/flows/contact/ContactFlowUtils.java b/core/src/main/java/google/registry/flows/contact/ContactFlowUtils.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactFlowUtils.java
rename to core/src/main/java/google/registry/flows/contact/ContactFlowUtils.java
diff --git a/java/google/registry/flows/contact/ContactInfoFlow.java b/core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactInfoFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactInfoFlow.java
diff --git a/java/google/registry/flows/contact/ContactTransferApproveFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactTransferApproveFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactTransferApproveFlow.java
diff --git a/java/google/registry/flows/contact/ContactTransferCancelFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactTransferCancelFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactTransferCancelFlow.java
diff --git a/java/google/registry/flows/contact/ContactTransferQueryFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactTransferQueryFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactTransferQueryFlow.java
diff --git a/java/google/registry/flows/contact/ContactTransferRejectFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactTransferRejectFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactTransferRejectFlow.java
diff --git a/java/google/registry/flows/contact/ContactTransferRequestFlow.java b/core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactTransferRequestFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactTransferRequestFlow.java
diff --git a/java/google/registry/flows/contact/ContactUpdateFlow.java b/core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java
similarity index 100%
rename from java/google/registry/flows/contact/ContactUpdateFlow.java
rename to core/src/main/java/google/registry/flows/contact/ContactUpdateFlow.java
diff --git a/java/google/registry/flows/custom/BaseFlowCustomLogic.java b/core/src/main/java/google/registry/flows/custom/BaseFlowCustomLogic.java
similarity index 100%
rename from java/google/registry/flows/custom/BaseFlowCustomLogic.java
rename to core/src/main/java/google/registry/flows/custom/BaseFlowCustomLogic.java
diff --git a/java/google/registry/flows/custom/CustomLogicFactory.java b/core/src/main/java/google/registry/flows/custom/CustomLogicFactory.java
similarity index 100%
rename from java/google/registry/flows/custom/CustomLogicFactory.java
rename to core/src/main/java/google/registry/flows/custom/CustomLogicFactory.java
diff --git a/java/google/registry/flows/custom/CustomLogicFactoryModule.java b/core/src/main/java/google/registry/flows/custom/CustomLogicFactoryModule.java
similarity index 100%
rename from java/google/registry/flows/custom/CustomLogicFactoryModule.java
rename to core/src/main/java/google/registry/flows/custom/CustomLogicFactoryModule.java
diff --git a/java/google/registry/flows/custom/CustomLogicModule.java b/core/src/main/java/google/registry/flows/custom/CustomLogicModule.java
similarity index 100%
rename from java/google/registry/flows/custom/CustomLogicModule.java
rename to core/src/main/java/google/registry/flows/custom/CustomLogicModule.java
diff --git a/java/google/registry/flows/custom/DomainCheckFlowCustomLogic.java b/core/src/main/java/google/registry/flows/custom/DomainCheckFlowCustomLogic.java
similarity index 100%
rename from java/google/registry/flows/custom/DomainCheckFlowCustomLogic.java
rename to core/src/main/java/google/registry/flows/custom/DomainCheckFlowCustomLogic.java
diff --git a/java/google/registry/flows/custom/DomainCreateFlowCustomLogic.java b/core/src/main/java/google/registry/flows/custom/DomainCreateFlowCustomLogic.java
similarity index 100%
rename from java/google/registry/flows/custom/DomainCreateFlowCustomLogic.java
rename to core/src/main/java/google/registry/flows/custom/DomainCreateFlowCustomLogic.java
diff --git a/java/google/registry/flows/custom/DomainDeleteFlowCustomLogic.java b/core/src/main/java/google/registry/flows/custom/DomainDeleteFlowCustomLogic.java
similarity index 100%
rename from java/google/registry/flows/custom/DomainDeleteFlowCustomLogic.java
rename to core/src/main/java/google/registry/flows/custom/DomainDeleteFlowCustomLogic.java
diff --git a/java/google/registry/flows/custom/DomainInfoFlowCustomLogic.java b/core/src/main/java/google/registry/flows/custom/DomainInfoFlowCustomLogic.java
similarity index 100%
rename from java/google/registry/flows/custom/DomainInfoFlowCustomLogic.java
rename to core/src/main/java/google/registry/flows/custom/DomainInfoFlowCustomLogic.java
diff --git a/java/google/registry/flows/custom/DomainPricingCustomLogic.java b/core/src/main/java/google/registry/flows/custom/DomainPricingCustomLogic.java
similarity index 100%
rename from java/google/registry/flows/custom/DomainPricingCustomLogic.java
rename to core/src/main/java/google/registry/flows/custom/DomainPricingCustomLogic.java
diff --git a/java/google/registry/flows/custom/DomainRenewFlowCustomLogic.java b/core/src/main/java/google/registry/flows/custom/DomainRenewFlowCustomLogic.java
similarity index 100%
rename from java/google/registry/flows/custom/DomainRenewFlowCustomLogic.java
rename to core/src/main/java/google/registry/flows/custom/DomainRenewFlowCustomLogic.java
diff --git a/java/google/registry/flows/custom/DomainUpdateFlowCustomLogic.java b/core/src/main/java/google/registry/flows/custom/DomainUpdateFlowCustomLogic.java
similarity index 100%
rename from java/google/registry/flows/custom/DomainUpdateFlowCustomLogic.java
rename to core/src/main/java/google/registry/flows/custom/DomainUpdateFlowCustomLogic.java
diff --git a/java/google/registry/flows/custom/EntityChanges.java b/core/src/main/java/google/registry/flows/custom/EntityChanges.java
similarity index 100%
rename from java/google/registry/flows/custom/EntityChanges.java
rename to core/src/main/java/google/registry/flows/custom/EntityChanges.java
diff --git a/java/google/registry/flows/domain/DomainCheckFlow.java b/core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainCheckFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainCheckFlow.java
diff --git a/java/google/registry/flows/domain/DomainClaimsCheckFlow.java b/core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainClaimsCheckFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainClaimsCheckFlow.java
diff --git a/java/google/registry/flows/domain/DomainCreateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainCreateFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java
diff --git a/java/google/registry/flows/domain/DomainDeleteFlow.java b/core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainDeleteFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainDeleteFlow.java
diff --git a/java/google/registry/flows/domain/DomainFlowTmchUtils.java b/core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainFlowTmchUtils.java
rename to core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java
diff --git a/java/google/registry/flows/domain/DomainFlowUtils.java b/core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainFlowUtils.java
rename to core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java
diff --git a/java/google/registry/flows/domain/DomainInfoFlow.java b/core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainInfoFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java
diff --git a/java/google/registry/flows/domain/DomainPricingLogic.java b/core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainPricingLogic.java
rename to core/src/main/java/google/registry/flows/domain/DomainPricingLogic.java
diff --git a/java/google/registry/flows/domain/DomainRenewFlow.java b/core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainRenewFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainRenewFlow.java
diff --git a/java/google/registry/flows/domain/DomainRestoreRequestFlow.java b/core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainRestoreRequestFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainRestoreRequestFlow.java
diff --git a/java/google/registry/flows/domain/DomainTransferApproveFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainTransferApproveFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainTransferApproveFlow.java
diff --git a/java/google/registry/flows/domain/DomainTransferCancelFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainTransferCancelFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainTransferCancelFlow.java
diff --git a/java/google/registry/flows/domain/DomainTransferQueryFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferQueryFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainTransferQueryFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainTransferQueryFlow.java
diff --git a/java/google/registry/flows/domain/DomainTransferRejectFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainTransferRejectFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainTransferRejectFlow.java
diff --git a/java/google/registry/flows/domain/DomainTransferRequestFlow.java b/core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainTransferRequestFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainTransferRequestFlow.java
diff --git a/java/google/registry/flows/domain/DomainTransferUtils.java b/core/src/main/java/google/registry/flows/domain/DomainTransferUtils.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainTransferUtils.java
rename to core/src/main/java/google/registry/flows/domain/DomainTransferUtils.java
diff --git a/java/google/registry/flows/domain/DomainUpdateFlow.java b/core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java
similarity index 100%
rename from java/google/registry/flows/domain/DomainUpdateFlow.java
rename to core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java
diff --git a/java/google/registry/flows/domain/FeesAndCredits.java b/core/src/main/java/google/registry/flows/domain/FeesAndCredits.java
similarity index 100%
rename from java/google/registry/flows/domain/FeesAndCredits.java
rename to core/src/main/java/google/registry/flows/domain/FeesAndCredits.java
diff --git a/java/google/registry/flows/domain/token/AllocationTokenCustomLogic.java b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenCustomLogic.java
similarity index 100%
rename from java/google/registry/flows/domain/token/AllocationTokenCustomLogic.java
rename to core/src/main/java/google/registry/flows/domain/token/AllocationTokenCustomLogic.java
diff --git a/java/google/registry/flows/domain/token/AllocationTokenDomainCheckResults.java b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenDomainCheckResults.java
similarity index 100%
rename from java/google/registry/flows/domain/token/AllocationTokenDomainCheckResults.java
rename to core/src/main/java/google/registry/flows/domain/token/AllocationTokenDomainCheckResults.java
diff --git a/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java
similarity index 100%
rename from java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java
rename to core/src/main/java/google/registry/flows/domain/token/AllocationTokenFlowUtils.java
diff --git a/java/google/registry/flows/domain/token/AllocationTokenModule.java b/core/src/main/java/google/registry/flows/domain/token/AllocationTokenModule.java
similarity index 100%
rename from java/google/registry/flows/domain/token/AllocationTokenModule.java
rename to core/src/main/java/google/registry/flows/domain/token/AllocationTokenModule.java
diff --git a/java/google/registry/flows/exceptions/AlreadyPendingTransferException.java b/core/src/main/java/google/registry/flows/exceptions/AlreadyPendingTransferException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/AlreadyPendingTransferException.java
rename to core/src/main/java/google/registry/flows/exceptions/AlreadyPendingTransferException.java
diff --git a/java/google/registry/flows/exceptions/InvalidTransferPeriodValueException.java b/core/src/main/java/google/registry/flows/exceptions/InvalidTransferPeriodValueException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/InvalidTransferPeriodValueException.java
rename to core/src/main/java/google/registry/flows/exceptions/InvalidTransferPeriodValueException.java
diff --git a/java/google/registry/flows/exceptions/MissingTransferRequestAuthInfoException.java b/core/src/main/java/google/registry/flows/exceptions/MissingTransferRequestAuthInfoException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/MissingTransferRequestAuthInfoException.java
rename to core/src/main/java/google/registry/flows/exceptions/MissingTransferRequestAuthInfoException.java
diff --git a/java/google/registry/flows/exceptions/NoTransferHistoryToQueryException.java b/core/src/main/java/google/registry/flows/exceptions/NoTransferHistoryToQueryException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/NoTransferHistoryToQueryException.java
rename to core/src/main/java/google/registry/flows/exceptions/NoTransferHistoryToQueryException.java
diff --git a/java/google/registry/flows/exceptions/NotAuthorizedToViewTransferException.java b/core/src/main/java/google/registry/flows/exceptions/NotAuthorizedToViewTransferException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/NotAuthorizedToViewTransferException.java
rename to core/src/main/java/google/registry/flows/exceptions/NotAuthorizedToViewTransferException.java
diff --git a/java/google/registry/flows/exceptions/NotPendingTransferException.java b/core/src/main/java/google/registry/flows/exceptions/NotPendingTransferException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/NotPendingTransferException.java
rename to core/src/main/java/google/registry/flows/exceptions/NotPendingTransferException.java
diff --git a/java/google/registry/flows/exceptions/NotTransferInitiatorException.java b/core/src/main/java/google/registry/flows/exceptions/NotTransferInitiatorException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/NotTransferInitiatorException.java
rename to core/src/main/java/google/registry/flows/exceptions/NotTransferInitiatorException.java
diff --git a/java/google/registry/flows/exceptions/ObjectAlreadySponsoredException.java b/core/src/main/java/google/registry/flows/exceptions/ObjectAlreadySponsoredException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/ObjectAlreadySponsoredException.java
rename to core/src/main/java/google/registry/flows/exceptions/ObjectAlreadySponsoredException.java
diff --git a/java/google/registry/flows/exceptions/OnlyToolCanPassMetadataException.java b/core/src/main/java/google/registry/flows/exceptions/OnlyToolCanPassMetadataException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/OnlyToolCanPassMetadataException.java
rename to core/src/main/java/google/registry/flows/exceptions/OnlyToolCanPassMetadataException.java
diff --git a/java/google/registry/flows/exceptions/ResourceAlreadyExistsForThisClientException.java b/core/src/main/java/google/registry/flows/exceptions/ResourceAlreadyExistsForThisClientException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/ResourceAlreadyExistsForThisClientException.java
rename to core/src/main/java/google/registry/flows/exceptions/ResourceAlreadyExistsForThisClientException.java
diff --git a/java/google/registry/flows/exceptions/ResourceCreateContentionException.java b/core/src/main/java/google/registry/flows/exceptions/ResourceCreateContentionException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/ResourceCreateContentionException.java
rename to core/src/main/java/google/registry/flows/exceptions/ResourceCreateContentionException.java
diff --git a/java/google/registry/flows/exceptions/ResourceHasClientUpdateProhibitedException.java b/core/src/main/java/google/registry/flows/exceptions/ResourceHasClientUpdateProhibitedException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/ResourceHasClientUpdateProhibitedException.java
rename to core/src/main/java/google/registry/flows/exceptions/ResourceHasClientUpdateProhibitedException.java
diff --git a/java/google/registry/flows/exceptions/ResourceStatusProhibitsOperationException.java b/core/src/main/java/google/registry/flows/exceptions/ResourceStatusProhibitsOperationException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/ResourceStatusProhibitsOperationException.java
rename to core/src/main/java/google/registry/flows/exceptions/ResourceStatusProhibitsOperationException.java
diff --git a/java/google/registry/flows/exceptions/ResourceToDeleteIsReferencedException.java b/core/src/main/java/google/registry/flows/exceptions/ResourceToDeleteIsReferencedException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/ResourceToDeleteIsReferencedException.java
rename to core/src/main/java/google/registry/flows/exceptions/ResourceToDeleteIsReferencedException.java
diff --git a/java/google/registry/flows/exceptions/TooManyResourceChecksException.java b/core/src/main/java/google/registry/flows/exceptions/TooManyResourceChecksException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/TooManyResourceChecksException.java
rename to core/src/main/java/google/registry/flows/exceptions/TooManyResourceChecksException.java
diff --git a/java/google/registry/flows/exceptions/TransferPeriodMustBeOneYearException.java b/core/src/main/java/google/registry/flows/exceptions/TransferPeriodMustBeOneYearException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/TransferPeriodMustBeOneYearException.java
rename to core/src/main/java/google/registry/flows/exceptions/TransferPeriodMustBeOneYearException.java
diff --git a/java/google/registry/flows/exceptions/TransferPeriodZeroAndFeeTransferExtensionException.java b/core/src/main/java/google/registry/flows/exceptions/TransferPeriodZeroAndFeeTransferExtensionException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/TransferPeriodZeroAndFeeTransferExtensionException.java
rename to core/src/main/java/google/registry/flows/exceptions/TransferPeriodZeroAndFeeTransferExtensionException.java
diff --git a/java/google/registry/flows/exceptions/UnauthorizedForSuperuserExtensionException.java b/core/src/main/java/google/registry/flows/exceptions/UnauthorizedForSuperuserExtensionException.java
similarity index 100%
rename from java/google/registry/flows/exceptions/UnauthorizedForSuperuserExtensionException.java
rename to core/src/main/java/google/registry/flows/exceptions/UnauthorizedForSuperuserExtensionException.java
diff --git a/java/google/registry/flows/host/HostCheckFlow.java b/core/src/main/java/google/registry/flows/host/HostCheckFlow.java
similarity index 100%
rename from java/google/registry/flows/host/HostCheckFlow.java
rename to core/src/main/java/google/registry/flows/host/HostCheckFlow.java
diff --git a/java/google/registry/flows/host/HostCreateFlow.java b/core/src/main/java/google/registry/flows/host/HostCreateFlow.java
similarity index 100%
rename from java/google/registry/flows/host/HostCreateFlow.java
rename to core/src/main/java/google/registry/flows/host/HostCreateFlow.java
diff --git a/java/google/registry/flows/host/HostDeleteFlow.java b/core/src/main/java/google/registry/flows/host/HostDeleteFlow.java
similarity index 100%
rename from java/google/registry/flows/host/HostDeleteFlow.java
rename to core/src/main/java/google/registry/flows/host/HostDeleteFlow.java
diff --git a/java/google/registry/flows/host/HostFlowUtils.java b/core/src/main/java/google/registry/flows/host/HostFlowUtils.java
similarity index 100%
rename from java/google/registry/flows/host/HostFlowUtils.java
rename to core/src/main/java/google/registry/flows/host/HostFlowUtils.java
diff --git a/java/google/registry/flows/host/HostInfoFlow.java b/core/src/main/java/google/registry/flows/host/HostInfoFlow.java
similarity index 100%
rename from java/google/registry/flows/host/HostInfoFlow.java
rename to core/src/main/java/google/registry/flows/host/HostInfoFlow.java
diff --git a/java/google/registry/flows/host/HostUpdateFlow.java b/core/src/main/java/google/registry/flows/host/HostUpdateFlow.java
similarity index 100%
rename from java/google/registry/flows/host/HostUpdateFlow.java
rename to core/src/main/java/google/registry/flows/host/HostUpdateFlow.java
diff --git a/java/google/registry/flows/picker/FlowPicker.java b/core/src/main/java/google/registry/flows/picker/FlowPicker.java
similarity index 100%
rename from java/google/registry/flows/picker/FlowPicker.java
rename to core/src/main/java/google/registry/flows/picker/FlowPicker.java
diff --git a/java/google/registry/flows/poll/PollAckFlow.java b/core/src/main/java/google/registry/flows/poll/PollAckFlow.java
similarity index 100%
rename from java/google/registry/flows/poll/PollAckFlow.java
rename to core/src/main/java/google/registry/flows/poll/PollAckFlow.java
diff --git a/java/google/registry/flows/poll/PollFlowUtils.java b/core/src/main/java/google/registry/flows/poll/PollFlowUtils.java
similarity index 100%
rename from java/google/registry/flows/poll/PollFlowUtils.java
rename to core/src/main/java/google/registry/flows/poll/PollFlowUtils.java
diff --git a/java/google/registry/flows/poll/PollRequestFlow.java b/core/src/main/java/google/registry/flows/poll/PollRequestFlow.java
similarity index 100%
rename from java/google/registry/flows/poll/PollRequestFlow.java
rename to core/src/main/java/google/registry/flows/poll/PollRequestFlow.java
diff --git a/java/google/registry/flows/session/HelloFlow.java b/core/src/main/java/google/registry/flows/session/HelloFlow.java
similarity index 100%
rename from java/google/registry/flows/session/HelloFlow.java
rename to core/src/main/java/google/registry/flows/session/HelloFlow.java
diff --git a/java/google/registry/flows/session/LoginFlow.java b/core/src/main/java/google/registry/flows/session/LoginFlow.java
similarity index 100%
rename from java/google/registry/flows/session/LoginFlow.java
rename to core/src/main/java/google/registry/flows/session/LoginFlow.java
diff --git a/java/google/registry/flows/session/LogoutFlow.java b/core/src/main/java/google/registry/flows/session/LogoutFlow.java
similarity index 100%
rename from java/google/registry/flows/session/LogoutFlow.java
rename to core/src/main/java/google/registry/flows/session/LogoutFlow.java
diff --git a/java/google/registry/gcs/BUILD b/core/src/main/java/google/registry/gcs/BUILD
similarity index 100%
rename from java/google/registry/gcs/BUILD
rename to core/src/main/java/google/registry/gcs/BUILD
diff --git a/java/google/registry/gcs/GcsServiceModule.java b/core/src/main/java/google/registry/gcs/GcsServiceModule.java
similarity index 100%
rename from java/google/registry/gcs/GcsServiceModule.java
rename to core/src/main/java/google/registry/gcs/GcsServiceModule.java
diff --git a/java/google/registry/gcs/GcsUtils.java b/core/src/main/java/google/registry/gcs/GcsUtils.java
similarity index 100%
rename from java/google/registry/gcs/GcsUtils.java
rename to core/src/main/java/google/registry/gcs/GcsUtils.java
diff --git a/java/google/registry/groups/BUILD b/core/src/main/java/google/registry/groups/BUILD
similarity index 100%
rename from java/google/registry/groups/BUILD
rename to core/src/main/java/google/registry/groups/BUILD
diff --git a/java/google/registry/groups/DirectoryGroupsConnection.java b/core/src/main/java/google/registry/groups/DirectoryGroupsConnection.java
similarity index 100%
rename from java/google/registry/groups/DirectoryGroupsConnection.java
rename to core/src/main/java/google/registry/groups/DirectoryGroupsConnection.java
diff --git a/java/google/registry/groups/DirectoryModule.java b/core/src/main/java/google/registry/groups/DirectoryModule.java
similarity index 100%
rename from java/google/registry/groups/DirectoryModule.java
rename to core/src/main/java/google/registry/groups/DirectoryModule.java
diff --git a/java/google/registry/groups/GroupsConnection.java b/core/src/main/java/google/registry/groups/GroupsConnection.java
similarity index 100%
rename from java/google/registry/groups/GroupsConnection.java
rename to core/src/main/java/google/registry/groups/GroupsConnection.java
diff --git a/java/google/registry/groups/GroupsModule.java b/core/src/main/java/google/registry/groups/GroupsModule.java
similarity index 100%
rename from java/google/registry/groups/GroupsModule.java
rename to core/src/main/java/google/registry/groups/GroupsModule.java
diff --git a/java/google/registry/groups/GroupssettingsModule.java b/core/src/main/java/google/registry/groups/GroupssettingsModule.java
similarity index 100%
rename from java/google/registry/groups/GroupssettingsModule.java
rename to core/src/main/java/google/registry/groups/GroupssettingsModule.java
diff --git a/java/google/registry/idn/Arabic-IDN.txt b/core/src/main/java/google/registry/idn/Arabic-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Arabic-IDN.txt
rename to core/src/main/java/google/registry/idn/Arabic-IDN.txt
diff --git a/java/google/registry/idn/Armenian-IDN.txt b/core/src/main/java/google/registry/idn/Armenian-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Armenian-IDN.txt
rename to core/src/main/java/google/registry/idn/Armenian-IDN.txt
diff --git a/java/google/registry/idn/BUILD b/core/src/main/java/google/registry/idn/BUILD
similarity index 100%
rename from java/google/registry/idn/BUILD
rename to core/src/main/java/google/registry/idn/BUILD
diff --git a/java/google/registry/idn/Bengali-IDN.txt b/core/src/main/java/google/registry/idn/Bengali-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Bengali-IDN.txt
rename to core/src/main/java/google/registry/idn/Bengali-IDN.txt
diff --git a/java/google/registry/idn/Chinese-IDN.txt b/core/src/main/java/google/registry/idn/Chinese-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Chinese-IDN.txt
rename to core/src/main/java/google/registry/idn/Chinese-IDN.txt
diff --git a/java/google/registry/idn/Cyrillic-IDN.txt b/core/src/main/java/google/registry/idn/Cyrillic-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Cyrillic-IDN.txt
rename to core/src/main/java/google/registry/idn/Cyrillic-IDN.txt
diff --git a/java/google/registry/idn/Devanagari-IDN.txt b/core/src/main/java/google/registry/idn/Devanagari-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Devanagari-IDN.txt
rename to core/src/main/java/google/registry/idn/Devanagari-IDN.txt
diff --git a/java/google/registry/idn/Ethiopic-IDN.txt b/core/src/main/java/google/registry/idn/Ethiopic-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Ethiopic-IDN.txt
rename to core/src/main/java/google/registry/idn/Ethiopic-IDN.txt
diff --git a/java/google/registry/idn/Georgian-IDN.txt b/core/src/main/java/google/registry/idn/Georgian-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Georgian-IDN.txt
rename to core/src/main/java/google/registry/idn/Georgian-IDN.txt
diff --git a/java/google/registry/idn/Greek-IDN.txt b/core/src/main/java/google/registry/idn/Greek-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Greek-IDN.txt
rename to core/src/main/java/google/registry/idn/Greek-IDN.txt
diff --git a/java/google/registry/idn/Gurmukhi-IDN.txt b/core/src/main/java/google/registry/idn/Gurmukhi-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Gurmukhi-IDN.txt
rename to core/src/main/java/google/registry/idn/Gurmukhi-IDN.txt
diff --git a/java/google/registry/idn/Hebrew-IDN.txt b/core/src/main/java/google/registry/idn/Hebrew-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Hebrew-IDN.txt
rename to core/src/main/java/google/registry/idn/Hebrew-IDN.txt
diff --git a/java/google/registry/idn/Japanese-IDN.txt b/core/src/main/java/google/registry/idn/Japanese-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Japanese-IDN.txt
rename to core/src/main/java/google/registry/idn/Japanese-IDN.txt
diff --git a/java/google/registry/idn/Kannada-IDN.txt b/core/src/main/java/google/registry/idn/Kannada-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Kannada-IDN.txt
rename to core/src/main/java/google/registry/idn/Kannada-IDN.txt
diff --git a/java/google/registry/idn/Khmer-IDN.txt b/core/src/main/java/google/registry/idn/Khmer-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Khmer-IDN.txt
rename to core/src/main/java/google/registry/idn/Khmer-IDN.txt
diff --git a/java/google/registry/idn/Korean-IDN.txt b/core/src/main/java/google/registry/idn/Korean-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Korean-IDN.txt
rename to core/src/main/java/google/registry/idn/Korean-IDN.txt
diff --git a/java/google/registry/idn/Latin-IDN.txt b/core/src/main/java/google/registry/idn/Latin-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Latin-IDN.txt
rename to core/src/main/java/google/registry/idn/Latin-IDN.txt
diff --git a/java/google/registry/idn/Malayalam-IDN.txt b/core/src/main/java/google/registry/idn/Malayalam-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Malayalam-IDN.txt
rename to core/src/main/java/google/registry/idn/Malayalam-IDN.txt
diff --git a/java/google/registry/idn/Myanmar-IDN.txt b/core/src/main/java/google/registry/idn/Myanmar-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Myanmar-IDN.txt
rename to core/src/main/java/google/registry/idn/Myanmar-IDN.txt
diff --git a/java/google/registry/idn/Oriya-IDN.txt b/core/src/main/java/google/registry/idn/Oriya-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Oriya-IDN.txt
rename to core/src/main/java/google/registry/idn/Oriya-IDN.txt
diff --git a/java/google/registry/idn/Sinhala-IDN.txt b/core/src/main/java/google/registry/idn/Sinhala-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Sinhala-IDN.txt
rename to core/src/main/java/google/registry/idn/Sinhala-IDN.txt
diff --git a/java/google/registry/idn/Tamil-IDN.txt b/core/src/main/java/google/registry/idn/Tamil-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Tamil-IDN.txt
rename to core/src/main/java/google/registry/idn/Tamil-IDN.txt
diff --git a/java/google/registry/idn/Telugu-IDN.txt b/core/src/main/java/google/registry/idn/Telugu-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Telugu-IDN.txt
rename to core/src/main/java/google/registry/idn/Telugu-IDN.txt
diff --git a/java/google/registry/idn/Thai-IDN.txt b/core/src/main/java/google/registry/idn/Thai-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Thai-IDN.txt
rename to core/src/main/java/google/registry/idn/Thai-IDN.txt
diff --git a/java/google/registry/idn/Tibetan-IDN.txt b/core/src/main/java/google/registry/idn/Tibetan-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Tibetan-IDN.txt
rename to core/src/main/java/google/registry/idn/Tibetan-IDN.txt
diff --git a/java/google/registry/idn/Traditional-Chinese-IDN.txt b/core/src/main/java/google/registry/idn/Traditional-Chinese-IDN.txt
similarity index 100%
rename from java/google/registry/idn/Traditional-Chinese-IDN.txt
rename to core/src/main/java/google/registry/idn/Traditional-Chinese-IDN.txt
diff --git a/java/google/registry/keyring/BUILD b/core/src/main/java/google/registry/keyring/BUILD
similarity index 100%
rename from java/google/registry/keyring/BUILD
rename to core/src/main/java/google/registry/keyring/BUILD
diff --git a/java/google/registry/keyring/KeyringModule.java b/core/src/main/java/google/registry/keyring/KeyringModule.java
similarity index 100%
rename from java/google/registry/keyring/KeyringModule.java
rename to core/src/main/java/google/registry/keyring/KeyringModule.java
diff --git a/java/google/registry/keyring/api/BUILD b/core/src/main/java/google/registry/keyring/api/BUILD
similarity index 100%
rename from java/google/registry/keyring/api/BUILD
rename to core/src/main/java/google/registry/keyring/api/BUILD
diff --git a/java/google/registry/keyring/api/ComparatorKeyring.java b/core/src/main/java/google/registry/keyring/api/ComparatorKeyring.java
similarity index 100%
rename from java/google/registry/keyring/api/ComparatorKeyring.java
rename to core/src/main/java/google/registry/keyring/api/ComparatorKeyring.java
diff --git a/java/google/registry/keyring/api/DummyKeyringModule.java b/core/src/main/java/google/registry/keyring/api/DummyKeyringModule.java
similarity index 100%
rename from java/google/registry/keyring/api/DummyKeyringModule.java
rename to core/src/main/java/google/registry/keyring/api/DummyKeyringModule.java
diff --git a/java/google/registry/keyring/api/InMemoryKeyring.java b/core/src/main/java/google/registry/keyring/api/InMemoryKeyring.java
similarity index 100%
rename from java/google/registry/keyring/api/InMemoryKeyring.java
rename to core/src/main/java/google/registry/keyring/api/InMemoryKeyring.java
diff --git a/java/google/registry/keyring/api/KeyModule.java b/core/src/main/java/google/registry/keyring/api/KeyModule.java
similarity index 100%
rename from java/google/registry/keyring/api/KeyModule.java
rename to core/src/main/java/google/registry/keyring/api/KeyModule.java
diff --git a/java/google/registry/keyring/api/KeySerializer.java b/core/src/main/java/google/registry/keyring/api/KeySerializer.java
similarity index 100%
rename from java/google/registry/keyring/api/KeySerializer.java
rename to core/src/main/java/google/registry/keyring/api/KeySerializer.java
diff --git a/java/google/registry/keyring/api/Keyring.java b/core/src/main/java/google/registry/keyring/api/Keyring.java
similarity index 100%
rename from java/google/registry/keyring/api/Keyring.java
rename to core/src/main/java/google/registry/keyring/api/Keyring.java
diff --git a/java/google/registry/keyring/api/KeyringException.java b/core/src/main/java/google/registry/keyring/api/KeyringException.java
similarity index 100%
rename from java/google/registry/keyring/api/KeyringException.java
rename to core/src/main/java/google/registry/keyring/api/KeyringException.java
diff --git a/java/google/registry/keyring/api/PgpHelper.java b/core/src/main/java/google/registry/keyring/api/PgpHelper.java
similarity index 100%
rename from java/google/registry/keyring/api/PgpHelper.java
rename to core/src/main/java/google/registry/keyring/api/PgpHelper.java
diff --git a/java/google/registry/keyring/api/package-info.java b/core/src/main/java/google/registry/keyring/api/package-info.java
similarity index 100%
rename from java/google/registry/keyring/api/package-info.java
rename to core/src/main/java/google/registry/keyring/api/package-info.java
diff --git a/java/google/registry/keyring/api/pgp-private-keyring.asc b/core/src/main/java/google/registry/keyring/api/pgp-private-keyring.asc
similarity index 100%
rename from java/google/registry/keyring/api/pgp-private-keyring.asc
rename to core/src/main/java/google/registry/keyring/api/pgp-private-keyring.asc
diff --git a/java/google/registry/keyring/api/pgp-public-keyring.asc b/core/src/main/java/google/registry/keyring/api/pgp-public-keyring.asc
similarity index 100%
rename from java/google/registry/keyring/api/pgp-public-keyring.asc
rename to core/src/main/java/google/registry/keyring/api/pgp-public-keyring.asc
diff --git a/java/google/registry/keyring/kms/BUILD b/core/src/main/java/google/registry/keyring/kms/BUILD
similarity index 100%
rename from java/google/registry/keyring/kms/BUILD
rename to core/src/main/java/google/registry/keyring/kms/BUILD
diff --git a/java/google/registry/keyring/kms/EncryptResponse.java b/core/src/main/java/google/registry/keyring/kms/EncryptResponse.java
similarity index 100%
rename from java/google/registry/keyring/kms/EncryptResponse.java
rename to core/src/main/java/google/registry/keyring/kms/EncryptResponse.java
diff --git a/java/google/registry/keyring/kms/KmsConnection.java b/core/src/main/java/google/registry/keyring/kms/KmsConnection.java
similarity index 100%
rename from java/google/registry/keyring/kms/KmsConnection.java
rename to core/src/main/java/google/registry/keyring/kms/KmsConnection.java
diff --git a/java/google/registry/keyring/kms/KmsConnectionImpl.java b/core/src/main/java/google/registry/keyring/kms/KmsConnectionImpl.java
similarity index 100%
rename from java/google/registry/keyring/kms/KmsConnectionImpl.java
rename to core/src/main/java/google/registry/keyring/kms/KmsConnectionImpl.java
diff --git a/java/google/registry/keyring/kms/KmsKeyring.java b/core/src/main/java/google/registry/keyring/kms/KmsKeyring.java
similarity index 100%
rename from java/google/registry/keyring/kms/KmsKeyring.java
rename to core/src/main/java/google/registry/keyring/kms/KmsKeyring.java
diff --git a/java/google/registry/keyring/kms/KmsModule.java b/core/src/main/java/google/registry/keyring/kms/KmsModule.java
similarity index 100%
rename from java/google/registry/keyring/kms/KmsModule.java
rename to core/src/main/java/google/registry/keyring/kms/KmsModule.java
diff --git a/java/google/registry/keyring/kms/KmsUpdater.java b/core/src/main/java/google/registry/keyring/kms/KmsUpdater.java
similarity index 100%
rename from java/google/registry/keyring/kms/KmsUpdater.java
rename to core/src/main/java/google/registry/keyring/kms/KmsUpdater.java
diff --git a/java/google/registry/loadtest/BUILD b/core/src/main/java/google/registry/loadtest/BUILD
similarity index 100%
rename from java/google/registry/loadtest/BUILD
rename to core/src/main/java/google/registry/loadtest/BUILD
diff --git a/java/google/registry/loadtest/LoadTestAction.java b/core/src/main/java/google/registry/loadtest/LoadTestAction.java
similarity index 100%
rename from java/google/registry/loadtest/LoadTestAction.java
rename to core/src/main/java/google/registry/loadtest/LoadTestAction.java
diff --git a/java/google/registry/loadtest/LoadTestModule.java b/core/src/main/java/google/registry/loadtest/LoadTestModule.java
similarity index 100%
rename from java/google/registry/loadtest/LoadTestModule.java
rename to core/src/main/java/google/registry/loadtest/LoadTestModule.java
diff --git a/java/google/registry/loadtest/templates/contact_create.xml b/core/src/main/java/google/registry/loadtest/templates/contact_create.xml
similarity index 100%
rename from java/google/registry/loadtest/templates/contact_create.xml
rename to core/src/main/java/google/registry/loadtest/templates/contact_create.xml
diff --git a/java/google/registry/loadtest/templates/contact_info.xml b/core/src/main/java/google/registry/loadtest/templates/contact_info.xml
similarity index 100%
rename from java/google/registry/loadtest/templates/contact_info.xml
rename to core/src/main/java/google/registry/loadtest/templates/contact_info.xml
diff --git a/java/google/registry/loadtest/templates/domain_check.xml b/core/src/main/java/google/registry/loadtest/templates/domain_check.xml
similarity index 100%
rename from java/google/registry/loadtest/templates/domain_check.xml
rename to core/src/main/java/google/registry/loadtest/templates/domain_check.xml
diff --git a/java/google/registry/loadtest/templates/domain_create.xml b/core/src/main/java/google/registry/loadtest/templates/domain_create.xml
similarity index 100%
rename from java/google/registry/loadtest/templates/domain_create.xml
rename to core/src/main/java/google/registry/loadtest/templates/domain_create.xml
diff --git a/java/google/registry/loadtest/templates/domain_info.xml b/core/src/main/java/google/registry/loadtest/templates/domain_info.xml
similarity index 100%
rename from java/google/registry/loadtest/templates/domain_info.xml
rename to core/src/main/java/google/registry/loadtest/templates/domain_info.xml
diff --git a/java/google/registry/loadtest/templates/host_create.xml b/core/src/main/java/google/registry/loadtest/templates/host_create.xml
similarity index 100%
rename from java/google/registry/loadtest/templates/host_create.xml
rename to core/src/main/java/google/registry/loadtest/templates/host_create.xml
diff --git a/java/google/registry/loadtest/templates/host_info.xml b/core/src/main/java/google/registry/loadtest/templates/host_info.xml
similarity index 100%
rename from java/google/registry/loadtest/templates/host_info.xml
rename to core/src/main/java/google/registry/loadtest/templates/host_info.xml
diff --git a/java/google/registry/mapreduce/BUILD b/core/src/main/java/google/registry/mapreduce/BUILD
similarity index 100%
rename from java/google/registry/mapreduce/BUILD
rename to core/src/main/java/google/registry/mapreduce/BUILD
diff --git a/java/google/registry/mapreduce/MapreduceModule.java b/core/src/main/java/google/registry/mapreduce/MapreduceModule.java
similarity index 100%
rename from java/google/registry/mapreduce/MapreduceModule.java
rename to core/src/main/java/google/registry/mapreduce/MapreduceModule.java
diff --git a/java/google/registry/mapreduce/MapreduceRunner.java b/core/src/main/java/google/registry/mapreduce/MapreduceRunner.java
similarity index 100%
rename from java/google/registry/mapreduce/MapreduceRunner.java
rename to core/src/main/java/google/registry/mapreduce/MapreduceRunner.java
diff --git a/java/google/registry/mapreduce/UnlockerOutput.java b/core/src/main/java/google/registry/mapreduce/UnlockerOutput.java
similarity index 100%
rename from java/google/registry/mapreduce/UnlockerOutput.java
rename to core/src/main/java/google/registry/mapreduce/UnlockerOutput.java
diff --git a/java/google/registry/mapreduce/inputs/BUILD b/core/src/main/java/google/registry/mapreduce/inputs/BUILD
similarity index 100%
rename from java/google/registry/mapreduce/inputs/BUILD
rename to core/src/main/java/google/registry/mapreduce/inputs/BUILD
diff --git a/java/google/registry/mapreduce/inputs/ChildEntityInput.java b/core/src/main/java/google/registry/mapreduce/inputs/ChildEntityInput.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/ChildEntityInput.java
rename to core/src/main/java/google/registry/mapreduce/inputs/ChildEntityInput.java
diff --git a/java/google/registry/mapreduce/inputs/ChildEntityReader.java b/core/src/main/java/google/registry/mapreduce/inputs/ChildEntityReader.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/ChildEntityReader.java
rename to core/src/main/java/google/registry/mapreduce/inputs/ChildEntityReader.java
diff --git a/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java b/core/src/main/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/ChunkingKeyInput.java
rename to core/src/main/java/google/registry/mapreduce/inputs/ChunkingKeyInput.java
diff --git a/java/google/registry/mapreduce/inputs/CommitLogManifestInput.java b/core/src/main/java/google/registry/mapreduce/inputs/CommitLogManifestInput.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/CommitLogManifestInput.java
rename to core/src/main/java/google/registry/mapreduce/inputs/CommitLogManifestInput.java
diff --git a/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java b/core/src/main/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/CommitLogManifestReader.java
rename to core/src/main/java/google/registry/mapreduce/inputs/CommitLogManifestReader.java
diff --git a/java/google/registry/mapreduce/inputs/ConcatenatingInput.java b/core/src/main/java/google/registry/mapreduce/inputs/ConcatenatingInput.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/ConcatenatingInput.java
rename to core/src/main/java/google/registry/mapreduce/inputs/ConcatenatingInput.java
diff --git a/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java b/core/src/main/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/EppResourceBaseInput.java
rename to core/src/main/java/google/registry/mapreduce/inputs/EppResourceBaseInput.java
diff --git a/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java b/core/src/main/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/EppResourceBaseReader.java
rename to core/src/main/java/google/registry/mapreduce/inputs/EppResourceBaseReader.java
diff --git a/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java b/core/src/main/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/EppResourceEntityInput.java
rename to core/src/main/java/google/registry/mapreduce/inputs/EppResourceEntityInput.java
diff --git a/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java b/core/src/main/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/EppResourceEntityReader.java
rename to core/src/main/java/google/registry/mapreduce/inputs/EppResourceEntityReader.java
diff --git a/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java b/core/src/main/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/EppResourceIndexInput.java
rename to core/src/main/java/google/registry/mapreduce/inputs/EppResourceIndexInput.java
diff --git a/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java b/core/src/main/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/EppResourceIndexReader.java
rename to core/src/main/java/google/registry/mapreduce/inputs/EppResourceIndexReader.java
diff --git a/java/google/registry/mapreduce/inputs/EppResourceInputs.java b/core/src/main/java/google/registry/mapreduce/inputs/EppResourceInputs.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/EppResourceInputs.java
rename to core/src/main/java/google/registry/mapreduce/inputs/EppResourceInputs.java
diff --git a/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java b/core/src/main/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/EppResourceKeyInput.java
rename to core/src/main/java/google/registry/mapreduce/inputs/EppResourceKeyInput.java
diff --git a/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java b/core/src/main/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/EppResourceKeyReader.java
rename to core/src/main/java/google/registry/mapreduce/inputs/EppResourceKeyReader.java
diff --git a/java/google/registry/mapreduce/inputs/NullInput.java b/core/src/main/java/google/registry/mapreduce/inputs/NullInput.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/NullInput.java
rename to core/src/main/java/google/registry/mapreduce/inputs/NullInput.java
diff --git a/java/google/registry/mapreduce/inputs/RetryingInputReader.java b/core/src/main/java/google/registry/mapreduce/inputs/RetryingInputReader.java
similarity index 100%
rename from java/google/registry/mapreduce/inputs/RetryingInputReader.java
rename to core/src/main/java/google/registry/mapreduce/inputs/RetryingInputReader.java
diff --git a/java/google/registry/model/BUILD b/core/src/main/java/google/registry/model/BUILD
similarity index 100%
rename from java/google/registry/model/BUILD
rename to core/src/main/java/google/registry/model/BUILD
diff --git a/java/google/registry/model/BackupGroupRoot.java b/core/src/main/java/google/registry/model/BackupGroupRoot.java
similarity index 100%
rename from java/google/registry/model/BackupGroupRoot.java
rename to core/src/main/java/google/registry/model/BackupGroupRoot.java
diff --git a/java/google/registry/model/Buildable.java b/core/src/main/java/google/registry/model/Buildable.java
similarity index 100%
rename from java/google/registry/model/Buildable.java
rename to core/src/main/java/google/registry/model/Buildable.java
diff --git a/java/google/registry/model/CacheUtils.java b/core/src/main/java/google/registry/model/CacheUtils.java
similarity index 100%
rename from java/google/registry/model/CacheUtils.java
rename to core/src/main/java/google/registry/model/CacheUtils.java
diff --git a/java/google/registry/model/CreateAutoTimestamp.java b/core/src/main/java/google/registry/model/CreateAutoTimestamp.java
similarity index 100%
rename from java/google/registry/model/CreateAutoTimestamp.java
rename to core/src/main/java/google/registry/model/CreateAutoTimestamp.java
diff --git a/java/google/registry/model/EntityClasses.java b/core/src/main/java/google/registry/model/EntityClasses.java
similarity index 100%
rename from java/google/registry/model/EntityClasses.java
rename to core/src/main/java/google/registry/model/EntityClasses.java
diff --git a/java/google/registry/model/EppResource.java b/core/src/main/java/google/registry/model/EppResource.java
similarity index 100%
rename from java/google/registry/model/EppResource.java
rename to core/src/main/java/google/registry/model/EppResource.java
diff --git a/java/google/registry/model/EppResourceUtils.java b/core/src/main/java/google/registry/model/EppResourceUtils.java
similarity index 100%
rename from java/google/registry/model/EppResourceUtils.java
rename to core/src/main/java/google/registry/model/EppResourceUtils.java
diff --git a/java/google/registry/model/ImmutableObject.java b/core/src/main/java/google/registry/model/ImmutableObject.java
similarity index 100%
rename from java/google/registry/model/ImmutableObject.java
rename to core/src/main/java/google/registry/model/ImmutableObject.java
diff --git a/java/google/registry/model/JsonMapBuilder.java b/core/src/main/java/google/registry/model/JsonMapBuilder.java
similarity index 100%
rename from java/google/registry/model/JsonMapBuilder.java
rename to core/src/main/java/google/registry/model/JsonMapBuilder.java
diff --git a/java/google/registry/model/Jsonifiable.java b/core/src/main/java/google/registry/model/Jsonifiable.java
similarity index 100%
rename from java/google/registry/model/Jsonifiable.java
rename to core/src/main/java/google/registry/model/Jsonifiable.java
diff --git a/java/google/registry/model/ModelUtils.java b/core/src/main/java/google/registry/model/ModelUtils.java
similarity index 100%
rename from java/google/registry/model/ModelUtils.java
rename to core/src/main/java/google/registry/model/ModelUtils.java
diff --git a/java/google/registry/model/OteAccountBuilder.java b/core/src/main/java/google/registry/model/OteAccountBuilder.java
similarity index 100%
rename from java/google/registry/model/OteAccountBuilder.java
rename to core/src/main/java/google/registry/model/OteAccountBuilder.java
diff --git a/java/google/registry/model/OteStats.java b/core/src/main/java/google/registry/model/OteStats.java
similarity index 100%
rename from java/google/registry/model/OteStats.java
rename to core/src/main/java/google/registry/model/OteStats.java
diff --git a/java/google/registry/model/ResourceTransferUtils.java b/core/src/main/java/google/registry/model/ResourceTransferUtils.java
similarity index 100%
rename from java/google/registry/model/ResourceTransferUtils.java
rename to core/src/main/java/google/registry/model/ResourceTransferUtils.java
diff --git a/java/google/registry/model/SchemaVersion.java b/core/src/main/java/google/registry/model/SchemaVersion.java
similarity index 100%
rename from java/google/registry/model/SchemaVersion.java
rename to core/src/main/java/google/registry/model/SchemaVersion.java
diff --git a/java/google/registry/model/UpdateAutoTimestamp.java b/core/src/main/java/google/registry/model/UpdateAutoTimestamp.java
similarity index 100%
rename from java/google/registry/model/UpdateAutoTimestamp.java
rename to core/src/main/java/google/registry/model/UpdateAutoTimestamp.java
diff --git a/java/google/registry/model/annotations/ExternalMessagingName.java b/core/src/main/java/google/registry/model/annotations/ExternalMessagingName.java
similarity index 100%
rename from java/google/registry/model/annotations/ExternalMessagingName.java
rename to core/src/main/java/google/registry/model/annotations/ExternalMessagingName.java
diff --git a/java/google/registry/model/annotations/NotBackedUp.java b/core/src/main/java/google/registry/model/annotations/NotBackedUp.java
similarity index 100%
rename from java/google/registry/model/annotations/NotBackedUp.java
rename to core/src/main/java/google/registry/model/annotations/NotBackedUp.java
diff --git a/java/google/registry/model/annotations/ReportedOn.java b/core/src/main/java/google/registry/model/annotations/ReportedOn.java
similarity index 100%
rename from java/google/registry/model/annotations/ReportedOn.java
rename to core/src/main/java/google/registry/model/annotations/ReportedOn.java
diff --git a/java/google/registry/model/annotations/VirtualEntity.java b/core/src/main/java/google/registry/model/annotations/VirtualEntity.java
similarity index 100%
rename from java/google/registry/model/annotations/VirtualEntity.java
rename to core/src/main/java/google/registry/model/annotations/VirtualEntity.java
diff --git a/java/google/registry/model/billing/BillingEvent.java b/core/src/main/java/google/registry/model/billing/BillingEvent.java
similarity index 100%
rename from java/google/registry/model/billing/BillingEvent.java
rename to core/src/main/java/google/registry/model/billing/BillingEvent.java
diff --git a/java/google/registry/model/common/CrossTldSingleton.java b/core/src/main/java/google/registry/model/common/CrossTldSingleton.java
similarity index 100%
rename from java/google/registry/model/common/CrossTldSingleton.java
rename to core/src/main/java/google/registry/model/common/CrossTldSingleton.java
diff --git a/java/google/registry/model/common/Cursor.java b/core/src/main/java/google/registry/model/common/Cursor.java
similarity index 100%
rename from java/google/registry/model/common/Cursor.java
rename to core/src/main/java/google/registry/model/common/Cursor.java
diff --git a/java/google/registry/model/common/EntityGroupRoot.java b/core/src/main/java/google/registry/model/common/EntityGroupRoot.java
similarity index 100%
rename from java/google/registry/model/common/EntityGroupRoot.java
rename to core/src/main/java/google/registry/model/common/EntityGroupRoot.java
diff --git a/java/google/registry/model/common/GaeUserIdConverter.java b/core/src/main/java/google/registry/model/common/GaeUserIdConverter.java
similarity index 100%
rename from java/google/registry/model/common/GaeUserIdConverter.java
rename to core/src/main/java/google/registry/model/common/GaeUserIdConverter.java
diff --git a/java/google/registry/model/common/TimeOfYear.java b/core/src/main/java/google/registry/model/common/TimeOfYear.java
similarity index 100%
rename from java/google/registry/model/common/TimeOfYear.java
rename to core/src/main/java/google/registry/model/common/TimeOfYear.java
diff --git a/java/google/registry/model/common/TimedTransitionProperty.java b/core/src/main/java/google/registry/model/common/TimedTransitionProperty.java
similarity index 100%
rename from java/google/registry/model/common/TimedTransitionProperty.java
rename to core/src/main/java/google/registry/model/common/TimedTransitionProperty.java
diff --git a/java/google/registry/model/contact/ContactAddress.java b/core/src/main/java/google/registry/model/contact/ContactAddress.java
similarity index 100%
rename from java/google/registry/model/contact/ContactAddress.java
rename to core/src/main/java/google/registry/model/contact/ContactAddress.java
diff --git a/java/google/registry/model/contact/ContactAuthInfo.java b/core/src/main/java/google/registry/model/contact/ContactAuthInfo.java
similarity index 100%
rename from java/google/registry/model/contact/ContactAuthInfo.java
rename to core/src/main/java/google/registry/model/contact/ContactAuthInfo.java
diff --git a/java/google/registry/model/contact/ContactCommand.java b/core/src/main/java/google/registry/model/contact/ContactCommand.java
similarity index 100%
rename from java/google/registry/model/contact/ContactCommand.java
rename to core/src/main/java/google/registry/model/contact/ContactCommand.java
diff --git a/java/google/registry/model/contact/ContactInfoData.java b/core/src/main/java/google/registry/model/contact/ContactInfoData.java
similarity index 100%
rename from java/google/registry/model/contact/ContactInfoData.java
rename to core/src/main/java/google/registry/model/contact/ContactInfoData.java
diff --git a/java/google/registry/model/contact/ContactPhoneNumber.java b/core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java
similarity index 100%
rename from java/google/registry/model/contact/ContactPhoneNumber.java
rename to core/src/main/java/google/registry/model/contact/ContactPhoneNumber.java
diff --git a/java/google/registry/model/contact/ContactResource.java b/core/src/main/java/google/registry/model/contact/ContactResource.java
similarity index 100%
rename from java/google/registry/model/contact/ContactResource.java
rename to core/src/main/java/google/registry/model/contact/ContactResource.java
diff --git a/java/google/registry/model/contact/Disclose.java b/core/src/main/java/google/registry/model/contact/Disclose.java
similarity index 100%
rename from java/google/registry/model/contact/Disclose.java
rename to core/src/main/java/google/registry/model/contact/Disclose.java
diff --git a/java/google/registry/model/contact/PostalInfo.java b/core/src/main/java/google/registry/model/contact/PostalInfo.java
similarity index 100%
rename from java/google/registry/model/contact/PostalInfo.java
rename to core/src/main/java/google/registry/model/contact/PostalInfo.java
diff --git a/java/google/registry/model/contact/package-info.java b/core/src/main/java/google/registry/model/contact/package-info.java
similarity index 100%
rename from java/google/registry/model/contact/package-info.java
rename to core/src/main/java/google/registry/model/contact/package-info.java
diff --git a/java/google/registry/model/domain/DesignatedContact.java b/core/src/main/java/google/registry/model/domain/DesignatedContact.java
similarity index 100%
rename from java/google/registry/model/domain/DesignatedContact.java
rename to core/src/main/java/google/registry/model/domain/DesignatedContact.java
diff --git a/java/google/registry/model/domain/DomainAuthInfo.java b/core/src/main/java/google/registry/model/domain/DomainAuthInfo.java
similarity index 100%
rename from java/google/registry/model/domain/DomainAuthInfo.java
rename to core/src/main/java/google/registry/model/domain/DomainAuthInfo.java
diff --git a/java/google/registry/model/domain/DomainBase.java b/core/src/main/java/google/registry/model/domain/DomainBase.java
similarity index 100%
rename from java/google/registry/model/domain/DomainBase.java
rename to core/src/main/java/google/registry/model/domain/DomainBase.java
diff --git a/java/google/registry/model/domain/DomainCommand.java b/core/src/main/java/google/registry/model/domain/DomainCommand.java
similarity index 100%
rename from java/google/registry/model/domain/DomainCommand.java
rename to core/src/main/java/google/registry/model/domain/DomainCommand.java
diff --git a/java/google/registry/model/domain/DomainInfoData.java b/core/src/main/java/google/registry/model/domain/DomainInfoData.java
similarity index 100%
rename from java/google/registry/model/domain/DomainInfoData.java
rename to core/src/main/java/google/registry/model/domain/DomainInfoData.java
diff --git a/java/google/registry/model/domain/DomainObjectSpec.java b/core/src/main/java/google/registry/model/domain/DomainObjectSpec.java
similarity index 100%
rename from java/google/registry/model/domain/DomainObjectSpec.java
rename to core/src/main/java/google/registry/model/domain/DomainObjectSpec.java
diff --git a/java/google/registry/model/domain/DomainRenewData.java b/core/src/main/java/google/registry/model/domain/DomainRenewData.java
similarity index 100%
rename from java/google/registry/model/domain/DomainRenewData.java
rename to core/src/main/java/google/registry/model/domain/DomainRenewData.java
diff --git a/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java b/core/src/main/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java
similarity index 100%
rename from java/google/registry/model/domain/ForeignKeyedDesignatedContact.java
rename to core/src/main/java/google/registry/model/domain/ForeignKeyedDesignatedContact.java
diff --git a/java/google/registry/model/domain/GracePeriod.java b/core/src/main/java/google/registry/model/domain/GracePeriod.java
similarity index 100%
rename from java/google/registry/model/domain/GracePeriod.java
rename to core/src/main/java/google/registry/model/domain/GracePeriod.java
diff --git a/java/google/registry/model/domain/Period.java b/core/src/main/java/google/registry/model/domain/Period.java
similarity index 100%
rename from java/google/registry/model/domain/Period.java
rename to core/src/main/java/google/registry/model/domain/Period.java
diff --git a/java/google/registry/model/domain/fee/BaseFee.java b/core/src/main/java/google/registry/model/domain/fee/BaseFee.java
similarity index 100%
rename from java/google/registry/model/domain/fee/BaseFee.java
rename to core/src/main/java/google/registry/model/domain/fee/BaseFee.java
diff --git a/java/google/registry/model/domain/fee/Credit.java b/core/src/main/java/google/registry/model/domain/fee/Credit.java
similarity index 100%
rename from java/google/registry/model/domain/fee/Credit.java
rename to core/src/main/java/google/registry/model/domain/fee/Credit.java
diff --git a/java/google/registry/model/domain/fee/Fee.java b/core/src/main/java/google/registry/model/domain/fee/Fee.java
similarity index 100%
rename from java/google/registry/model/domain/fee/Fee.java
rename to core/src/main/java/google/registry/model/domain/fee/Fee.java
diff --git a/java/google/registry/model/domain/fee/FeeCheckCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeCheckCommandExtension.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeCheckCommandExtension.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeCheckCommandExtension.java
diff --git a/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java b/core/src/main/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeCheckCommandExtensionItem.java
diff --git a/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeCheckResponseExtension.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeCheckResponseExtension.java
diff --git a/java/google/registry/model/domain/fee/FeeCheckResponseExtensionItem.java b/core/src/main/java/google/registry/model/domain/fee/FeeCheckResponseExtensionItem.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeCheckResponseExtensionItem.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeCheckResponseExtensionItem.java
diff --git a/java/google/registry/model/domain/fee/FeeCreateCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeCreateCommandExtension.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeCreateCommandExtension.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeCreateCommandExtension.java
diff --git a/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java b/core/src/main/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeExtensionCommandDescriptor.java
diff --git a/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItem.java b/core/src/main/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItem.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeQueryCommandExtensionItem.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeQueryCommandExtensionItem.java
diff --git a/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java b/core/src/main/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeQueryResponseExtensionItem.java
diff --git a/java/google/registry/model/domain/fee/FeeRenewCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeRenewCommandExtension.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeRenewCommandExtension.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeRenewCommandExtension.java
diff --git a/java/google/registry/model/domain/fee/FeeTransferCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeTransferCommandExtension.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeTransferCommandExtension.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeTransferCommandExtension.java
diff --git a/java/google/registry/model/domain/fee/FeeTransformCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeTransformCommandExtension.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeTransformCommandExtension.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeTransformCommandExtension.java
diff --git a/java/google/registry/model/domain/fee/FeeTransformResponseExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeTransformResponseExtension.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeTransformResponseExtension.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeTransformResponseExtension.java
diff --git a/java/google/registry/model/domain/fee/FeeUpdateCommandExtension.java b/core/src/main/java/google/registry/model/domain/fee/FeeUpdateCommandExtension.java
similarity index 100%
rename from java/google/registry/model/domain/fee/FeeUpdateCommandExtension.java
rename to core/src/main/java/google/registry/model/domain/fee/FeeUpdateCommandExtension.java
diff --git a/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionItemV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionItemV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeCheckCommandExtensionItemV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionItemV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeCheckCommandExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeCheckCommandExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionItemV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeCheckResponseExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeCreateCommandExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeCreateResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeCreateResponseExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeCreateResponseExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeCreateResponseExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeDeleteResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeDeleteResponseExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeDeleteResponseExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeDeleteResponseExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeInfoCommandExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeInfoResponseExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeRenewCommandExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeRenewResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeRenewResponseExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeRenewResponseExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeRenewResponseExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeTransferCommandExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeTransferResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeTransferResponseExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeTransferResponseExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeTransferResponseExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeUpdateCommandExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/FeeUpdateResponseExtensionV06.java b/core/src/main/java/google/registry/model/domain/fee06/FeeUpdateResponseExtensionV06.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/FeeUpdateResponseExtensionV06.java
rename to core/src/main/java/google/registry/model/domain/fee06/FeeUpdateResponseExtensionV06.java
diff --git a/java/google/registry/model/domain/fee06/package-info.java b/core/src/main/java/google/registry/model/domain/fee06/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/fee06/package-info.java
rename to core/src/main/java/google/registry/model/domain/fee06/package-info.java
diff --git a/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeCheckCommandExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionItemV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeCheckResponseExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeCreateCommandExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeCreateResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeCreateResponseExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeCreateResponseExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeCreateResponseExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeDeleteResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeDeleteResponseExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeDeleteResponseExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeDeleteResponseExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeRenewCommandExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeRenewResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeRenewResponseExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeRenewResponseExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeRenewResponseExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeTransferCommandExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeTransferResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeTransferResponseExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeTransferResponseExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeTransferResponseExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeUpdateCommandExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/FeeUpdateResponseExtensionV11.java b/core/src/main/java/google/registry/model/domain/fee11/FeeUpdateResponseExtensionV11.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/FeeUpdateResponseExtensionV11.java
rename to core/src/main/java/google/registry/model/domain/fee11/FeeUpdateResponseExtensionV11.java
diff --git a/java/google/registry/model/domain/fee11/package-info.java b/core/src/main/java/google/registry/model/domain/fee11/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/fee11/package-info.java
rename to core/src/main/java/google/registry/model/domain/fee11/package-info.java
diff --git a/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionItemV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionItemV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeCheckCommandExtensionItemV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionItemV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeCheckCommandExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeCheckCommandExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemCommandV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionItemV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeCheckResponseExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeCreateCommandExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeCreateResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeCreateResponseExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeCreateResponseExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeCreateResponseExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeDeleteResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeDeleteResponseExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeDeleteResponseExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeDeleteResponseExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeRenewCommandExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeRenewResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeRenewResponseExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeRenewResponseExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeRenewResponseExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeTransferCommandExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeTransferResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeTransferResponseExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeTransferResponseExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeTransferResponseExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeUpdateCommandExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/FeeUpdateResponseExtensionV12.java b/core/src/main/java/google/registry/model/domain/fee12/FeeUpdateResponseExtensionV12.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/FeeUpdateResponseExtensionV12.java
rename to core/src/main/java/google/registry/model/domain/fee12/FeeUpdateResponseExtensionV12.java
diff --git a/java/google/registry/model/domain/fee12/package-info.java b/core/src/main/java/google/registry/model/domain/fee12/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/fee12/package-info.java
rename to core/src/main/java/google/registry/model/domain/fee12/package-info.java
diff --git a/java/google/registry/model/domain/launch/LaunchCheckExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchCheckExtension.java
similarity index 100%
rename from java/google/registry/model/domain/launch/LaunchCheckExtension.java
rename to core/src/main/java/google/registry/model/domain/launch/LaunchCheckExtension.java
diff --git a/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java
similarity index 100%
rename from java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java
rename to core/src/main/java/google/registry/model/domain/launch/LaunchCheckResponseExtension.java
diff --git a/java/google/registry/model/domain/launch/LaunchCreateExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchCreateExtension.java
similarity index 100%
rename from java/google/registry/model/domain/launch/LaunchCreateExtension.java
rename to core/src/main/java/google/registry/model/domain/launch/LaunchCreateExtension.java
diff --git a/java/google/registry/model/domain/launch/LaunchDeleteExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchDeleteExtension.java
similarity index 100%
rename from java/google/registry/model/domain/launch/LaunchDeleteExtension.java
rename to core/src/main/java/google/registry/model/domain/launch/LaunchDeleteExtension.java
diff --git a/java/google/registry/model/domain/launch/LaunchExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchExtension.java
similarity index 100%
rename from java/google/registry/model/domain/launch/LaunchExtension.java
rename to core/src/main/java/google/registry/model/domain/launch/LaunchExtension.java
diff --git a/java/google/registry/model/domain/launch/LaunchInfoExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchInfoExtension.java
similarity index 100%
rename from java/google/registry/model/domain/launch/LaunchInfoExtension.java
rename to core/src/main/java/google/registry/model/domain/launch/LaunchInfoExtension.java
diff --git a/java/google/registry/model/domain/launch/LaunchNotice.java b/core/src/main/java/google/registry/model/domain/launch/LaunchNotice.java
similarity index 100%
rename from java/google/registry/model/domain/launch/LaunchNotice.java
rename to core/src/main/java/google/registry/model/domain/launch/LaunchNotice.java
diff --git a/java/google/registry/model/domain/launch/LaunchPhase.java b/core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java
similarity index 100%
rename from java/google/registry/model/domain/launch/LaunchPhase.java
rename to core/src/main/java/google/registry/model/domain/launch/LaunchPhase.java
diff --git a/java/google/registry/model/domain/launch/LaunchUpdateExtension.java b/core/src/main/java/google/registry/model/domain/launch/LaunchUpdateExtension.java
similarity index 100%
rename from java/google/registry/model/domain/launch/LaunchUpdateExtension.java
rename to core/src/main/java/google/registry/model/domain/launch/LaunchUpdateExtension.java
diff --git a/java/google/registry/model/domain/launch/package-info.java b/core/src/main/java/google/registry/model/domain/launch/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/launch/package-info.java
rename to core/src/main/java/google/registry/model/domain/launch/package-info.java
diff --git a/java/google/registry/model/domain/metadata/MetadataExtension.java b/core/src/main/java/google/registry/model/domain/metadata/MetadataExtension.java
similarity index 100%
rename from java/google/registry/model/domain/metadata/MetadataExtension.java
rename to core/src/main/java/google/registry/model/domain/metadata/MetadataExtension.java
diff --git a/java/google/registry/model/domain/metadata/package-info.java b/core/src/main/java/google/registry/model/domain/metadata/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/metadata/package-info.java
rename to core/src/main/java/google/registry/model/domain/metadata/package-info.java
diff --git a/java/google/registry/model/domain/package-info.java b/core/src/main/java/google/registry/model/domain/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/package-info.java
rename to core/src/main/java/google/registry/model/domain/package-info.java
diff --git a/java/google/registry/model/domain/rgp/GracePeriodStatus.java b/core/src/main/java/google/registry/model/domain/rgp/GracePeriodStatus.java
similarity index 100%
rename from java/google/registry/model/domain/rgp/GracePeriodStatus.java
rename to core/src/main/java/google/registry/model/domain/rgp/GracePeriodStatus.java
diff --git a/java/google/registry/model/domain/rgp/RestoreCommand.java b/core/src/main/java/google/registry/model/domain/rgp/RestoreCommand.java
similarity index 100%
rename from java/google/registry/model/domain/rgp/RestoreCommand.java
rename to core/src/main/java/google/registry/model/domain/rgp/RestoreCommand.java
diff --git a/java/google/registry/model/domain/rgp/RgpInfoExtension.java b/core/src/main/java/google/registry/model/domain/rgp/RgpInfoExtension.java
similarity index 100%
rename from java/google/registry/model/domain/rgp/RgpInfoExtension.java
rename to core/src/main/java/google/registry/model/domain/rgp/RgpInfoExtension.java
diff --git a/java/google/registry/model/domain/rgp/RgpUpdateExtension.java b/core/src/main/java/google/registry/model/domain/rgp/RgpUpdateExtension.java
similarity index 100%
rename from java/google/registry/model/domain/rgp/RgpUpdateExtension.java
rename to core/src/main/java/google/registry/model/domain/rgp/RgpUpdateExtension.java
diff --git a/java/google/registry/model/domain/rgp/package-info.java b/core/src/main/java/google/registry/model/domain/rgp/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/rgp/package-info.java
rename to core/src/main/java/google/registry/model/domain/rgp/package-info.java
diff --git a/java/google/registry/model/domain/secdns/DelegationSignerData.java b/core/src/main/java/google/registry/model/domain/secdns/DelegationSignerData.java
similarity index 100%
rename from java/google/registry/model/domain/secdns/DelegationSignerData.java
rename to core/src/main/java/google/registry/model/domain/secdns/DelegationSignerData.java
diff --git a/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java b/core/src/main/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java
similarity index 100%
rename from java/google/registry/model/domain/secdns/SecDnsCreateExtension.java
rename to core/src/main/java/google/registry/model/domain/secdns/SecDnsCreateExtension.java
diff --git a/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java b/core/src/main/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java
similarity index 100%
rename from java/google/registry/model/domain/secdns/SecDnsInfoExtension.java
rename to core/src/main/java/google/registry/model/domain/secdns/SecDnsInfoExtension.java
diff --git a/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java b/core/src/main/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java
similarity index 100%
rename from java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java
rename to core/src/main/java/google/registry/model/domain/secdns/SecDnsUpdateExtension.java
diff --git a/java/google/registry/model/domain/secdns/package-info.java b/core/src/main/java/google/registry/model/domain/secdns/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/secdns/package-info.java
rename to core/src/main/java/google/registry/model/domain/secdns/package-info.java
diff --git a/java/google/registry/model/domain/superuser/DomainDeleteSuperuserExtension.java b/core/src/main/java/google/registry/model/domain/superuser/DomainDeleteSuperuserExtension.java
similarity index 100%
rename from java/google/registry/model/domain/superuser/DomainDeleteSuperuserExtension.java
rename to core/src/main/java/google/registry/model/domain/superuser/DomainDeleteSuperuserExtension.java
diff --git a/java/google/registry/model/domain/superuser/DomainTransferRequestSuperuserExtension.java b/core/src/main/java/google/registry/model/domain/superuser/DomainTransferRequestSuperuserExtension.java
similarity index 100%
rename from java/google/registry/model/domain/superuser/DomainTransferRequestSuperuserExtension.java
rename to core/src/main/java/google/registry/model/domain/superuser/DomainTransferRequestSuperuserExtension.java
diff --git a/java/google/registry/model/domain/superuser/SuperuserExtension.java b/core/src/main/java/google/registry/model/domain/superuser/SuperuserExtension.java
similarity index 100%
rename from java/google/registry/model/domain/superuser/SuperuserExtension.java
rename to core/src/main/java/google/registry/model/domain/superuser/SuperuserExtension.java
diff --git a/java/google/registry/model/domain/superuser/package-info.java b/core/src/main/java/google/registry/model/domain/superuser/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/superuser/package-info.java
rename to core/src/main/java/google/registry/model/domain/superuser/package-info.java
diff --git a/java/google/registry/model/domain/token/AllocationToken.java b/core/src/main/java/google/registry/model/domain/token/AllocationToken.java
similarity index 100%
rename from java/google/registry/model/domain/token/AllocationToken.java
rename to core/src/main/java/google/registry/model/domain/token/AllocationToken.java
diff --git a/java/google/registry/model/domain/token/AllocationTokenExtension.java b/core/src/main/java/google/registry/model/domain/token/AllocationTokenExtension.java
similarity index 100%
rename from java/google/registry/model/domain/token/AllocationTokenExtension.java
rename to core/src/main/java/google/registry/model/domain/token/AllocationTokenExtension.java
diff --git a/java/google/registry/model/domain/token/package-info.java b/core/src/main/java/google/registry/model/domain/token/package-info.java
similarity index 100%
rename from java/google/registry/model/domain/token/package-info.java
rename to core/src/main/java/google/registry/model/domain/token/package-info.java
diff --git a/java/google/registry/model/eppcommon/Address.java b/core/src/main/java/google/registry/model/eppcommon/Address.java
similarity index 100%
rename from java/google/registry/model/eppcommon/Address.java
rename to core/src/main/java/google/registry/model/eppcommon/Address.java
diff --git a/java/google/registry/model/eppcommon/AuthInfo.java b/core/src/main/java/google/registry/model/eppcommon/AuthInfo.java
similarity index 100%
rename from java/google/registry/model/eppcommon/AuthInfo.java
rename to core/src/main/java/google/registry/model/eppcommon/AuthInfo.java
diff --git a/java/google/registry/model/eppcommon/EppXmlTransformer.java b/core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java
similarity index 100%
rename from java/google/registry/model/eppcommon/EppXmlTransformer.java
rename to core/src/main/java/google/registry/model/eppcommon/EppXmlTransformer.java
diff --git a/java/google/registry/model/eppcommon/PhoneNumber.java b/core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java
similarity index 100%
rename from java/google/registry/model/eppcommon/PhoneNumber.java
rename to core/src/main/java/google/registry/model/eppcommon/PhoneNumber.java
diff --git a/java/google/registry/model/eppcommon/PresenceMarker.java b/core/src/main/java/google/registry/model/eppcommon/PresenceMarker.java
similarity index 100%
rename from java/google/registry/model/eppcommon/PresenceMarker.java
rename to core/src/main/java/google/registry/model/eppcommon/PresenceMarker.java
diff --git a/java/google/registry/model/eppcommon/ProtocolDefinition.java b/core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java
similarity index 100%
rename from java/google/registry/model/eppcommon/ProtocolDefinition.java
rename to core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java
diff --git a/java/google/registry/model/eppcommon/StatusValue.java b/core/src/main/java/google/registry/model/eppcommon/StatusValue.java
similarity index 100%
rename from java/google/registry/model/eppcommon/StatusValue.java
rename to core/src/main/java/google/registry/model/eppcommon/StatusValue.java
diff --git a/java/google/registry/model/eppcommon/Trid.java b/core/src/main/java/google/registry/model/eppcommon/Trid.java
similarity index 100%
rename from java/google/registry/model/eppcommon/Trid.java
rename to core/src/main/java/google/registry/model/eppcommon/Trid.java
diff --git a/java/google/registry/model/eppcommon/package-info.java b/core/src/main/java/google/registry/model/eppcommon/package-info.java
similarity index 100%
rename from java/google/registry/model/eppcommon/package-info.java
rename to core/src/main/java/google/registry/model/eppcommon/package-info.java
diff --git a/java/google/registry/model/eppinput/EppInput.java b/core/src/main/java/google/registry/model/eppinput/EppInput.java
similarity index 100%
rename from java/google/registry/model/eppinput/EppInput.java
rename to core/src/main/java/google/registry/model/eppinput/EppInput.java
diff --git a/java/google/registry/model/eppinput/ResourceCommand.java b/core/src/main/java/google/registry/model/eppinput/ResourceCommand.java
similarity index 100%
rename from java/google/registry/model/eppinput/ResourceCommand.java
rename to core/src/main/java/google/registry/model/eppinput/ResourceCommand.java
diff --git a/java/google/registry/model/eppinput/package-info.java b/core/src/main/java/google/registry/model/eppinput/package-info.java
similarity index 100%
rename from java/google/registry/model/eppinput/package-info.java
rename to core/src/main/java/google/registry/model/eppinput/package-info.java
diff --git a/java/google/registry/model/eppoutput/CheckData.java b/core/src/main/java/google/registry/model/eppoutput/CheckData.java
similarity index 100%
rename from java/google/registry/model/eppoutput/CheckData.java
rename to core/src/main/java/google/registry/model/eppoutput/CheckData.java
diff --git a/java/google/registry/model/eppoutput/CreateData.java b/core/src/main/java/google/registry/model/eppoutput/CreateData.java
similarity index 100%
rename from java/google/registry/model/eppoutput/CreateData.java
rename to core/src/main/java/google/registry/model/eppoutput/CreateData.java
diff --git a/java/google/registry/model/eppoutput/EppOutput.java b/core/src/main/java/google/registry/model/eppoutput/EppOutput.java
similarity index 100%
rename from java/google/registry/model/eppoutput/EppOutput.java
rename to core/src/main/java/google/registry/model/eppoutput/EppOutput.java
diff --git a/java/google/registry/model/eppoutput/EppResponse.java b/core/src/main/java/google/registry/model/eppoutput/EppResponse.java
similarity index 100%
rename from java/google/registry/model/eppoutput/EppResponse.java
rename to core/src/main/java/google/registry/model/eppoutput/EppResponse.java
diff --git a/java/google/registry/model/eppoutput/Greeting.java b/core/src/main/java/google/registry/model/eppoutput/Greeting.java
similarity index 100%
rename from java/google/registry/model/eppoutput/Greeting.java
rename to core/src/main/java/google/registry/model/eppoutput/Greeting.java
diff --git a/java/google/registry/model/eppoutput/Result.java b/core/src/main/java/google/registry/model/eppoutput/Result.java
similarity index 100%
rename from java/google/registry/model/eppoutput/Result.java
rename to core/src/main/java/google/registry/model/eppoutput/Result.java
diff --git a/java/google/registry/model/eppoutput/package-info.java b/core/src/main/java/google/registry/model/eppoutput/package-info.java
similarity index 100%
rename from java/google/registry/model/eppoutput/package-info.java
rename to core/src/main/java/google/registry/model/eppoutput/package-info.java
diff --git a/java/google/registry/model/host/HostCommand.java b/core/src/main/java/google/registry/model/host/HostCommand.java
similarity index 100%
rename from java/google/registry/model/host/HostCommand.java
rename to core/src/main/java/google/registry/model/host/HostCommand.java
diff --git a/java/google/registry/model/host/HostInfoData.java b/core/src/main/java/google/registry/model/host/HostInfoData.java
similarity index 100%
rename from java/google/registry/model/host/HostInfoData.java
rename to core/src/main/java/google/registry/model/host/HostInfoData.java
diff --git a/java/google/registry/model/host/HostResource.java b/core/src/main/java/google/registry/model/host/HostResource.java
similarity index 100%
rename from java/google/registry/model/host/HostResource.java
rename to core/src/main/java/google/registry/model/host/HostResource.java
diff --git a/java/google/registry/model/host/InetAddressAdapter.java b/core/src/main/java/google/registry/model/host/InetAddressAdapter.java
similarity index 100%
rename from java/google/registry/model/host/InetAddressAdapter.java
rename to core/src/main/java/google/registry/model/host/InetAddressAdapter.java
diff --git a/java/google/registry/model/host/package-info.java b/core/src/main/java/google/registry/model/host/package-info.java
similarity index 100%
rename from java/google/registry/model/host/package-info.java
rename to core/src/main/java/google/registry/model/host/package-info.java
diff --git a/java/google/registry/model/index/EppResourceIndex.java b/core/src/main/java/google/registry/model/index/EppResourceIndex.java
similarity index 100%
rename from java/google/registry/model/index/EppResourceIndex.java
rename to core/src/main/java/google/registry/model/index/EppResourceIndex.java
diff --git a/java/google/registry/model/index/EppResourceIndexBucket.java b/core/src/main/java/google/registry/model/index/EppResourceIndexBucket.java
similarity index 100%
rename from java/google/registry/model/index/EppResourceIndexBucket.java
rename to core/src/main/java/google/registry/model/index/EppResourceIndexBucket.java
diff --git a/java/google/registry/model/index/ForeignKeyIndex.java b/core/src/main/java/google/registry/model/index/ForeignKeyIndex.java
similarity index 100%
rename from java/google/registry/model/index/ForeignKeyIndex.java
rename to core/src/main/java/google/registry/model/index/ForeignKeyIndex.java
diff --git a/java/google/registry/model/mark/CommonMarkContactFields.java b/core/src/main/java/google/registry/model/mark/CommonMarkContactFields.java
similarity index 100%
rename from java/google/registry/model/mark/CommonMarkContactFields.java
rename to core/src/main/java/google/registry/model/mark/CommonMarkContactFields.java
diff --git a/java/google/registry/model/mark/CommonMarkFields.java b/core/src/main/java/google/registry/model/mark/CommonMarkFields.java
similarity index 100%
rename from java/google/registry/model/mark/CommonMarkFields.java
rename to core/src/main/java/google/registry/model/mark/CommonMarkFields.java
diff --git a/java/google/registry/model/mark/CourtMark.java b/core/src/main/java/google/registry/model/mark/CourtMark.java
similarity index 100%
rename from java/google/registry/model/mark/CourtMark.java
rename to core/src/main/java/google/registry/model/mark/CourtMark.java
diff --git a/java/google/registry/model/mark/Mark.java b/core/src/main/java/google/registry/model/mark/Mark.java
similarity index 100%
rename from java/google/registry/model/mark/Mark.java
rename to core/src/main/java/google/registry/model/mark/Mark.java
diff --git a/java/google/registry/model/mark/MarkAddress.java b/core/src/main/java/google/registry/model/mark/MarkAddress.java
similarity index 100%
rename from java/google/registry/model/mark/MarkAddress.java
rename to core/src/main/java/google/registry/model/mark/MarkAddress.java
diff --git a/java/google/registry/model/mark/MarkContact.java b/core/src/main/java/google/registry/model/mark/MarkContact.java
similarity index 100%
rename from java/google/registry/model/mark/MarkContact.java
rename to core/src/main/java/google/registry/model/mark/MarkContact.java
diff --git a/java/google/registry/model/mark/MarkHolder.java b/core/src/main/java/google/registry/model/mark/MarkHolder.java
similarity index 100%
rename from java/google/registry/model/mark/MarkHolder.java
rename to core/src/main/java/google/registry/model/mark/MarkHolder.java
diff --git a/java/google/registry/model/mark/MarkPhoneNumber.java b/core/src/main/java/google/registry/model/mark/MarkPhoneNumber.java
similarity index 100%
rename from java/google/registry/model/mark/MarkPhoneNumber.java
rename to core/src/main/java/google/registry/model/mark/MarkPhoneNumber.java
diff --git a/java/google/registry/model/mark/MarkProtection.java b/core/src/main/java/google/registry/model/mark/MarkProtection.java
similarity index 100%
rename from java/google/registry/model/mark/MarkProtection.java
rename to core/src/main/java/google/registry/model/mark/MarkProtection.java
diff --git a/java/google/registry/model/mark/ProtectedMark.java b/core/src/main/java/google/registry/model/mark/ProtectedMark.java
similarity index 100%
rename from java/google/registry/model/mark/ProtectedMark.java
rename to core/src/main/java/google/registry/model/mark/ProtectedMark.java
diff --git a/java/google/registry/model/mark/Trademark.java b/core/src/main/java/google/registry/model/mark/Trademark.java
similarity index 100%
rename from java/google/registry/model/mark/Trademark.java
rename to core/src/main/java/google/registry/model/mark/Trademark.java
diff --git a/java/google/registry/model/mark/TreatyOrStatuteMark.java b/core/src/main/java/google/registry/model/mark/TreatyOrStatuteMark.java
similarity index 100%
rename from java/google/registry/model/mark/TreatyOrStatuteMark.java
rename to core/src/main/java/google/registry/model/mark/TreatyOrStatuteMark.java
diff --git a/java/google/registry/model/mark/package-info.java b/core/src/main/java/google/registry/model/mark/package-info.java
similarity index 100%
rename from java/google/registry/model/mark/package-info.java
rename to core/src/main/java/google/registry/model/mark/package-info.java
diff --git a/java/google/registry/model/ofy/AugmentedDeleter.java b/core/src/main/java/google/registry/model/ofy/AugmentedDeleter.java
similarity index 100%
rename from java/google/registry/model/ofy/AugmentedDeleter.java
rename to core/src/main/java/google/registry/model/ofy/AugmentedDeleter.java
diff --git a/java/google/registry/model/ofy/AugmentedSaver.java b/core/src/main/java/google/registry/model/ofy/AugmentedSaver.java
similarity index 100%
rename from java/google/registry/model/ofy/AugmentedSaver.java
rename to core/src/main/java/google/registry/model/ofy/AugmentedSaver.java
diff --git a/java/google/registry/model/ofy/CommitLogBucket.java b/core/src/main/java/google/registry/model/ofy/CommitLogBucket.java
similarity index 100%
rename from java/google/registry/model/ofy/CommitLogBucket.java
rename to core/src/main/java/google/registry/model/ofy/CommitLogBucket.java
diff --git a/java/google/registry/model/ofy/CommitLogCheckpoint.java b/core/src/main/java/google/registry/model/ofy/CommitLogCheckpoint.java
similarity index 100%
rename from java/google/registry/model/ofy/CommitLogCheckpoint.java
rename to core/src/main/java/google/registry/model/ofy/CommitLogCheckpoint.java
diff --git a/java/google/registry/model/ofy/CommitLogCheckpointRoot.java b/core/src/main/java/google/registry/model/ofy/CommitLogCheckpointRoot.java
similarity index 100%
rename from java/google/registry/model/ofy/CommitLogCheckpointRoot.java
rename to core/src/main/java/google/registry/model/ofy/CommitLogCheckpointRoot.java
diff --git a/java/google/registry/model/ofy/CommitLogManifest.java b/core/src/main/java/google/registry/model/ofy/CommitLogManifest.java
similarity index 100%
rename from java/google/registry/model/ofy/CommitLogManifest.java
rename to core/src/main/java/google/registry/model/ofy/CommitLogManifest.java
diff --git a/java/google/registry/model/ofy/CommitLogMutation.java b/core/src/main/java/google/registry/model/ofy/CommitLogMutation.java
similarity index 100%
rename from java/google/registry/model/ofy/CommitLogMutation.java
rename to core/src/main/java/google/registry/model/ofy/CommitLogMutation.java
diff --git a/java/google/registry/model/ofy/CommitLoggedWork.java b/core/src/main/java/google/registry/model/ofy/CommitLoggedWork.java
similarity index 100%
rename from java/google/registry/model/ofy/CommitLoggedWork.java
rename to core/src/main/java/google/registry/model/ofy/CommitLoggedWork.java
diff --git a/java/google/registry/model/ofy/ObjectifyService.java b/core/src/main/java/google/registry/model/ofy/ObjectifyService.java
similarity index 100%
rename from java/google/registry/model/ofy/ObjectifyService.java
rename to core/src/main/java/google/registry/model/ofy/ObjectifyService.java
diff --git a/java/google/registry/model/ofy/Ofy.java b/core/src/main/java/google/registry/model/ofy/Ofy.java
similarity index 100%
rename from java/google/registry/model/ofy/Ofy.java
rename to core/src/main/java/google/registry/model/ofy/Ofy.java
diff --git a/java/google/registry/model/ofy/OfyFilter.java b/core/src/main/java/google/registry/model/ofy/OfyFilter.java
similarity index 100%
rename from java/google/registry/model/ofy/OfyFilter.java
rename to core/src/main/java/google/registry/model/ofy/OfyFilter.java
diff --git a/java/google/registry/model/ofy/ReadOnlyWork.java b/core/src/main/java/google/registry/model/ofy/ReadOnlyWork.java
similarity index 100%
rename from java/google/registry/model/ofy/ReadOnlyWork.java
rename to core/src/main/java/google/registry/model/ofy/ReadOnlyWork.java
diff --git a/java/google/registry/model/ofy/RequestCapturingAsyncDatastoreService.java b/core/src/main/java/google/registry/model/ofy/RequestCapturingAsyncDatastoreService.java
similarity index 100%
rename from java/google/registry/model/ofy/RequestCapturingAsyncDatastoreService.java
rename to core/src/main/java/google/registry/model/ofy/RequestCapturingAsyncDatastoreService.java
diff --git a/java/google/registry/model/ofy/SessionKeyExposingObjectify.java b/core/src/main/java/google/registry/model/ofy/SessionKeyExposingObjectify.java
similarity index 100%
rename from java/google/registry/model/ofy/SessionKeyExposingObjectify.java
rename to core/src/main/java/google/registry/model/ofy/SessionKeyExposingObjectify.java
diff --git a/java/google/registry/model/ofy/TimestampInversionException.java b/core/src/main/java/google/registry/model/ofy/TimestampInversionException.java
similarity index 100%
rename from java/google/registry/model/ofy/TimestampInversionException.java
rename to core/src/main/java/google/registry/model/ofy/TimestampInversionException.java
diff --git a/java/google/registry/model/ofy/TransactionInfo.java b/core/src/main/java/google/registry/model/ofy/TransactionInfo.java
similarity index 100%
rename from java/google/registry/model/ofy/TransactionInfo.java
rename to core/src/main/java/google/registry/model/ofy/TransactionInfo.java
diff --git a/java/google/registry/model/package-info.java b/core/src/main/java/google/registry/model/package-info.java
similarity index 100%
rename from java/google/registry/model/package-info.java
rename to core/src/main/java/google/registry/model/package-info.java
diff --git a/java/google/registry/model/poll/MessageQueueInfo.java b/core/src/main/java/google/registry/model/poll/MessageQueueInfo.java
similarity index 100%
rename from java/google/registry/model/poll/MessageQueueInfo.java
rename to core/src/main/java/google/registry/model/poll/MessageQueueInfo.java
diff --git a/java/google/registry/model/poll/PendingActionNotificationResponse.java b/core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java
similarity index 100%
rename from java/google/registry/model/poll/PendingActionNotificationResponse.java
rename to core/src/main/java/google/registry/model/poll/PendingActionNotificationResponse.java
diff --git a/java/google/registry/model/poll/PollMessage.java b/core/src/main/java/google/registry/model/poll/PollMessage.java
similarity index 100%
rename from java/google/registry/model/poll/PollMessage.java
rename to core/src/main/java/google/registry/model/poll/PollMessage.java
diff --git a/java/google/registry/model/poll/PollMessageExternalKeyConverter.java b/core/src/main/java/google/registry/model/poll/PollMessageExternalKeyConverter.java
similarity index 100%
rename from java/google/registry/model/poll/PollMessageExternalKeyConverter.java
rename to core/src/main/java/google/registry/model/poll/PollMessageExternalKeyConverter.java
diff --git a/java/google/registry/model/poll/package-info.java b/core/src/main/java/google/registry/model/poll/package-info.java
similarity index 100%
rename from java/google/registry/model/poll/package-info.java
rename to core/src/main/java/google/registry/model/poll/package-info.java
diff --git a/java/google/registry/model/pricing/PremiumPricingEngine.java b/core/src/main/java/google/registry/model/pricing/PremiumPricingEngine.java
similarity index 100%
rename from java/google/registry/model/pricing/PremiumPricingEngine.java
rename to core/src/main/java/google/registry/model/pricing/PremiumPricingEngine.java
diff --git a/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java b/core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java
similarity index 100%
rename from java/google/registry/model/pricing/StaticPremiumListPricingEngine.java
rename to core/src/main/java/google/registry/model/pricing/StaticPremiumListPricingEngine.java
diff --git a/java/google/registry/model/rde/RdeMode.java b/core/src/main/java/google/registry/model/rde/RdeMode.java
similarity index 100%
rename from java/google/registry/model/rde/RdeMode.java
rename to core/src/main/java/google/registry/model/rde/RdeMode.java
diff --git a/java/google/registry/model/rde/RdeNamingUtils.java b/core/src/main/java/google/registry/model/rde/RdeNamingUtils.java
similarity index 100%
rename from java/google/registry/model/rde/RdeNamingUtils.java
rename to core/src/main/java/google/registry/model/rde/RdeNamingUtils.java
diff --git a/java/google/registry/model/rde/RdeRevision.java b/core/src/main/java/google/registry/model/rde/RdeRevision.java
similarity index 100%
rename from java/google/registry/model/rde/RdeRevision.java
rename to core/src/main/java/google/registry/model/rde/RdeRevision.java
diff --git a/java/google/registry/model/registrar/Registrar.java b/core/src/main/java/google/registry/model/registrar/Registrar.java
similarity index 100%
rename from java/google/registry/model/registrar/Registrar.java
rename to core/src/main/java/google/registry/model/registrar/Registrar.java
diff --git a/java/google/registry/model/registrar/RegistrarAddress.java b/core/src/main/java/google/registry/model/registrar/RegistrarAddress.java
similarity index 100%
rename from java/google/registry/model/registrar/RegistrarAddress.java
rename to core/src/main/java/google/registry/model/registrar/RegistrarAddress.java
diff --git a/java/google/registry/model/registrar/RegistrarContact.java b/core/src/main/java/google/registry/model/registrar/RegistrarContact.java
similarity index 100%
rename from java/google/registry/model/registrar/RegistrarContact.java
rename to core/src/main/java/google/registry/model/registrar/RegistrarContact.java
diff --git a/java/google/registry/model/registry/Registries.java b/core/src/main/java/google/registry/model/registry/Registries.java
similarity index 100%
rename from java/google/registry/model/registry/Registries.java
rename to core/src/main/java/google/registry/model/registry/Registries.java
diff --git a/java/google/registry/model/registry/Registry.java b/core/src/main/java/google/registry/model/registry/Registry.java
similarity index 100%
rename from java/google/registry/model/registry/Registry.java
rename to core/src/main/java/google/registry/model/registry/Registry.java
diff --git a/java/google/registry/model/registry/label/BaseDomainLabelList.java b/core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java
similarity index 100%
rename from java/google/registry/model/registry/label/BaseDomainLabelList.java
rename to core/src/main/java/google/registry/model/registry/label/BaseDomainLabelList.java
diff --git a/java/google/registry/model/registry/label/DomainLabelEntry.java b/core/src/main/java/google/registry/model/registry/label/DomainLabelEntry.java
similarity index 100%
rename from java/google/registry/model/registry/label/DomainLabelEntry.java
rename to core/src/main/java/google/registry/model/registry/label/DomainLabelEntry.java
diff --git a/java/google/registry/model/registry/label/DomainLabelMetrics.java b/core/src/main/java/google/registry/model/registry/label/DomainLabelMetrics.java
similarity index 100%
rename from java/google/registry/model/registry/label/DomainLabelMetrics.java
rename to core/src/main/java/google/registry/model/registry/label/DomainLabelMetrics.java
diff --git a/java/google/registry/model/registry/label/PremiumList.java b/core/src/main/java/google/registry/model/registry/label/PremiumList.java
similarity index 100%
rename from java/google/registry/model/registry/label/PremiumList.java
rename to core/src/main/java/google/registry/model/registry/label/PremiumList.java
diff --git a/java/google/registry/model/registry/label/PremiumListUtils.java b/core/src/main/java/google/registry/model/registry/label/PremiumListUtils.java
similarity index 100%
rename from java/google/registry/model/registry/label/PremiumListUtils.java
rename to core/src/main/java/google/registry/model/registry/label/PremiumListUtils.java
diff --git a/java/google/registry/model/registry/label/ReservationType.java b/core/src/main/java/google/registry/model/registry/label/ReservationType.java
similarity index 100%
rename from java/google/registry/model/registry/label/ReservationType.java
rename to core/src/main/java/google/registry/model/registry/label/ReservationType.java
diff --git a/java/google/registry/model/registry/label/ReservedList.java b/core/src/main/java/google/registry/model/registry/label/ReservedList.java
similarity index 100%
rename from java/google/registry/model/registry/label/ReservedList.java
rename to core/src/main/java/google/registry/model/registry/label/ReservedList.java
diff --git a/java/google/registry/model/registry/label/package-info.java b/core/src/main/java/google/registry/model/registry/label/package-info.java
similarity index 100%
rename from java/google/registry/model/registry/label/package-info.java
rename to core/src/main/java/google/registry/model/registry/label/package-info.java
diff --git a/java/google/registry/model/reporting/DomainTransactionRecord.java b/core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java
similarity index 100%
rename from java/google/registry/model/reporting/DomainTransactionRecord.java
rename to core/src/main/java/google/registry/model/reporting/DomainTransactionRecord.java
diff --git a/java/google/registry/model/reporting/HistoryEntry.java b/core/src/main/java/google/registry/model/reporting/HistoryEntry.java
similarity index 100%
rename from java/google/registry/model/reporting/HistoryEntry.java
rename to core/src/main/java/google/registry/model/reporting/HistoryEntry.java
diff --git a/java/google/registry/model/reporting/IcannReportingTypes.java b/core/src/main/java/google/registry/model/reporting/IcannReportingTypes.java
similarity index 100%
rename from java/google/registry/model/reporting/IcannReportingTypes.java
rename to core/src/main/java/google/registry/model/reporting/IcannReportingTypes.java
diff --git a/java/google/registry/model/server/KmsSecret.java b/core/src/main/java/google/registry/model/server/KmsSecret.java
similarity index 100%
rename from java/google/registry/model/server/KmsSecret.java
rename to core/src/main/java/google/registry/model/server/KmsSecret.java
diff --git a/java/google/registry/model/server/KmsSecretRevision.java b/core/src/main/java/google/registry/model/server/KmsSecretRevision.java
similarity index 100%
rename from java/google/registry/model/server/KmsSecretRevision.java
rename to core/src/main/java/google/registry/model/server/KmsSecretRevision.java
diff --git a/java/google/registry/model/server/Lock.java b/core/src/main/java/google/registry/model/server/Lock.java
similarity index 100%
rename from java/google/registry/model/server/Lock.java
rename to core/src/main/java/google/registry/model/server/Lock.java
diff --git a/java/google/registry/model/server/LockMetrics.java b/core/src/main/java/google/registry/model/server/LockMetrics.java
similarity index 100%
rename from java/google/registry/model/server/LockMetrics.java
rename to core/src/main/java/google/registry/model/server/LockMetrics.java
diff --git a/java/google/registry/model/server/ServerSecret.java b/core/src/main/java/google/registry/model/server/ServerSecret.java
similarity index 100%
rename from java/google/registry/model/server/ServerSecret.java
rename to core/src/main/java/google/registry/model/server/ServerSecret.java
diff --git a/java/google/registry/model/smd/AbstractSignedMark.java b/core/src/main/java/google/registry/model/smd/AbstractSignedMark.java
similarity index 100%
rename from java/google/registry/model/smd/AbstractSignedMark.java
rename to core/src/main/java/google/registry/model/smd/AbstractSignedMark.java
diff --git a/java/google/registry/model/smd/EncodedSignedMark.java b/core/src/main/java/google/registry/model/smd/EncodedSignedMark.java
similarity index 100%
rename from java/google/registry/model/smd/EncodedSignedMark.java
rename to core/src/main/java/google/registry/model/smd/EncodedSignedMark.java
diff --git a/java/google/registry/model/smd/IssuerInfo.java b/core/src/main/java/google/registry/model/smd/IssuerInfo.java
similarity index 100%
rename from java/google/registry/model/smd/IssuerInfo.java
rename to core/src/main/java/google/registry/model/smd/IssuerInfo.java
diff --git a/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java b/core/src/main/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java
similarity index 100%
rename from java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java
rename to core/src/main/java/google/registry/model/smd/RemoveWhitespaceTextAdapter.java
diff --git a/java/google/registry/model/smd/SignedMark.java b/core/src/main/java/google/registry/model/smd/SignedMark.java
similarity index 100%
rename from java/google/registry/model/smd/SignedMark.java
rename to core/src/main/java/google/registry/model/smd/SignedMark.java
diff --git a/java/google/registry/model/smd/SignedMarkRevocationList.java b/core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java
similarity index 100%
rename from java/google/registry/model/smd/SignedMarkRevocationList.java
rename to core/src/main/java/google/registry/model/smd/SignedMarkRevocationList.java
diff --git a/java/google/registry/model/smd/package-info.java b/core/src/main/java/google/registry/model/smd/package-info.java
similarity index 100%
rename from java/google/registry/model/smd/package-info.java
rename to core/src/main/java/google/registry/model/smd/package-info.java
diff --git a/java/google/registry/model/tmch/ClaimsListShard.java b/core/src/main/java/google/registry/model/tmch/ClaimsListShard.java
similarity index 100%
rename from java/google/registry/model/tmch/ClaimsListShard.java
rename to core/src/main/java/google/registry/model/tmch/ClaimsListShard.java
diff --git a/java/google/registry/model/tmch/TmchCrl.java b/core/src/main/java/google/registry/model/tmch/TmchCrl.java
similarity index 100%
rename from java/google/registry/model/tmch/TmchCrl.java
rename to core/src/main/java/google/registry/model/tmch/TmchCrl.java
diff --git a/java/google/registry/model/transfer/BaseTransferObject.java b/core/src/main/java/google/registry/model/transfer/BaseTransferObject.java
similarity index 100%
rename from java/google/registry/model/transfer/BaseTransferObject.java
rename to core/src/main/java/google/registry/model/transfer/BaseTransferObject.java
diff --git a/java/google/registry/model/transfer/TransferData.java b/core/src/main/java/google/registry/model/transfer/TransferData.java
similarity index 100%
rename from java/google/registry/model/transfer/TransferData.java
rename to core/src/main/java/google/registry/model/transfer/TransferData.java
diff --git a/java/google/registry/model/transfer/TransferResponse.java b/core/src/main/java/google/registry/model/transfer/TransferResponse.java
similarity index 100%
rename from java/google/registry/model/transfer/TransferResponse.java
rename to core/src/main/java/google/registry/model/transfer/TransferResponse.java
diff --git a/java/google/registry/model/transfer/TransferStatus.java b/core/src/main/java/google/registry/model/transfer/TransferStatus.java
similarity index 100%
rename from java/google/registry/model/transfer/TransferStatus.java
rename to core/src/main/java/google/registry/model/transfer/TransferStatus.java
diff --git a/java/google/registry/model/transfer/package-info.java b/core/src/main/java/google/registry/model/transfer/package-info.java
similarity index 100%
rename from java/google/registry/model/transfer/package-info.java
rename to core/src/main/java/google/registry/model/transfer/package-info.java
diff --git a/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/AbstractSimpleTranslatorFactory.java
diff --git a/java/google/registry/model/translators/BloomFilterOfStringTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/BloomFilterOfStringTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/BloomFilterOfStringTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/BloomFilterOfStringTranslatorFactory.java
diff --git a/java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/CidrAddressBlockTranslatorFactory.java
diff --git a/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactory.java
diff --git a/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/CreateAutoTimestampTranslatorFactory.java
diff --git a/java/google/registry/model/translators/CurrencyUnitAdapter.java b/core/src/main/java/google/registry/model/translators/CurrencyUnitAdapter.java
similarity index 100%
rename from java/google/registry/model/translators/CurrencyUnitAdapter.java
rename to core/src/main/java/google/registry/model/translators/CurrencyUnitAdapter.java
diff --git a/java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/CurrencyUnitTranslatorFactory.java
diff --git a/java/google/registry/model/translators/DurationTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/DurationTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/DurationTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/DurationTranslatorFactory.java
diff --git a/java/google/registry/model/translators/EnumToAttributeAdapter.java b/core/src/main/java/google/registry/model/translators/EnumToAttributeAdapter.java
similarity index 100%
rename from java/google/registry/model/translators/EnumToAttributeAdapter.java
rename to core/src/main/java/google/registry/model/translators/EnumToAttributeAdapter.java
diff --git a/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/ImmutableSortedMapTranslatorFactory.java
diff --git a/java/google/registry/model/translators/InetAddressTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/InetAddressTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/InetAddressTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/InetAddressTranslatorFactory.java
diff --git a/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/ReadableInstantUtcTranslatorFactory.java
diff --git a/java/google/registry/model/translators/StatusValueAdapter.java b/core/src/main/java/google/registry/model/translators/StatusValueAdapter.java
similarity index 100%
rename from java/google/registry/model/translators/StatusValueAdapter.java
rename to core/src/main/java/google/registry/model/translators/StatusValueAdapter.java
diff --git a/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java
similarity index 100%
rename from java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java
rename to core/src/main/java/google/registry/model/translators/UpdateAutoTimestampTranslatorFactory.java
diff --git a/java/google/registry/module/BUILD b/core/src/main/java/google/registry/module/BUILD
similarity index 100%
rename from java/google/registry/module/BUILD
rename to core/src/main/java/google/registry/module/BUILD
diff --git a/java/google/registry/module/ServletBase.java b/core/src/main/java/google/registry/module/ServletBase.java
similarity index 100%
rename from java/google/registry/module/ServletBase.java
rename to core/src/main/java/google/registry/module/ServletBase.java
diff --git a/java/google/registry/module/backend/BUILD b/core/src/main/java/google/registry/module/backend/BUILD
similarity index 100%
rename from java/google/registry/module/backend/BUILD
rename to core/src/main/java/google/registry/module/backend/BUILD
diff --git a/java/google/registry/module/backend/BackendComponent.java b/core/src/main/java/google/registry/module/backend/BackendComponent.java
similarity index 100%
rename from java/google/registry/module/backend/BackendComponent.java
rename to core/src/main/java/google/registry/module/backend/BackendComponent.java
diff --git a/java/google/registry/module/backend/BackendModule.java b/core/src/main/java/google/registry/module/backend/BackendModule.java
similarity index 100%
rename from java/google/registry/module/backend/BackendModule.java
rename to core/src/main/java/google/registry/module/backend/BackendModule.java
diff --git a/java/google/registry/module/backend/BackendRequestComponent.java b/core/src/main/java/google/registry/module/backend/BackendRequestComponent.java
similarity index 100%
rename from java/google/registry/module/backend/BackendRequestComponent.java
rename to core/src/main/java/google/registry/module/backend/BackendRequestComponent.java
diff --git a/java/google/registry/module/backend/BackendRequestHandler.java b/core/src/main/java/google/registry/module/backend/BackendRequestHandler.java
similarity index 100%
rename from java/google/registry/module/backend/BackendRequestHandler.java
rename to core/src/main/java/google/registry/module/backend/BackendRequestHandler.java
diff --git a/java/google/registry/module/backend/BackendServlet.java b/core/src/main/java/google/registry/module/backend/BackendServlet.java
similarity index 100%
rename from java/google/registry/module/backend/BackendServlet.java
rename to core/src/main/java/google/registry/module/backend/BackendServlet.java
diff --git a/java/google/registry/module/backend/package-info.java b/core/src/main/java/google/registry/module/backend/package-info.java
similarity index 100%
rename from java/google/registry/module/backend/package-info.java
rename to core/src/main/java/google/registry/module/backend/package-info.java
diff --git a/java/google/registry/module/frontend/BUILD b/core/src/main/java/google/registry/module/frontend/BUILD
similarity index 100%
rename from java/google/registry/module/frontend/BUILD
rename to core/src/main/java/google/registry/module/frontend/BUILD
diff --git a/java/google/registry/module/frontend/FrontendComponent.java b/core/src/main/java/google/registry/module/frontend/FrontendComponent.java
similarity index 100%
rename from java/google/registry/module/frontend/FrontendComponent.java
rename to core/src/main/java/google/registry/module/frontend/FrontendComponent.java
diff --git a/java/google/registry/module/frontend/FrontendRequestComponent.java b/core/src/main/java/google/registry/module/frontend/FrontendRequestComponent.java
similarity index 100%
rename from java/google/registry/module/frontend/FrontendRequestComponent.java
rename to core/src/main/java/google/registry/module/frontend/FrontendRequestComponent.java
diff --git a/java/google/registry/module/frontend/FrontendRequestHandler.java b/core/src/main/java/google/registry/module/frontend/FrontendRequestHandler.java
similarity index 100%
rename from java/google/registry/module/frontend/FrontendRequestHandler.java
rename to core/src/main/java/google/registry/module/frontend/FrontendRequestHandler.java
diff --git a/java/google/registry/module/frontend/FrontendServlet.java b/core/src/main/java/google/registry/module/frontend/FrontendServlet.java
similarity index 100%
rename from java/google/registry/module/frontend/FrontendServlet.java
rename to core/src/main/java/google/registry/module/frontend/FrontendServlet.java
diff --git a/java/google/registry/module/frontend/package-info.java b/core/src/main/java/google/registry/module/frontend/package-info.java
similarity index 100%
rename from java/google/registry/module/frontend/package-info.java
rename to core/src/main/java/google/registry/module/frontend/package-info.java
diff --git a/java/google/registry/module/pubapi/BUILD b/core/src/main/java/google/registry/module/pubapi/BUILD
similarity index 100%
rename from java/google/registry/module/pubapi/BUILD
rename to core/src/main/java/google/registry/module/pubapi/BUILD
diff --git a/java/google/registry/module/pubapi/PubApiComponent.java b/core/src/main/java/google/registry/module/pubapi/PubApiComponent.java
similarity index 100%
rename from java/google/registry/module/pubapi/PubApiComponent.java
rename to core/src/main/java/google/registry/module/pubapi/PubApiComponent.java
diff --git a/java/google/registry/module/pubapi/PubApiRequestComponent.java b/core/src/main/java/google/registry/module/pubapi/PubApiRequestComponent.java
similarity index 100%
rename from java/google/registry/module/pubapi/PubApiRequestComponent.java
rename to core/src/main/java/google/registry/module/pubapi/PubApiRequestComponent.java
diff --git a/java/google/registry/module/pubapi/PubApiRequestHandler.java b/core/src/main/java/google/registry/module/pubapi/PubApiRequestHandler.java
similarity index 100%
rename from java/google/registry/module/pubapi/PubApiRequestHandler.java
rename to core/src/main/java/google/registry/module/pubapi/PubApiRequestHandler.java
diff --git a/java/google/registry/module/pubapi/PubApiServlet.java b/core/src/main/java/google/registry/module/pubapi/PubApiServlet.java
similarity index 100%
rename from java/google/registry/module/pubapi/PubApiServlet.java
rename to core/src/main/java/google/registry/module/pubapi/PubApiServlet.java
diff --git a/java/google/registry/module/pubapi/package-info.java b/core/src/main/java/google/registry/module/pubapi/package-info.java
similarity index 100%
rename from java/google/registry/module/pubapi/package-info.java
rename to core/src/main/java/google/registry/module/pubapi/package-info.java
diff --git a/java/google/registry/module/tools/BUILD b/core/src/main/java/google/registry/module/tools/BUILD
similarity index 100%
rename from java/google/registry/module/tools/BUILD
rename to core/src/main/java/google/registry/module/tools/BUILD
diff --git a/java/google/registry/module/tools/ToolsComponent.java b/core/src/main/java/google/registry/module/tools/ToolsComponent.java
similarity index 100%
rename from java/google/registry/module/tools/ToolsComponent.java
rename to core/src/main/java/google/registry/module/tools/ToolsComponent.java
diff --git a/java/google/registry/module/tools/ToolsRequestComponent.java b/core/src/main/java/google/registry/module/tools/ToolsRequestComponent.java
similarity index 100%
rename from java/google/registry/module/tools/ToolsRequestComponent.java
rename to core/src/main/java/google/registry/module/tools/ToolsRequestComponent.java
diff --git a/java/google/registry/module/tools/ToolsRequestHandler.java b/core/src/main/java/google/registry/module/tools/ToolsRequestHandler.java
similarity index 100%
rename from java/google/registry/module/tools/ToolsRequestHandler.java
rename to core/src/main/java/google/registry/module/tools/ToolsRequestHandler.java
diff --git a/java/google/registry/module/tools/ToolsServlet.java b/core/src/main/java/google/registry/module/tools/ToolsServlet.java
similarity index 100%
rename from java/google/registry/module/tools/ToolsServlet.java
rename to core/src/main/java/google/registry/module/tools/ToolsServlet.java
diff --git a/java/google/registry/monitoring/whitebox/BUILD b/core/src/main/java/google/registry/monitoring/whitebox/BUILD
similarity index 100%
rename from java/google/registry/monitoring/whitebox/BUILD
rename to core/src/main/java/google/registry/monitoring/whitebox/BUILD
diff --git a/java/google/registry/monitoring/whitebox/CheckApiMetric.java b/core/src/main/java/google/registry/monitoring/whitebox/CheckApiMetric.java
similarity index 100%
rename from java/google/registry/monitoring/whitebox/CheckApiMetric.java
rename to core/src/main/java/google/registry/monitoring/whitebox/CheckApiMetric.java
diff --git a/java/google/registry/monitoring/whitebox/EppMetric.java b/core/src/main/java/google/registry/monitoring/whitebox/EppMetric.java
similarity index 100%
rename from java/google/registry/monitoring/whitebox/EppMetric.java
rename to core/src/main/java/google/registry/monitoring/whitebox/EppMetric.java
diff --git a/java/google/registry/monitoring/whitebox/StackdriverModule.java b/core/src/main/java/google/registry/monitoring/whitebox/StackdriverModule.java
similarity index 100%
rename from java/google/registry/monitoring/whitebox/StackdriverModule.java
rename to core/src/main/java/google/registry/monitoring/whitebox/StackdriverModule.java
diff --git a/java/google/registry/monitoring/whitebox/WhiteboxModule.java b/core/src/main/java/google/registry/monitoring/whitebox/WhiteboxModule.java
similarity index 100%
rename from java/google/registry/monitoring/whitebox/WhiteboxModule.java
rename to core/src/main/java/google/registry/monitoring/whitebox/WhiteboxModule.java
diff --git a/java/google/registry/monitoring/whitebox/package-info.java b/core/src/main/java/google/registry/monitoring/whitebox/package-info.java
similarity index 100%
rename from java/google/registry/monitoring/whitebox/package-info.java
rename to core/src/main/java/google/registry/monitoring/whitebox/package-info.java
diff --git a/java/google/registry/pricing/BUILD b/core/src/main/java/google/registry/pricing/BUILD
similarity index 100%
rename from java/google/registry/pricing/BUILD
rename to core/src/main/java/google/registry/pricing/BUILD
diff --git a/java/google/registry/pricing/PricingComponent.java b/core/src/main/java/google/registry/pricing/PricingComponent.java
similarity index 100%
rename from java/google/registry/pricing/PricingComponent.java
rename to core/src/main/java/google/registry/pricing/PricingComponent.java
diff --git a/java/google/registry/pricing/PricingEngineProxy.java b/core/src/main/java/google/registry/pricing/PricingEngineProxy.java
similarity index 100%
rename from java/google/registry/pricing/PricingEngineProxy.java
rename to core/src/main/java/google/registry/pricing/PricingEngineProxy.java
diff --git a/java/google/registry/pricing/PricingModule.java b/core/src/main/java/google/registry/pricing/PricingModule.java
similarity index 100%
rename from java/google/registry/pricing/PricingModule.java
rename to core/src/main/java/google/registry/pricing/PricingModule.java
diff --git a/java/google/registry/rdap/AbstractJsonableObject.java b/core/src/main/java/google/registry/rdap/AbstractJsonableObject.java
similarity index 100%
rename from java/google/registry/rdap/AbstractJsonableObject.java
rename to core/src/main/java/google/registry/rdap/AbstractJsonableObject.java
diff --git a/java/google/registry/rdap/BUILD b/core/src/main/java/google/registry/rdap/BUILD
similarity index 100%
rename from java/google/registry/rdap/BUILD
rename to core/src/main/java/google/registry/rdap/BUILD
diff --git a/java/google/registry/rdap/Jsonable.java b/core/src/main/java/google/registry/rdap/Jsonable.java
similarity index 100%
rename from java/google/registry/rdap/Jsonable.java
rename to core/src/main/java/google/registry/rdap/Jsonable.java
diff --git a/java/google/registry/rdap/RdapActionBase.java b/core/src/main/java/google/registry/rdap/RdapActionBase.java
similarity index 100%
rename from java/google/registry/rdap/RdapActionBase.java
rename to core/src/main/java/google/registry/rdap/RdapActionBase.java
diff --git a/java/google/registry/rdap/RdapAuthorization.java b/core/src/main/java/google/registry/rdap/RdapAuthorization.java
similarity index 100%
rename from java/google/registry/rdap/RdapAuthorization.java
rename to core/src/main/java/google/registry/rdap/RdapAuthorization.java
diff --git a/java/google/registry/rdap/RdapAutnumAction.java b/core/src/main/java/google/registry/rdap/RdapAutnumAction.java
similarity index 100%
rename from java/google/registry/rdap/RdapAutnumAction.java
rename to core/src/main/java/google/registry/rdap/RdapAutnumAction.java
diff --git a/java/google/registry/rdap/RdapDataStructures.java b/core/src/main/java/google/registry/rdap/RdapDataStructures.java
similarity index 100%
rename from java/google/registry/rdap/RdapDataStructures.java
rename to core/src/main/java/google/registry/rdap/RdapDataStructures.java
diff --git a/java/google/registry/rdap/RdapDomainAction.java b/core/src/main/java/google/registry/rdap/RdapDomainAction.java
similarity index 100%
rename from java/google/registry/rdap/RdapDomainAction.java
rename to core/src/main/java/google/registry/rdap/RdapDomainAction.java
diff --git a/java/google/registry/rdap/RdapDomainSearchAction.java b/core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java
similarity index 100%
rename from java/google/registry/rdap/RdapDomainSearchAction.java
rename to core/src/main/java/google/registry/rdap/RdapDomainSearchAction.java
diff --git a/java/google/registry/rdap/RdapEntityAction.java b/core/src/main/java/google/registry/rdap/RdapEntityAction.java
similarity index 100%
rename from java/google/registry/rdap/RdapEntityAction.java
rename to core/src/main/java/google/registry/rdap/RdapEntityAction.java
diff --git a/java/google/registry/rdap/RdapEntitySearchAction.java b/core/src/main/java/google/registry/rdap/RdapEntitySearchAction.java
similarity index 100%
rename from java/google/registry/rdap/RdapEntitySearchAction.java
rename to core/src/main/java/google/registry/rdap/RdapEntitySearchAction.java
diff --git a/java/google/registry/rdap/RdapHelpAction.java b/core/src/main/java/google/registry/rdap/RdapHelpAction.java
similarity index 100%
rename from java/google/registry/rdap/RdapHelpAction.java
rename to core/src/main/java/google/registry/rdap/RdapHelpAction.java
diff --git a/java/google/registry/rdap/RdapIcannStandardInformation.java b/core/src/main/java/google/registry/rdap/RdapIcannStandardInformation.java
similarity index 100%
rename from java/google/registry/rdap/RdapIcannStandardInformation.java
rename to core/src/main/java/google/registry/rdap/RdapIcannStandardInformation.java
diff --git a/java/google/registry/rdap/RdapIpAction.java b/core/src/main/java/google/registry/rdap/RdapIpAction.java
similarity index 100%
rename from java/google/registry/rdap/RdapIpAction.java
rename to core/src/main/java/google/registry/rdap/RdapIpAction.java
diff --git a/java/google/registry/rdap/RdapJsonFormatter.java b/core/src/main/java/google/registry/rdap/RdapJsonFormatter.java
similarity index 100%
rename from java/google/registry/rdap/RdapJsonFormatter.java
rename to core/src/main/java/google/registry/rdap/RdapJsonFormatter.java
diff --git a/java/google/registry/rdap/RdapMetrics.java b/core/src/main/java/google/registry/rdap/RdapMetrics.java
similarity index 100%
rename from java/google/registry/rdap/RdapMetrics.java
rename to core/src/main/java/google/registry/rdap/RdapMetrics.java
diff --git a/java/google/registry/rdap/RdapModule.java b/core/src/main/java/google/registry/rdap/RdapModule.java
similarity index 100%
rename from java/google/registry/rdap/RdapModule.java
rename to core/src/main/java/google/registry/rdap/RdapModule.java
diff --git a/java/google/registry/rdap/RdapNameserverAction.java b/core/src/main/java/google/registry/rdap/RdapNameserverAction.java
similarity index 100%
rename from java/google/registry/rdap/RdapNameserverAction.java
rename to core/src/main/java/google/registry/rdap/RdapNameserverAction.java
diff --git a/java/google/registry/rdap/RdapNameserverSearchAction.java b/core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java
similarity index 100%
rename from java/google/registry/rdap/RdapNameserverSearchAction.java
rename to core/src/main/java/google/registry/rdap/RdapNameserverSearchAction.java
diff --git a/java/google/registry/rdap/RdapObjectClasses.java b/core/src/main/java/google/registry/rdap/RdapObjectClasses.java
similarity index 100%
rename from java/google/registry/rdap/RdapObjectClasses.java
rename to core/src/main/java/google/registry/rdap/RdapObjectClasses.java
diff --git a/java/google/registry/rdap/RdapResultSet.java b/core/src/main/java/google/registry/rdap/RdapResultSet.java
similarity index 100%
rename from java/google/registry/rdap/RdapResultSet.java
rename to core/src/main/java/google/registry/rdap/RdapResultSet.java
diff --git a/java/google/registry/rdap/RdapSearchActionBase.java b/core/src/main/java/google/registry/rdap/RdapSearchActionBase.java
similarity index 100%
rename from java/google/registry/rdap/RdapSearchActionBase.java
rename to core/src/main/java/google/registry/rdap/RdapSearchActionBase.java
diff --git a/java/google/registry/rdap/RdapSearchPattern.java b/core/src/main/java/google/registry/rdap/RdapSearchPattern.java
similarity index 100%
rename from java/google/registry/rdap/RdapSearchPattern.java
rename to core/src/main/java/google/registry/rdap/RdapSearchPattern.java
diff --git a/java/google/registry/rdap/RdapSearchResults.java b/core/src/main/java/google/registry/rdap/RdapSearchResults.java
similarity index 100%
rename from java/google/registry/rdap/RdapSearchResults.java
rename to core/src/main/java/google/registry/rdap/RdapSearchResults.java
diff --git a/java/google/registry/rdap/RdapUtils.java b/core/src/main/java/google/registry/rdap/RdapUtils.java
similarity index 100%
rename from java/google/registry/rdap/RdapUtils.java
rename to core/src/main/java/google/registry/rdap/RdapUtils.java
diff --git a/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java b/core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java
similarity index 100%
rename from java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java
rename to core/src/main/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsAction.java
diff --git a/java/google/registry/rde/BUILD b/core/src/main/java/google/registry/rde/BUILD
similarity index 100%
rename from java/google/registry/rde/BUILD
rename to core/src/main/java/google/registry/rde/BUILD
diff --git a/java/google/registry/rde/BrdaCopyAction.java b/core/src/main/java/google/registry/rde/BrdaCopyAction.java
similarity index 100%
rename from java/google/registry/rde/BrdaCopyAction.java
rename to core/src/main/java/google/registry/rde/BrdaCopyAction.java
diff --git a/java/google/registry/rde/ContactResourceToXjcConverter.java b/core/src/main/java/google/registry/rde/ContactResourceToXjcConverter.java
similarity index 100%
rename from java/google/registry/rde/ContactResourceToXjcConverter.java
rename to core/src/main/java/google/registry/rde/ContactResourceToXjcConverter.java
diff --git a/java/google/registry/rde/DepositFragment.java b/core/src/main/java/google/registry/rde/DepositFragment.java
similarity index 100%
rename from java/google/registry/rde/DepositFragment.java
rename to core/src/main/java/google/registry/rde/DepositFragment.java
diff --git a/java/google/registry/rde/DomainBaseToXjcConverter.java b/core/src/main/java/google/registry/rde/DomainBaseToXjcConverter.java
similarity index 100%
rename from java/google/registry/rde/DomainBaseToXjcConverter.java
rename to core/src/main/java/google/registry/rde/DomainBaseToXjcConverter.java
diff --git a/java/google/registry/rde/EscrowTaskRunner.java b/core/src/main/java/google/registry/rde/EscrowTaskRunner.java
similarity index 100%
rename from java/google/registry/rde/EscrowTaskRunner.java
rename to core/src/main/java/google/registry/rde/EscrowTaskRunner.java
diff --git a/java/google/registry/rde/Ghostryde.java b/core/src/main/java/google/registry/rde/Ghostryde.java
similarity index 100%
rename from java/google/registry/rde/Ghostryde.java
rename to core/src/main/java/google/registry/rde/Ghostryde.java
diff --git a/java/google/registry/rde/HostResourceToXjcConverter.java b/core/src/main/java/google/registry/rde/HostResourceToXjcConverter.java
similarity index 100%
rename from java/google/registry/rde/HostResourceToXjcConverter.java
rename to core/src/main/java/google/registry/rde/HostResourceToXjcConverter.java
diff --git a/java/google/registry/rde/JSchModule.java b/core/src/main/java/google/registry/rde/JSchModule.java
similarity index 100%
rename from java/google/registry/rde/JSchModule.java
rename to core/src/main/java/google/registry/rde/JSchModule.java
diff --git a/java/google/registry/rde/JSchSftpChannel.java b/core/src/main/java/google/registry/rde/JSchSftpChannel.java
similarity index 100%
rename from java/google/registry/rde/JSchSftpChannel.java
rename to core/src/main/java/google/registry/rde/JSchSftpChannel.java
diff --git a/java/google/registry/rde/JSchSshSession.java b/core/src/main/java/google/registry/rde/JSchSshSession.java
similarity index 100%
rename from java/google/registry/rde/JSchSshSession.java
rename to core/src/main/java/google/registry/rde/JSchSshSession.java
diff --git a/java/google/registry/rde/LoggingSftpProgressMonitor.java b/core/src/main/java/google/registry/rde/LoggingSftpProgressMonitor.java
similarity index 100%
rename from java/google/registry/rde/LoggingSftpProgressMonitor.java
rename to core/src/main/java/google/registry/rde/LoggingSftpProgressMonitor.java
diff --git a/java/google/registry/rde/PendingDeposit.java b/core/src/main/java/google/registry/rde/PendingDeposit.java
similarity index 100%
rename from java/google/registry/rde/PendingDeposit.java
rename to core/src/main/java/google/registry/rde/PendingDeposit.java
diff --git a/java/google/registry/rde/PendingDepositChecker.java b/core/src/main/java/google/registry/rde/PendingDepositChecker.java
similarity index 100%
rename from java/google/registry/rde/PendingDepositChecker.java
rename to core/src/main/java/google/registry/rde/PendingDepositChecker.java
diff --git a/java/google/registry/rde/PgpUtils.java b/core/src/main/java/google/registry/rde/PgpUtils.java
similarity index 100%
rename from java/google/registry/rde/PgpUtils.java
rename to core/src/main/java/google/registry/rde/PgpUtils.java
diff --git a/java/google/registry/rde/RdeAdapter.java b/core/src/main/java/google/registry/rde/RdeAdapter.java
similarity index 100%
rename from java/google/registry/rde/RdeAdapter.java
rename to core/src/main/java/google/registry/rde/RdeAdapter.java
diff --git a/java/google/registry/rde/RdeCounter.java b/core/src/main/java/google/registry/rde/RdeCounter.java
similarity index 100%
rename from java/google/registry/rde/RdeCounter.java
rename to core/src/main/java/google/registry/rde/RdeCounter.java
diff --git a/java/google/registry/rde/RdeMarshaller.java b/core/src/main/java/google/registry/rde/RdeMarshaller.java
similarity index 100%
rename from java/google/registry/rde/RdeMarshaller.java
rename to core/src/main/java/google/registry/rde/RdeMarshaller.java
diff --git a/java/google/registry/rde/RdeModule.java b/core/src/main/java/google/registry/rde/RdeModule.java
similarity index 100%
rename from java/google/registry/rde/RdeModule.java
rename to core/src/main/java/google/registry/rde/RdeModule.java
diff --git a/java/google/registry/rde/RdeReportAction.java b/core/src/main/java/google/registry/rde/RdeReportAction.java
similarity index 100%
rename from java/google/registry/rde/RdeReportAction.java
rename to core/src/main/java/google/registry/rde/RdeReportAction.java
diff --git a/java/google/registry/rde/RdeReporter.java b/core/src/main/java/google/registry/rde/RdeReporter.java
similarity index 100%
rename from java/google/registry/rde/RdeReporter.java
rename to core/src/main/java/google/registry/rde/RdeReporter.java
diff --git a/java/google/registry/rde/RdeResourceType.java b/core/src/main/java/google/registry/rde/RdeResourceType.java
similarity index 100%
rename from java/google/registry/rde/RdeResourceType.java
rename to core/src/main/java/google/registry/rde/RdeResourceType.java
diff --git a/java/google/registry/rde/RdeStagingAction.java b/core/src/main/java/google/registry/rde/RdeStagingAction.java
similarity index 100%
rename from java/google/registry/rde/RdeStagingAction.java
rename to core/src/main/java/google/registry/rde/RdeStagingAction.java
diff --git a/java/google/registry/rde/RdeStagingMapper.java b/core/src/main/java/google/registry/rde/RdeStagingMapper.java
similarity index 100%
rename from java/google/registry/rde/RdeStagingMapper.java
rename to core/src/main/java/google/registry/rde/RdeStagingMapper.java
diff --git a/java/google/registry/rde/RdeStagingReducer.java b/core/src/main/java/google/registry/rde/RdeStagingReducer.java
similarity index 100%
rename from java/google/registry/rde/RdeStagingReducer.java
rename to core/src/main/java/google/registry/rde/RdeStagingReducer.java
diff --git a/java/google/registry/rde/RdeUploadAction.java b/core/src/main/java/google/registry/rde/RdeUploadAction.java
similarity index 100%
rename from java/google/registry/rde/RdeUploadAction.java
rename to core/src/main/java/google/registry/rde/RdeUploadAction.java
diff --git a/java/google/registry/rde/RdeUploadUrl.java b/core/src/main/java/google/registry/rde/RdeUploadUrl.java
similarity index 100%
rename from java/google/registry/rde/RdeUploadUrl.java
rename to core/src/main/java/google/registry/rde/RdeUploadUrl.java
diff --git a/java/google/registry/rde/RdeUtil.java b/core/src/main/java/google/registry/rde/RdeUtil.java
similarity index 100%
rename from java/google/registry/rde/RdeUtil.java
rename to core/src/main/java/google/registry/rde/RdeUtil.java
diff --git a/java/google/registry/rde/RegistrarToXjcConverter.java b/core/src/main/java/google/registry/rde/RegistrarToXjcConverter.java
similarity index 100%
rename from java/google/registry/rde/RegistrarToXjcConverter.java
rename to core/src/main/java/google/registry/rde/RegistrarToXjcConverter.java
diff --git a/java/google/registry/rde/RydeCompression.java b/core/src/main/java/google/registry/rde/RydeCompression.java
similarity index 100%
rename from java/google/registry/rde/RydeCompression.java
rename to core/src/main/java/google/registry/rde/RydeCompression.java
diff --git a/java/google/registry/rde/RydeEncoder.java b/core/src/main/java/google/registry/rde/RydeEncoder.java
similarity index 100%
rename from java/google/registry/rde/RydeEncoder.java
rename to core/src/main/java/google/registry/rde/RydeEncoder.java
diff --git a/java/google/registry/rde/RydeEncryption.java b/core/src/main/java/google/registry/rde/RydeEncryption.java
similarity index 100%
rename from java/google/registry/rde/RydeEncryption.java
rename to core/src/main/java/google/registry/rde/RydeEncryption.java
diff --git a/java/google/registry/rde/RydeFileEncoding.java b/core/src/main/java/google/registry/rde/RydeFileEncoding.java
similarity index 100%
rename from java/google/registry/rde/RydeFileEncoding.java
rename to core/src/main/java/google/registry/rde/RydeFileEncoding.java
diff --git a/java/google/registry/rde/RydePgpSigningOutputStream.java b/core/src/main/java/google/registry/rde/RydePgpSigningOutputStream.java
similarity index 100%
rename from java/google/registry/rde/RydePgpSigningOutputStream.java
rename to core/src/main/java/google/registry/rde/RydePgpSigningOutputStream.java
diff --git a/java/google/registry/rde/RydeTar.java b/core/src/main/java/google/registry/rde/RydeTar.java
similarity index 100%
rename from java/google/registry/rde/RydeTar.java
rename to core/src/main/java/google/registry/rde/RydeTar.java
diff --git a/java/google/registry/rde/package-info.java b/core/src/main/java/google/registry/rde/package-info.java
similarity index 100%
rename from java/google/registry/rde/package-info.java
rename to core/src/main/java/google/registry/rde/package-info.java
diff --git a/java/google/registry/reporting/BUILD b/core/src/main/java/google/registry/reporting/BUILD
similarity index 100%
rename from java/google/registry/reporting/BUILD
rename to core/src/main/java/google/registry/reporting/BUILD
diff --git a/java/google/registry/reporting/ReportingModule.java b/core/src/main/java/google/registry/reporting/ReportingModule.java
similarity index 100%
rename from java/google/registry/reporting/ReportingModule.java
rename to core/src/main/java/google/registry/reporting/ReportingModule.java
diff --git a/java/google/registry/reporting/ReportingUtils.java b/core/src/main/java/google/registry/reporting/ReportingUtils.java
similarity index 100%
rename from java/google/registry/reporting/ReportingUtils.java
rename to core/src/main/java/google/registry/reporting/ReportingUtils.java
diff --git a/java/google/registry/reporting/billing/BUILD b/core/src/main/java/google/registry/reporting/billing/BUILD
similarity index 100%
rename from java/google/registry/reporting/billing/BUILD
rename to core/src/main/java/google/registry/reporting/billing/BUILD
diff --git a/java/google/registry/reporting/billing/BillingEmailUtils.java b/core/src/main/java/google/registry/reporting/billing/BillingEmailUtils.java
similarity index 100%
rename from java/google/registry/reporting/billing/BillingEmailUtils.java
rename to core/src/main/java/google/registry/reporting/billing/BillingEmailUtils.java
diff --git a/java/google/registry/reporting/billing/BillingModule.java b/core/src/main/java/google/registry/reporting/billing/BillingModule.java
similarity index 100%
rename from java/google/registry/reporting/billing/BillingModule.java
rename to core/src/main/java/google/registry/reporting/billing/BillingModule.java
diff --git a/java/google/registry/reporting/billing/CopyDetailReportsAction.java b/core/src/main/java/google/registry/reporting/billing/CopyDetailReportsAction.java
similarity index 100%
rename from java/google/registry/reporting/billing/CopyDetailReportsAction.java
rename to core/src/main/java/google/registry/reporting/billing/CopyDetailReportsAction.java
diff --git a/java/google/registry/reporting/billing/GenerateInvoicesAction.java b/core/src/main/java/google/registry/reporting/billing/GenerateInvoicesAction.java
similarity index 100%
rename from java/google/registry/reporting/billing/GenerateInvoicesAction.java
rename to core/src/main/java/google/registry/reporting/billing/GenerateInvoicesAction.java
diff --git a/java/google/registry/reporting/billing/PublishInvoicesAction.java b/core/src/main/java/google/registry/reporting/billing/PublishInvoicesAction.java
similarity index 100%
rename from java/google/registry/reporting/billing/PublishInvoicesAction.java
rename to core/src/main/java/google/registry/reporting/billing/PublishInvoicesAction.java
diff --git a/java/google/registry/reporting/icann/ActivityReportingQueryBuilder.java b/core/src/main/java/google/registry/reporting/icann/ActivityReportingQueryBuilder.java
similarity index 100%
rename from java/google/registry/reporting/icann/ActivityReportingQueryBuilder.java
rename to core/src/main/java/google/registry/reporting/icann/ActivityReportingQueryBuilder.java
diff --git a/java/google/registry/reporting/icann/BUILD b/core/src/main/java/google/registry/reporting/icann/BUILD
similarity index 100%
rename from java/google/registry/reporting/icann/BUILD
rename to core/src/main/java/google/registry/reporting/icann/BUILD
diff --git a/java/google/registry/reporting/icann/BasicDnsCountQueryCoordinator.java b/core/src/main/java/google/registry/reporting/icann/BasicDnsCountQueryCoordinator.java
similarity index 100%
rename from java/google/registry/reporting/icann/BasicDnsCountQueryCoordinator.java
rename to core/src/main/java/google/registry/reporting/icann/BasicDnsCountQueryCoordinator.java
diff --git a/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java b/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java
similarity index 100%
rename from java/google/registry/reporting/icann/DnsCountQueryCoordinator.java
rename to core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinator.java
diff --git a/java/google/registry/reporting/icann/DnsCountQueryCoordinatorModule.java b/core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinatorModule.java
similarity index 100%
rename from java/google/registry/reporting/icann/DnsCountQueryCoordinatorModule.java
rename to core/src/main/java/google/registry/reporting/icann/DnsCountQueryCoordinatorModule.java
diff --git a/java/google/registry/reporting/icann/IcannHttpReporter.java b/core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java
similarity index 100%
rename from java/google/registry/reporting/icann/IcannHttpReporter.java
rename to core/src/main/java/google/registry/reporting/icann/IcannHttpReporter.java
diff --git a/java/google/registry/reporting/icann/IcannReportingModule.java b/core/src/main/java/google/registry/reporting/icann/IcannReportingModule.java
similarity index 100%
rename from java/google/registry/reporting/icann/IcannReportingModule.java
rename to core/src/main/java/google/registry/reporting/icann/IcannReportingModule.java
diff --git a/java/google/registry/reporting/icann/IcannReportingStager.java b/core/src/main/java/google/registry/reporting/icann/IcannReportingStager.java
similarity index 100%
rename from java/google/registry/reporting/icann/IcannReportingStager.java
rename to core/src/main/java/google/registry/reporting/icann/IcannReportingStager.java
diff --git a/java/google/registry/reporting/icann/IcannReportingStagingAction.java b/core/src/main/java/google/registry/reporting/icann/IcannReportingStagingAction.java
similarity index 100%
rename from java/google/registry/reporting/icann/IcannReportingStagingAction.java
rename to core/src/main/java/google/registry/reporting/icann/IcannReportingStagingAction.java
diff --git a/java/google/registry/reporting/icann/IcannReportingUploadAction.java b/core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java
similarity index 100%
rename from java/google/registry/reporting/icann/IcannReportingUploadAction.java
rename to core/src/main/java/google/registry/reporting/icann/IcannReportingUploadAction.java
diff --git a/java/google/registry/reporting/icann/QueryBuilder.java b/core/src/main/java/google/registry/reporting/icann/QueryBuilder.java
similarity index 100%
rename from java/google/registry/reporting/icann/QueryBuilder.java
rename to core/src/main/java/google/registry/reporting/icann/QueryBuilder.java
diff --git a/java/google/registry/reporting/icann/QueryBuilderUtils.java b/core/src/main/java/google/registry/reporting/icann/QueryBuilderUtils.java
similarity index 100%
rename from java/google/registry/reporting/icann/QueryBuilderUtils.java
rename to core/src/main/java/google/registry/reporting/icann/QueryBuilderUtils.java
diff --git a/java/google/registry/reporting/icann/TransactionsReportingQueryBuilder.java b/core/src/main/java/google/registry/reporting/icann/TransactionsReportingQueryBuilder.java
similarity index 100%
rename from java/google/registry/reporting/icann/TransactionsReportingQueryBuilder.java
rename to core/src/main/java/google/registry/reporting/icann/TransactionsReportingQueryBuilder.java
diff --git a/java/google/registry/reporting/icann/sql/activity_report_aggregation.sql b/core/src/main/java/google/registry/reporting/icann/sql/activity_report_aggregation.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/activity_report_aggregation.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/activity_report_aggregation.sql
diff --git a/java/google/registry/reporting/icann/sql/attempted_adds.sql b/core/src/main/java/google/registry/reporting/icann/sql/attempted_adds.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/attempted_adds.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/attempted_adds.sql
diff --git a/java/google/registry/reporting/icann/sql/dns_counts.sql b/core/src/main/java/google/registry/reporting/icann/sql/dns_counts.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/dns_counts.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/dns_counts.sql
diff --git a/java/google/registry/reporting/icann/sql/epp_metrics.sql b/core/src/main/java/google/registry/reporting/icann/sql/epp_metrics.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/epp_metrics.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/epp_metrics.sql
diff --git a/java/google/registry/reporting/icann/sql/monthly_logs.sql b/core/src/main/java/google/registry/reporting/icann/sql/monthly_logs.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/monthly_logs.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/monthly_logs.sql
diff --git a/java/google/registry/reporting/icann/sql/registrar_iana_id.sql b/core/src/main/java/google/registry/reporting/icann/sql/registrar_iana_id.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/registrar_iana_id.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/registrar_iana_id.sql
diff --git a/java/google/registry/reporting/icann/sql/registrar_operating_status.sql b/core/src/main/java/google/registry/reporting/icann/sql/registrar_operating_status.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/registrar_operating_status.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/registrar_operating_status.sql
diff --git a/java/google/registry/reporting/icann/sql/total_domains.sql b/core/src/main/java/google/registry/reporting/icann/sql/total_domains.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/total_domains.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/total_domains.sql
diff --git a/java/google/registry/reporting/icann/sql/total_nameservers.sql b/core/src/main/java/google/registry/reporting/icann/sql/total_nameservers.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/total_nameservers.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/total_nameservers.sql
diff --git a/java/google/registry/reporting/icann/sql/transaction_counts.sql b/core/src/main/java/google/registry/reporting/icann/sql/transaction_counts.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/transaction_counts.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/transaction_counts.sql
diff --git a/java/google/registry/reporting/icann/sql/transactions_report_aggregation.sql b/core/src/main/java/google/registry/reporting/icann/sql/transactions_report_aggregation.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/transactions_report_aggregation.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/transactions_report_aggregation.sql
diff --git a/java/google/registry/reporting/icann/sql/whois_counts.sql b/core/src/main/java/google/registry/reporting/icann/sql/whois_counts.sql
similarity index 100%
rename from java/google/registry/reporting/icann/sql/whois_counts.sql
rename to core/src/main/java/google/registry/reporting/icann/sql/whois_counts.sql
diff --git a/java/google/registry/reporting/spec11/BUILD b/core/src/main/java/google/registry/reporting/spec11/BUILD
similarity index 100%
rename from java/google/registry/reporting/spec11/BUILD
rename to core/src/main/java/google/registry/reporting/spec11/BUILD
diff --git a/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java b/core/src/main/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java
similarity index 100%
rename from java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java
rename to core/src/main/java/google/registry/reporting/spec11/GenerateSpec11ReportAction.java
diff --git a/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java b/core/src/main/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java
similarity index 100%
rename from java/google/registry/reporting/spec11/PublishSpec11ReportAction.java
rename to core/src/main/java/google/registry/reporting/spec11/PublishSpec11ReportAction.java
diff --git a/java/google/registry/reporting/spec11/RegistrarThreatMatches.java b/core/src/main/java/google/registry/reporting/spec11/RegistrarThreatMatches.java
similarity index 100%
rename from java/google/registry/reporting/spec11/RegistrarThreatMatches.java
rename to core/src/main/java/google/registry/reporting/spec11/RegistrarThreatMatches.java
diff --git a/java/google/registry/reporting/spec11/Spec11EmailUtils.java b/core/src/main/java/google/registry/reporting/spec11/Spec11EmailUtils.java
similarity index 100%
rename from java/google/registry/reporting/spec11/Spec11EmailUtils.java
rename to core/src/main/java/google/registry/reporting/spec11/Spec11EmailUtils.java
diff --git a/java/google/registry/reporting/spec11/Spec11Module.java b/core/src/main/java/google/registry/reporting/spec11/Spec11Module.java
similarity index 100%
rename from java/google/registry/reporting/spec11/Spec11Module.java
rename to core/src/main/java/google/registry/reporting/spec11/Spec11Module.java
diff --git a/java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParser.java b/core/src/main/java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParser.java
similarity index 100%
rename from java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParser.java
rename to core/src/main/java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParser.java
diff --git a/java/google/registry/reporting/spec11/soy/BUILD b/core/src/main/java/google/registry/reporting/spec11/soy/BUILD
similarity index 100%
rename from java/google/registry/reporting/spec11/soy/BUILD
rename to core/src/main/java/google/registry/reporting/spec11/soy/BUILD
diff --git a/java/google/registry/reporting/spec11/soy/Spec11Email.soy b/core/src/main/java/google/registry/reporting/spec11/soy/Spec11Email.soy
similarity index 100%
rename from java/google/registry/reporting/spec11/soy/Spec11Email.soy
rename to core/src/main/java/google/registry/reporting/spec11/soy/Spec11Email.soy
diff --git a/java/google/registry/repositories.bzl b/core/src/main/java/google/registry/repositories.bzl
similarity index 100%
rename from java/google/registry/repositories.bzl
rename to core/src/main/java/google/registry/repositories.bzl
diff --git a/java/google/registry/request/Action.java b/core/src/main/java/google/registry/request/Action.java
similarity index 100%
rename from java/google/registry/request/Action.java
rename to core/src/main/java/google/registry/request/Action.java
diff --git a/java/google/registry/request/Actions.java b/core/src/main/java/google/registry/request/Actions.java
similarity index 100%
rename from java/google/registry/request/Actions.java
rename to core/src/main/java/google/registry/request/Actions.java
diff --git a/java/google/registry/request/BUILD b/core/src/main/java/google/registry/request/BUILD
similarity index 100%
rename from java/google/registry/request/BUILD
rename to core/src/main/java/google/registry/request/BUILD
diff --git a/java/google/registry/request/FullServletPath.java b/core/src/main/java/google/registry/request/FullServletPath.java
similarity index 100%
rename from java/google/registry/request/FullServletPath.java
rename to core/src/main/java/google/registry/request/FullServletPath.java
diff --git a/java/google/registry/request/Header.java b/core/src/main/java/google/registry/request/Header.java
similarity index 100%
rename from java/google/registry/request/Header.java
rename to core/src/main/java/google/registry/request/Header.java
diff --git a/java/google/registry/request/HttpException.java b/core/src/main/java/google/registry/request/HttpException.java
similarity index 100%
rename from java/google/registry/request/HttpException.java
rename to core/src/main/java/google/registry/request/HttpException.java
diff --git a/java/google/registry/request/JsonActionRunner.java b/core/src/main/java/google/registry/request/JsonActionRunner.java
similarity index 100%
rename from java/google/registry/request/JsonActionRunner.java
rename to core/src/main/java/google/registry/request/JsonActionRunner.java
diff --git a/java/google/registry/request/JsonPayload.java b/core/src/main/java/google/registry/request/JsonPayload.java
similarity index 100%
rename from java/google/registry/request/JsonPayload.java
rename to core/src/main/java/google/registry/request/JsonPayload.java
diff --git a/java/google/registry/request/JsonResponse.java b/core/src/main/java/google/registry/request/JsonResponse.java
similarity index 100%
rename from java/google/registry/request/JsonResponse.java
rename to core/src/main/java/google/registry/request/JsonResponse.java
diff --git a/java/google/registry/request/Modules.java b/core/src/main/java/google/registry/request/Modules.java
similarity index 100%
rename from java/google/registry/request/Modules.java
rename to core/src/main/java/google/registry/request/Modules.java
diff --git a/java/google/registry/request/Parameter.java b/core/src/main/java/google/registry/request/Parameter.java
similarity index 100%
rename from java/google/registry/request/Parameter.java
rename to core/src/main/java/google/registry/request/Parameter.java
diff --git a/java/google/registry/request/ParameterMap.java b/core/src/main/java/google/registry/request/ParameterMap.java
similarity index 100%
rename from java/google/registry/request/ParameterMap.java
rename to core/src/main/java/google/registry/request/ParameterMap.java
diff --git a/java/google/registry/request/Payload.java b/core/src/main/java/google/registry/request/Payload.java
similarity index 100%
rename from java/google/registry/request/Payload.java
rename to core/src/main/java/google/registry/request/Payload.java
diff --git a/java/google/registry/request/RequestComponentBuilder.java b/core/src/main/java/google/registry/request/RequestComponentBuilder.java
similarity index 100%
rename from java/google/registry/request/RequestComponentBuilder.java
rename to core/src/main/java/google/registry/request/RequestComponentBuilder.java
diff --git a/java/google/registry/request/RequestHandler.java b/core/src/main/java/google/registry/request/RequestHandler.java
similarity index 100%
rename from java/google/registry/request/RequestHandler.java
rename to core/src/main/java/google/registry/request/RequestHandler.java
diff --git a/java/google/registry/request/RequestLogId.java b/core/src/main/java/google/registry/request/RequestLogId.java
similarity index 100%
rename from java/google/registry/request/RequestLogId.java
rename to core/src/main/java/google/registry/request/RequestLogId.java
diff --git a/java/google/registry/request/RequestMethod.java b/core/src/main/java/google/registry/request/RequestMethod.java
similarity index 100%
rename from java/google/registry/request/RequestMethod.java
rename to core/src/main/java/google/registry/request/RequestMethod.java
diff --git a/java/google/registry/request/RequestMetrics.java b/core/src/main/java/google/registry/request/RequestMetrics.java
similarity index 100%
rename from java/google/registry/request/RequestMetrics.java
rename to core/src/main/java/google/registry/request/RequestMetrics.java
diff --git a/java/google/registry/request/RequestModule.java b/core/src/main/java/google/registry/request/RequestModule.java
similarity index 100%
rename from java/google/registry/request/RequestModule.java
rename to core/src/main/java/google/registry/request/RequestModule.java
diff --git a/java/google/registry/request/RequestParameters.java b/core/src/main/java/google/registry/request/RequestParameters.java
similarity index 100%
rename from java/google/registry/request/RequestParameters.java
rename to core/src/main/java/google/registry/request/RequestParameters.java
diff --git a/java/google/registry/request/RequestPath.java b/core/src/main/java/google/registry/request/RequestPath.java
similarity index 100%
rename from java/google/registry/request/RequestPath.java
rename to core/src/main/java/google/registry/request/RequestPath.java
diff --git a/java/google/registry/request/RequestScope.java b/core/src/main/java/google/registry/request/RequestScope.java
similarity index 100%
rename from java/google/registry/request/RequestScope.java
rename to core/src/main/java/google/registry/request/RequestScope.java
diff --git a/java/google/registry/request/RequestUrl.java b/core/src/main/java/google/registry/request/RequestUrl.java
similarity index 100%
rename from java/google/registry/request/RequestUrl.java
rename to core/src/main/java/google/registry/request/RequestUrl.java
diff --git a/java/google/registry/request/Response.java b/core/src/main/java/google/registry/request/Response.java
similarity index 100%
rename from java/google/registry/request/Response.java
rename to core/src/main/java/google/registry/request/Response.java
diff --git a/java/google/registry/request/ResponseImpl.java b/core/src/main/java/google/registry/request/ResponseImpl.java
similarity index 100%
rename from java/google/registry/request/ResponseImpl.java
rename to core/src/main/java/google/registry/request/ResponseImpl.java
diff --git a/java/google/registry/request/Route.java b/core/src/main/java/google/registry/request/Route.java
similarity index 100%
rename from java/google/registry/request/Route.java
rename to core/src/main/java/google/registry/request/Route.java
diff --git a/java/google/registry/request/Router.java b/core/src/main/java/google/registry/request/Router.java
similarity index 100%
rename from java/google/registry/request/Router.java
rename to core/src/main/java/google/registry/request/Router.java
diff --git a/java/google/registry/request/RouterDisplayHelper.java b/core/src/main/java/google/registry/request/RouterDisplayHelper.java
similarity index 100%
rename from java/google/registry/request/RouterDisplayHelper.java
rename to core/src/main/java/google/registry/request/RouterDisplayHelper.java
diff --git a/java/google/registry/request/auth/AppEngineInternalAuthenticationMechanism.java b/core/src/main/java/google/registry/request/auth/AppEngineInternalAuthenticationMechanism.java
similarity index 100%
rename from java/google/registry/request/auth/AppEngineInternalAuthenticationMechanism.java
rename to core/src/main/java/google/registry/request/auth/AppEngineInternalAuthenticationMechanism.java
diff --git a/java/google/registry/request/auth/Auth.java b/core/src/main/java/google/registry/request/auth/Auth.java
similarity index 100%
rename from java/google/registry/request/auth/Auth.java
rename to core/src/main/java/google/registry/request/auth/Auth.java
diff --git a/java/google/registry/request/auth/AuthLevel.java b/core/src/main/java/google/registry/request/auth/AuthLevel.java
similarity index 100%
rename from java/google/registry/request/auth/AuthLevel.java
rename to core/src/main/java/google/registry/request/auth/AuthLevel.java
diff --git a/java/google/registry/request/auth/AuthModule.java b/core/src/main/java/google/registry/request/auth/AuthModule.java
similarity index 100%
rename from java/google/registry/request/auth/AuthModule.java
rename to core/src/main/java/google/registry/request/auth/AuthModule.java
diff --git a/java/google/registry/request/auth/AuthResult.java b/core/src/main/java/google/registry/request/auth/AuthResult.java
similarity index 100%
rename from java/google/registry/request/auth/AuthResult.java
rename to core/src/main/java/google/registry/request/auth/AuthResult.java
diff --git a/java/google/registry/request/auth/AuthenticatedRegistrarAccessor.java b/core/src/main/java/google/registry/request/auth/AuthenticatedRegistrarAccessor.java
similarity index 100%
rename from java/google/registry/request/auth/AuthenticatedRegistrarAccessor.java
rename to core/src/main/java/google/registry/request/auth/AuthenticatedRegistrarAccessor.java
diff --git a/java/google/registry/request/auth/AuthenticationMechanism.java b/core/src/main/java/google/registry/request/auth/AuthenticationMechanism.java
similarity index 100%
rename from java/google/registry/request/auth/AuthenticationMechanism.java
rename to core/src/main/java/google/registry/request/auth/AuthenticationMechanism.java
diff --git a/java/google/registry/request/auth/BUILD b/core/src/main/java/google/registry/request/auth/BUILD
similarity index 100%
rename from java/google/registry/request/auth/BUILD
rename to core/src/main/java/google/registry/request/auth/BUILD
diff --git a/java/google/registry/request/auth/LegacyAuthenticationMechanism.java b/core/src/main/java/google/registry/request/auth/LegacyAuthenticationMechanism.java
similarity index 100%
rename from java/google/registry/request/auth/LegacyAuthenticationMechanism.java
rename to core/src/main/java/google/registry/request/auth/LegacyAuthenticationMechanism.java
diff --git a/java/google/registry/request/auth/OAuthAuthenticationMechanism.java b/core/src/main/java/google/registry/request/auth/OAuthAuthenticationMechanism.java
similarity index 100%
rename from java/google/registry/request/auth/OAuthAuthenticationMechanism.java
rename to core/src/main/java/google/registry/request/auth/OAuthAuthenticationMechanism.java
diff --git a/java/google/registry/request/auth/OAuthTokenInfo.java b/core/src/main/java/google/registry/request/auth/OAuthTokenInfo.java
similarity index 100%
rename from java/google/registry/request/auth/OAuthTokenInfo.java
rename to core/src/main/java/google/registry/request/auth/OAuthTokenInfo.java
diff --git a/java/google/registry/request/auth/RequestAuthenticator.java b/core/src/main/java/google/registry/request/auth/RequestAuthenticator.java
similarity index 100%
rename from java/google/registry/request/auth/RequestAuthenticator.java
rename to core/src/main/java/google/registry/request/auth/RequestAuthenticator.java
diff --git a/java/google/registry/request/auth/UserAuthInfo.java b/core/src/main/java/google/registry/request/auth/UserAuthInfo.java
similarity index 100%
rename from java/google/registry/request/auth/UserAuthInfo.java
rename to core/src/main/java/google/registry/request/auth/UserAuthInfo.java
diff --git a/java/google/registry/request/lock/BUILD b/core/src/main/java/google/registry/request/lock/BUILD
similarity index 100%
rename from java/google/registry/request/lock/BUILD
rename to core/src/main/java/google/registry/request/lock/BUILD
diff --git a/java/google/registry/request/lock/LockHandler.java b/core/src/main/java/google/registry/request/lock/LockHandler.java
similarity index 100%
rename from java/google/registry/request/lock/LockHandler.java
rename to core/src/main/java/google/registry/request/lock/LockHandler.java
diff --git a/java/google/registry/request/lock/LockHandlerImpl.java b/core/src/main/java/google/registry/request/lock/LockHandlerImpl.java
similarity index 100%
rename from java/google/registry/request/lock/LockHandlerImpl.java
rename to core/src/main/java/google/registry/request/lock/LockHandlerImpl.java
diff --git a/java/google/registry/request/package-info.java b/core/src/main/java/google/registry/request/package-info.java
similarity index 100%
rename from java/google/registry/request/package-info.java
rename to core/src/main/java/google/registry/request/package-info.java
diff --git a/java/google/registry/security/BUILD b/core/src/main/java/google/registry/security/BUILD
similarity index 100%
rename from java/google/registry/security/BUILD
rename to core/src/main/java/google/registry/security/BUILD
diff --git a/java/google/registry/security/JsonHttp.java b/core/src/main/java/google/registry/security/JsonHttp.java
similarity index 100%
rename from java/google/registry/security/JsonHttp.java
rename to core/src/main/java/google/registry/security/JsonHttp.java
diff --git a/java/google/registry/security/JsonResponseHelper.java b/core/src/main/java/google/registry/security/JsonResponseHelper.java
similarity index 100%
rename from java/google/registry/security/JsonResponseHelper.java
rename to core/src/main/java/google/registry/security/JsonResponseHelper.java
diff --git a/java/google/registry/security/XsrfTokenManager.java b/core/src/main/java/google/registry/security/XsrfTokenManager.java
similarity index 100%
rename from java/google/registry/security/XsrfTokenManager.java
rename to core/src/main/java/google/registry/security/XsrfTokenManager.java
diff --git a/java/google/registry/security/package-info.java b/core/src/main/java/google/registry/security/package-info.java
similarity index 100%
rename from java/google/registry/security/package-info.java
rename to core/src/main/java/google/registry/security/package-info.java
diff --git a/java/google/registry/storage/drive/BUILD b/core/src/main/java/google/registry/storage/drive/BUILD
similarity index 100%
rename from java/google/registry/storage/drive/BUILD
rename to core/src/main/java/google/registry/storage/drive/BUILD
diff --git a/java/google/registry/storage/drive/DriveConnection.java b/core/src/main/java/google/registry/storage/drive/DriveConnection.java
similarity index 100%
rename from java/google/registry/storage/drive/DriveConnection.java
rename to core/src/main/java/google/registry/storage/drive/DriveConnection.java
diff --git a/java/google/registry/tldconfig/idn/BUILD b/core/src/main/java/google/registry/tldconfig/idn/BUILD
similarity index 100%
rename from java/google/registry/tldconfig/idn/BUILD
rename to core/src/main/java/google/registry/tldconfig/idn/BUILD
diff --git a/java/google/registry/tldconfig/idn/IdnLabelValidator.java b/core/src/main/java/google/registry/tldconfig/idn/IdnLabelValidator.java
similarity index 100%
rename from java/google/registry/tldconfig/idn/IdnLabelValidator.java
rename to core/src/main/java/google/registry/tldconfig/idn/IdnLabelValidator.java
diff --git a/java/google/registry/tldconfig/idn/IdnTable.java b/core/src/main/java/google/registry/tldconfig/idn/IdnTable.java
similarity index 100%
rename from java/google/registry/tldconfig/idn/IdnTable.java
rename to core/src/main/java/google/registry/tldconfig/idn/IdnTable.java
diff --git a/java/google/registry/tldconfig/idn/IdnTableEnum.java b/core/src/main/java/google/registry/tldconfig/idn/IdnTableEnum.java
similarity index 100%
rename from java/google/registry/tldconfig/idn/IdnTableEnum.java
rename to core/src/main/java/google/registry/tldconfig/idn/IdnTableEnum.java
diff --git a/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java b/core/src/main/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java
similarity index 100%
rename from java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java
rename to core/src/main/java/google/registry/tldconfig/idn/JapaneseLanguageValidator.java
diff --git a/java/google/registry/tldconfig/idn/LanguageValidator.java b/core/src/main/java/google/registry/tldconfig/idn/LanguageValidator.java
similarity index 100%
rename from java/google/registry/tldconfig/idn/LanguageValidator.java
rename to core/src/main/java/google/registry/tldconfig/idn/LanguageValidator.java
diff --git a/java/google/registry/tldconfig/idn/extended_latin.txt b/core/src/main/java/google/registry/tldconfig/idn/extended_latin.txt
similarity index 100%
rename from java/google/registry/tldconfig/idn/extended_latin.txt
rename to core/src/main/java/google/registry/tldconfig/idn/extended_latin.txt
diff --git a/java/google/registry/tldconfig/idn/ja.txt b/core/src/main/java/google/registry/tldconfig/idn/ja.txt
similarity index 100%
rename from java/google/registry/tldconfig/idn/ja.txt
rename to core/src/main/java/google/registry/tldconfig/idn/ja.txt
diff --git a/java/google/registry/tmch/BUILD b/core/src/main/java/google/registry/tmch/BUILD
similarity index 100%
rename from java/google/registry/tmch/BUILD
rename to core/src/main/java/google/registry/tmch/BUILD
diff --git a/java/google/registry/tmch/ClaimsListParser.java b/core/src/main/java/google/registry/tmch/ClaimsListParser.java
similarity index 100%
rename from java/google/registry/tmch/ClaimsListParser.java
rename to core/src/main/java/google/registry/tmch/ClaimsListParser.java
diff --git a/java/google/registry/tmch/LordnLog.java b/core/src/main/java/google/registry/tmch/LordnLog.java
similarity index 100%
rename from java/google/registry/tmch/LordnLog.java
rename to core/src/main/java/google/registry/tmch/LordnLog.java
diff --git a/java/google/registry/tmch/LordnRequestInitializer.java b/core/src/main/java/google/registry/tmch/LordnRequestInitializer.java
similarity index 100%
rename from java/google/registry/tmch/LordnRequestInitializer.java
rename to core/src/main/java/google/registry/tmch/LordnRequestInitializer.java
diff --git a/java/google/registry/tmch/LordnTaskUtils.java b/core/src/main/java/google/registry/tmch/LordnTaskUtils.java
similarity index 100%
rename from java/google/registry/tmch/LordnTaskUtils.java
rename to core/src/main/java/google/registry/tmch/LordnTaskUtils.java
diff --git a/java/google/registry/tmch/Marksdb.java b/core/src/main/java/google/registry/tmch/Marksdb.java
similarity index 100%
rename from java/google/registry/tmch/Marksdb.java
rename to core/src/main/java/google/registry/tmch/Marksdb.java
diff --git a/java/google/registry/tmch/NordnUploadAction.java b/core/src/main/java/google/registry/tmch/NordnUploadAction.java
similarity index 100%
rename from java/google/registry/tmch/NordnUploadAction.java
rename to core/src/main/java/google/registry/tmch/NordnUploadAction.java
diff --git a/java/google/registry/tmch/NordnVerifyAction.java b/core/src/main/java/google/registry/tmch/NordnVerifyAction.java
similarity index 100%
rename from java/google/registry/tmch/NordnVerifyAction.java
rename to core/src/main/java/google/registry/tmch/NordnVerifyAction.java
diff --git a/java/google/registry/tmch/SmdrlCsvParser.java b/core/src/main/java/google/registry/tmch/SmdrlCsvParser.java
similarity index 100%
rename from java/google/registry/tmch/SmdrlCsvParser.java
rename to core/src/main/java/google/registry/tmch/SmdrlCsvParser.java
diff --git a/java/google/registry/tmch/TmchCertificateAuthority.java b/core/src/main/java/google/registry/tmch/TmchCertificateAuthority.java
similarity index 100%
rename from java/google/registry/tmch/TmchCertificateAuthority.java
rename to core/src/main/java/google/registry/tmch/TmchCertificateAuthority.java
diff --git a/java/google/registry/tmch/TmchCrlAction.java b/core/src/main/java/google/registry/tmch/TmchCrlAction.java
similarity index 100%
rename from java/google/registry/tmch/TmchCrlAction.java
rename to core/src/main/java/google/registry/tmch/TmchCrlAction.java
diff --git a/java/google/registry/tmch/TmchData.java b/core/src/main/java/google/registry/tmch/TmchData.java
similarity index 100%
rename from java/google/registry/tmch/TmchData.java
rename to core/src/main/java/google/registry/tmch/TmchData.java
diff --git a/java/google/registry/tmch/TmchDnlAction.java b/core/src/main/java/google/registry/tmch/TmchDnlAction.java
similarity index 100%
rename from java/google/registry/tmch/TmchDnlAction.java
rename to core/src/main/java/google/registry/tmch/TmchDnlAction.java
diff --git a/java/google/registry/tmch/TmchModule.java b/core/src/main/java/google/registry/tmch/TmchModule.java
similarity index 100%
rename from java/google/registry/tmch/TmchModule.java
rename to core/src/main/java/google/registry/tmch/TmchModule.java
diff --git a/java/google/registry/tmch/TmchSmdrlAction.java b/core/src/main/java/google/registry/tmch/TmchSmdrlAction.java
similarity index 100%
rename from java/google/registry/tmch/TmchSmdrlAction.java
rename to core/src/main/java/google/registry/tmch/TmchSmdrlAction.java
diff --git a/java/google/registry/tmch/TmchXmlSignature.java b/core/src/main/java/google/registry/tmch/TmchXmlSignature.java
similarity index 100%
rename from java/google/registry/tmch/TmchXmlSignature.java
rename to core/src/main/java/google/registry/tmch/TmchXmlSignature.java
diff --git a/java/google/registry/tmch/icann-tmch-pilot.crl b/core/src/main/java/google/registry/tmch/icann-tmch-pilot.crl
similarity index 100%
rename from java/google/registry/tmch/icann-tmch-pilot.crl
rename to core/src/main/java/google/registry/tmch/icann-tmch-pilot.crl
diff --git a/java/google/registry/tmch/icann-tmch-pilot.crt b/core/src/main/java/google/registry/tmch/icann-tmch-pilot.crt
similarity index 100%
rename from java/google/registry/tmch/icann-tmch-pilot.crt
rename to core/src/main/java/google/registry/tmch/icann-tmch-pilot.crt
diff --git a/java/google/registry/tmch/icann-tmch.crl b/core/src/main/java/google/registry/tmch/icann-tmch.crl
similarity index 100%
rename from java/google/registry/tmch/icann-tmch.crl
rename to core/src/main/java/google/registry/tmch/icann-tmch.crl
diff --git a/java/google/registry/tmch/icann-tmch.crt b/core/src/main/java/google/registry/tmch/icann-tmch.crt
similarity index 100%
rename from java/google/registry/tmch/icann-tmch.crt
rename to core/src/main/java/google/registry/tmch/icann-tmch.crt
diff --git a/java/google/registry/tmch/marksdb-public-key.asc b/core/src/main/java/google/registry/tmch/marksdb-public-key.asc
similarity index 100%
rename from java/google/registry/tmch/marksdb-public-key.asc
rename to core/src/main/java/google/registry/tmch/marksdb-public-key.asc
diff --git a/java/google/registry/tmch/package-info.java b/core/src/main/java/google/registry/tmch/package-info.java
similarity index 100%
rename from java/google/registry/tmch/package-info.java
rename to core/src/main/java/google/registry/tmch/package-info.java
diff --git a/java/google/registry/tools/AckPollMessagesCommand.java b/core/src/main/java/google/registry/tools/AckPollMessagesCommand.java
similarity index 100%
rename from java/google/registry/tools/AckPollMessagesCommand.java
rename to core/src/main/java/google/registry/tools/AckPollMessagesCommand.java
diff --git a/java/google/registry/tools/AppEngineAdminApiModule.java b/core/src/main/java/google/registry/tools/AppEngineAdminApiModule.java
similarity index 100%
rename from java/google/registry/tools/AppEngineAdminApiModule.java
rename to core/src/main/java/google/registry/tools/AppEngineAdminApiModule.java
diff --git a/java/google/registry/tools/AppEngineConnection.java b/core/src/main/java/google/registry/tools/AppEngineConnection.java
similarity index 100%
rename from java/google/registry/tools/AppEngineConnection.java
rename to core/src/main/java/google/registry/tools/AppEngineConnection.java
diff --git a/java/google/registry/tools/AuthModule.java b/core/src/main/java/google/registry/tools/AuthModule.java
similarity index 100%
rename from java/google/registry/tools/AuthModule.java
rename to core/src/main/java/google/registry/tools/AuthModule.java
diff --git a/java/google/registry/tools/BUILD b/core/src/main/java/google/registry/tools/BUILD
similarity index 100%
rename from java/google/registry/tools/BUILD
rename to core/src/main/java/google/registry/tools/BUILD
diff --git a/java/google/registry/tools/BigqueryCommand.java b/core/src/main/java/google/registry/tools/BigqueryCommand.java
similarity index 100%
rename from java/google/registry/tools/BigqueryCommand.java
rename to core/src/main/java/google/registry/tools/BigqueryCommand.java
diff --git a/java/google/registry/tools/BigqueryParameters.java b/core/src/main/java/google/registry/tools/BigqueryParameters.java
similarity index 100%
rename from java/google/registry/tools/BigqueryParameters.java
rename to core/src/main/java/google/registry/tools/BigqueryParameters.java
diff --git a/java/google/registry/tools/CanonicalizeLabelsCommand.java b/core/src/main/java/google/registry/tools/CanonicalizeLabelsCommand.java
similarity index 100%
rename from java/google/registry/tools/CanonicalizeLabelsCommand.java
rename to core/src/main/java/google/registry/tools/CanonicalizeLabelsCommand.java
diff --git a/java/google/registry/tools/CheckDomainClaimsCommand.java b/core/src/main/java/google/registry/tools/CheckDomainClaimsCommand.java
similarity index 100%
rename from java/google/registry/tools/CheckDomainClaimsCommand.java
rename to core/src/main/java/google/registry/tools/CheckDomainClaimsCommand.java
diff --git a/java/google/registry/tools/CheckDomainCommand.java b/core/src/main/java/google/registry/tools/CheckDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/CheckDomainCommand.java
rename to core/src/main/java/google/registry/tools/CheckDomainCommand.java
diff --git a/java/google/registry/tools/Command.java b/core/src/main/java/google/registry/tools/Command.java
similarity index 100%
rename from java/google/registry/tools/Command.java
rename to core/src/main/java/google/registry/tools/Command.java
diff --git a/java/google/registry/tools/CommandRunner.java b/core/src/main/java/google/registry/tools/CommandRunner.java
similarity index 100%
rename from java/google/registry/tools/CommandRunner.java
rename to core/src/main/java/google/registry/tools/CommandRunner.java
diff --git a/java/google/registry/tools/CommandUtilities.java b/core/src/main/java/google/registry/tools/CommandUtilities.java
similarity index 100%
rename from java/google/registry/tools/CommandUtilities.java
rename to core/src/main/java/google/registry/tools/CommandUtilities.java
diff --git a/java/google/registry/tools/CommandWithConnection.java b/core/src/main/java/google/registry/tools/CommandWithConnection.java
similarity index 100%
rename from java/google/registry/tools/CommandWithConnection.java
rename to core/src/main/java/google/registry/tools/CommandWithConnection.java
diff --git a/java/google/registry/tools/CommandWithRemoteApi.java b/core/src/main/java/google/registry/tools/CommandWithRemoteApi.java
similarity index 100%
rename from java/google/registry/tools/CommandWithRemoteApi.java
rename to core/src/main/java/google/registry/tools/CommandWithRemoteApi.java
diff --git a/java/google/registry/tools/ComparableEntity.java b/core/src/main/java/google/registry/tools/ComparableEntity.java
similarity index 100%
rename from java/google/registry/tools/ComparableEntity.java
rename to core/src/main/java/google/registry/tools/ComparableEntity.java
diff --git a/java/google/registry/tools/CompareDbBackups.java b/core/src/main/java/google/registry/tools/CompareDbBackups.java
similarity index 100%
rename from java/google/registry/tools/CompareDbBackups.java
rename to core/src/main/java/google/registry/tools/CompareDbBackups.java
diff --git a/java/google/registry/tools/ConfirmingCommand.java b/core/src/main/java/google/registry/tools/ConfirmingCommand.java
similarity index 100%
rename from java/google/registry/tools/ConfirmingCommand.java
rename to core/src/main/java/google/registry/tools/ConfirmingCommand.java
diff --git a/java/google/registry/tools/ConvertIdnCommand.java b/core/src/main/java/google/registry/tools/ConvertIdnCommand.java
similarity index 100%
rename from java/google/registry/tools/ConvertIdnCommand.java
rename to core/src/main/java/google/registry/tools/ConvertIdnCommand.java
diff --git a/java/google/registry/tools/CountDomainsCommand.java b/core/src/main/java/google/registry/tools/CountDomainsCommand.java
similarity index 100%
rename from java/google/registry/tools/CountDomainsCommand.java
rename to core/src/main/java/google/registry/tools/CountDomainsCommand.java
diff --git a/java/google/registry/tools/CreateAnchorTenantCommand.java b/core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateAnchorTenantCommand.java
rename to core/src/main/java/google/registry/tools/CreateAnchorTenantCommand.java
diff --git a/java/google/registry/tools/CreateCdnsTld.java b/core/src/main/java/google/registry/tools/CreateCdnsTld.java
similarity index 100%
rename from java/google/registry/tools/CreateCdnsTld.java
rename to core/src/main/java/google/registry/tools/CreateCdnsTld.java
diff --git a/java/google/registry/tools/CreateContactCommand.java b/core/src/main/java/google/registry/tools/CreateContactCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateContactCommand.java
rename to core/src/main/java/google/registry/tools/CreateContactCommand.java
diff --git a/java/google/registry/tools/CreateDomainCommand.java b/core/src/main/java/google/registry/tools/CreateDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateDomainCommand.java
rename to core/src/main/java/google/registry/tools/CreateDomainCommand.java
diff --git a/java/google/registry/tools/CreateHostCommand.java b/core/src/main/java/google/registry/tools/CreateHostCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateHostCommand.java
rename to core/src/main/java/google/registry/tools/CreateHostCommand.java
diff --git a/java/google/registry/tools/CreateOrUpdateDomainCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateOrUpdateDomainCommand.java
rename to core/src/main/java/google/registry/tools/CreateOrUpdateDomainCommand.java
diff --git a/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateOrUpdatePremiumListCommand.java
rename to core/src/main/java/google/registry/tools/CreateOrUpdatePremiumListCommand.java
diff --git a/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
rename to core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java
diff --git a/java/google/registry/tools/CreateOrUpdateReservedListCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateOrUpdateReservedListCommand.java
rename to core/src/main/java/google/registry/tools/CreateOrUpdateReservedListCommand.java
diff --git a/java/google/registry/tools/CreateOrUpdateTldCommand.java b/core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateOrUpdateTldCommand.java
rename to core/src/main/java/google/registry/tools/CreateOrUpdateTldCommand.java
diff --git a/java/google/registry/tools/CreatePremiumListCommand.java b/core/src/main/java/google/registry/tools/CreatePremiumListCommand.java
similarity index 100%
rename from java/google/registry/tools/CreatePremiumListCommand.java
rename to core/src/main/java/google/registry/tools/CreatePremiumListCommand.java
diff --git a/java/google/registry/tools/CreateRegistrarCommand.java b/core/src/main/java/google/registry/tools/CreateRegistrarCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateRegistrarCommand.java
rename to core/src/main/java/google/registry/tools/CreateRegistrarCommand.java
diff --git a/java/google/registry/tools/CreateRegistrarGroupsCommand.java b/core/src/main/java/google/registry/tools/CreateRegistrarGroupsCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateRegistrarGroupsCommand.java
rename to core/src/main/java/google/registry/tools/CreateRegistrarGroupsCommand.java
diff --git a/java/google/registry/tools/CreateReservedListCommand.java b/core/src/main/java/google/registry/tools/CreateReservedListCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateReservedListCommand.java
rename to core/src/main/java/google/registry/tools/CreateReservedListCommand.java
diff --git a/java/google/registry/tools/CreateSandboxTldCommand.java b/core/src/main/java/google/registry/tools/CreateSandboxTldCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateSandboxTldCommand.java
rename to core/src/main/java/google/registry/tools/CreateSandboxTldCommand.java
diff --git a/java/google/registry/tools/CreateTldCommand.java b/core/src/main/java/google/registry/tools/CreateTldCommand.java
similarity index 100%
rename from java/google/registry/tools/CreateTldCommand.java
rename to core/src/main/java/google/registry/tools/CreateTldCommand.java
diff --git a/java/google/registry/tools/CurlCommand.java b/core/src/main/java/google/registry/tools/CurlCommand.java
similarity index 100%
rename from java/google/registry/tools/CurlCommand.java
rename to core/src/main/java/google/registry/tools/CurlCommand.java
diff --git a/java/google/registry/tools/DeleteAllocationTokensCommand.java b/core/src/main/java/google/registry/tools/DeleteAllocationTokensCommand.java
similarity index 100%
rename from java/google/registry/tools/DeleteAllocationTokensCommand.java
rename to core/src/main/java/google/registry/tools/DeleteAllocationTokensCommand.java
diff --git a/java/google/registry/tools/DeleteDomainCommand.java b/core/src/main/java/google/registry/tools/DeleteDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/DeleteDomainCommand.java
rename to core/src/main/java/google/registry/tools/DeleteDomainCommand.java
diff --git a/java/google/registry/tools/DeleteHostCommand.java b/core/src/main/java/google/registry/tools/DeleteHostCommand.java
similarity index 100%
rename from java/google/registry/tools/DeleteHostCommand.java
rename to core/src/main/java/google/registry/tools/DeleteHostCommand.java
diff --git a/java/google/registry/tools/DeletePremiumListCommand.java b/core/src/main/java/google/registry/tools/DeletePremiumListCommand.java
similarity index 100%
rename from java/google/registry/tools/DeletePremiumListCommand.java
rename to core/src/main/java/google/registry/tools/DeletePremiumListCommand.java
diff --git a/java/google/registry/tools/DeleteReservedListCommand.java b/core/src/main/java/google/registry/tools/DeleteReservedListCommand.java
similarity index 100%
rename from java/google/registry/tools/DeleteReservedListCommand.java
rename to core/src/main/java/google/registry/tools/DeleteReservedListCommand.java
diff --git a/java/google/registry/tools/DeleteTldCommand.java b/core/src/main/java/google/registry/tools/DeleteTldCommand.java
similarity index 100%
rename from java/google/registry/tools/DeleteTldCommand.java
rename to core/src/main/java/google/registry/tools/DeleteTldCommand.java
diff --git a/java/google/registry/tools/DeployInvoicingPipelineCommand.java b/core/src/main/java/google/registry/tools/DeployInvoicingPipelineCommand.java
similarity index 100%
rename from java/google/registry/tools/DeployInvoicingPipelineCommand.java
rename to core/src/main/java/google/registry/tools/DeployInvoicingPipelineCommand.java
diff --git a/java/google/registry/tools/DeploySpec11PipelineCommand.java b/core/src/main/java/google/registry/tools/DeploySpec11PipelineCommand.java
similarity index 100%
rename from java/google/registry/tools/DeploySpec11PipelineCommand.java
rename to core/src/main/java/google/registry/tools/DeploySpec11PipelineCommand.java
diff --git a/java/google/registry/tools/EncryptEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/EncryptEscrowDepositCommand.java
similarity index 100%
rename from java/google/registry/tools/EncryptEscrowDepositCommand.java
rename to core/src/main/java/google/registry/tools/EncryptEscrowDepositCommand.java
diff --git a/java/google/registry/tools/EppToolCommand.java b/core/src/main/java/google/registry/tools/EppToolCommand.java
similarity index 100%
rename from java/google/registry/tools/EppToolCommand.java
rename to core/src/main/java/google/registry/tools/EppToolCommand.java
diff --git a/java/google/registry/tools/EscrowDepositEncryptor.java b/core/src/main/java/google/registry/tools/EscrowDepositEncryptor.java
similarity index 100%
rename from java/google/registry/tools/EscrowDepositEncryptor.java
rename to core/src/main/java/google/registry/tools/EscrowDepositEncryptor.java
diff --git a/java/google/registry/tools/ExecuteEppCommand.java b/core/src/main/java/google/registry/tools/ExecuteEppCommand.java
similarity index 100%
rename from java/google/registry/tools/ExecuteEppCommand.java
rename to core/src/main/java/google/registry/tools/ExecuteEppCommand.java
diff --git a/java/google/registry/tools/GenerateAllocationTokensCommand.java b/core/src/main/java/google/registry/tools/GenerateAllocationTokensCommand.java
similarity index 100%
rename from java/google/registry/tools/GenerateAllocationTokensCommand.java
rename to core/src/main/java/google/registry/tools/GenerateAllocationTokensCommand.java
diff --git a/java/google/registry/tools/GenerateDnsReportCommand.java b/core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java
similarity index 100%
rename from java/google/registry/tools/GenerateDnsReportCommand.java
rename to core/src/main/java/google/registry/tools/GenerateDnsReportCommand.java
diff --git a/java/google/registry/tools/GenerateEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java
similarity index 100%
rename from java/google/registry/tools/GenerateEscrowDepositCommand.java
rename to core/src/main/java/google/registry/tools/GenerateEscrowDepositCommand.java
diff --git a/java/google/registry/tools/GenerateLordnCommand.java b/core/src/main/java/google/registry/tools/GenerateLordnCommand.java
similarity index 100%
rename from java/google/registry/tools/GenerateLordnCommand.java
rename to core/src/main/java/google/registry/tools/GenerateLordnCommand.java
diff --git a/java/google/registry/tools/GenerateZoneFilesCommand.java b/core/src/main/java/google/registry/tools/GenerateZoneFilesCommand.java
similarity index 100%
rename from java/google/registry/tools/GenerateZoneFilesCommand.java
rename to core/src/main/java/google/registry/tools/GenerateZoneFilesCommand.java
diff --git a/java/google/registry/tools/GetAllocationTokenCommand.java b/core/src/main/java/google/registry/tools/GetAllocationTokenCommand.java
similarity index 100%
rename from java/google/registry/tools/GetAllocationTokenCommand.java
rename to core/src/main/java/google/registry/tools/GetAllocationTokenCommand.java
diff --git a/java/google/registry/tools/GetClaimsListCommand.java b/core/src/main/java/google/registry/tools/GetClaimsListCommand.java
similarity index 100%
rename from java/google/registry/tools/GetClaimsListCommand.java
rename to core/src/main/java/google/registry/tools/GetClaimsListCommand.java
diff --git a/java/google/registry/tools/GetContactCommand.java b/core/src/main/java/google/registry/tools/GetContactCommand.java
similarity index 100%
rename from java/google/registry/tools/GetContactCommand.java
rename to core/src/main/java/google/registry/tools/GetContactCommand.java
diff --git a/java/google/registry/tools/GetDomainCommand.java b/core/src/main/java/google/registry/tools/GetDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/GetDomainCommand.java
rename to core/src/main/java/google/registry/tools/GetDomainCommand.java
diff --git a/java/google/registry/tools/GetEppResourceCommand.java b/core/src/main/java/google/registry/tools/GetEppResourceCommand.java
similarity index 100%
rename from java/google/registry/tools/GetEppResourceCommand.java
rename to core/src/main/java/google/registry/tools/GetEppResourceCommand.java
diff --git a/java/google/registry/tools/GetHistoryEntriesCommand.java b/core/src/main/java/google/registry/tools/GetHistoryEntriesCommand.java
similarity index 100%
rename from java/google/registry/tools/GetHistoryEntriesCommand.java
rename to core/src/main/java/google/registry/tools/GetHistoryEntriesCommand.java
diff --git a/java/google/registry/tools/GetHostCommand.java b/core/src/main/java/google/registry/tools/GetHostCommand.java
similarity index 100%
rename from java/google/registry/tools/GetHostCommand.java
rename to core/src/main/java/google/registry/tools/GetHostCommand.java
diff --git a/java/google/registry/tools/GetKeyringSecretCommand.java b/core/src/main/java/google/registry/tools/GetKeyringSecretCommand.java
similarity index 100%
rename from java/google/registry/tools/GetKeyringSecretCommand.java
rename to core/src/main/java/google/registry/tools/GetKeyringSecretCommand.java
diff --git a/java/google/registry/tools/GetOperationStatusCommand.java b/core/src/main/java/google/registry/tools/GetOperationStatusCommand.java
similarity index 100%
rename from java/google/registry/tools/GetOperationStatusCommand.java
rename to core/src/main/java/google/registry/tools/GetOperationStatusCommand.java
diff --git a/java/google/registry/tools/GetRegistrarCommand.java b/core/src/main/java/google/registry/tools/GetRegistrarCommand.java
similarity index 100%
rename from java/google/registry/tools/GetRegistrarCommand.java
rename to core/src/main/java/google/registry/tools/GetRegistrarCommand.java
diff --git a/java/google/registry/tools/GetResourceByKeyCommand.java b/core/src/main/java/google/registry/tools/GetResourceByKeyCommand.java
similarity index 100%
rename from java/google/registry/tools/GetResourceByKeyCommand.java
rename to core/src/main/java/google/registry/tools/GetResourceByKeyCommand.java
diff --git a/java/google/registry/tools/GetRoutingMapCommand.java b/core/src/main/java/google/registry/tools/GetRoutingMapCommand.java
similarity index 100%
rename from java/google/registry/tools/GetRoutingMapCommand.java
rename to core/src/main/java/google/registry/tools/GetRoutingMapCommand.java
diff --git a/java/google/registry/tools/GetSchemaCommand.java b/core/src/main/java/google/registry/tools/GetSchemaCommand.java
similarity index 100%
rename from java/google/registry/tools/GetSchemaCommand.java
rename to core/src/main/java/google/registry/tools/GetSchemaCommand.java
diff --git a/java/google/registry/tools/GetSchemaTreeCommand.java b/core/src/main/java/google/registry/tools/GetSchemaTreeCommand.java
similarity index 100%
rename from java/google/registry/tools/GetSchemaTreeCommand.java
rename to core/src/main/java/google/registry/tools/GetSchemaTreeCommand.java
diff --git a/java/google/registry/tools/GetTldCommand.java b/core/src/main/java/google/registry/tools/GetTldCommand.java
similarity index 100%
rename from java/google/registry/tools/GetTldCommand.java
rename to core/src/main/java/google/registry/tools/GetTldCommand.java
diff --git a/java/google/registry/tools/GhostrydeCommand.java b/core/src/main/java/google/registry/tools/GhostrydeCommand.java
similarity index 100%
rename from java/google/registry/tools/GhostrydeCommand.java
rename to core/src/main/java/google/registry/tools/GhostrydeCommand.java
diff --git a/java/google/registry/tools/GtechTool.java b/core/src/main/java/google/registry/tools/GtechTool.java
similarity index 100%
rename from java/google/registry/tools/GtechTool.java
rename to core/src/main/java/google/registry/tools/GtechTool.java
diff --git a/java/google/registry/tools/HashCertificateCommand.java b/core/src/main/java/google/registry/tools/HashCertificateCommand.java
similarity index 100%
rename from java/google/registry/tools/HashCertificateCommand.java
rename to core/src/main/java/google/registry/tools/HashCertificateCommand.java
diff --git a/java/google/registry/tools/HelpCommand.java b/core/src/main/java/google/registry/tools/HelpCommand.java
similarity index 100%
rename from java/google/registry/tools/HelpCommand.java
rename to core/src/main/java/google/registry/tools/HelpCommand.java
diff --git a/java/google/registry/tools/ImportDatastoreCommand.java b/core/src/main/java/google/registry/tools/ImportDatastoreCommand.java
similarity index 100%
rename from java/google/registry/tools/ImportDatastoreCommand.java
rename to core/src/main/java/google/registry/tools/ImportDatastoreCommand.java
diff --git a/java/google/registry/tools/Injector.java b/core/src/main/java/google/registry/tools/Injector.java
similarity index 100%
rename from java/google/registry/tools/Injector.java
rename to core/src/main/java/google/registry/tools/Injector.java
diff --git a/java/google/registry/tools/LevelDbLogReader.java b/core/src/main/java/google/registry/tools/LevelDbLogReader.java
similarity index 100%
rename from java/google/registry/tools/LevelDbLogReader.java
rename to core/src/main/java/google/registry/tools/LevelDbLogReader.java
diff --git a/java/google/registry/tools/ListCursorsCommand.java b/core/src/main/java/google/registry/tools/ListCursorsCommand.java
similarity index 100%
rename from java/google/registry/tools/ListCursorsCommand.java
rename to core/src/main/java/google/registry/tools/ListCursorsCommand.java
diff --git a/java/google/registry/tools/ListDatastoreOperationsCommand.java b/core/src/main/java/google/registry/tools/ListDatastoreOperationsCommand.java
similarity index 100%
rename from java/google/registry/tools/ListDatastoreOperationsCommand.java
rename to core/src/main/java/google/registry/tools/ListDatastoreOperationsCommand.java
diff --git a/java/google/registry/tools/ListDomainsCommand.java b/core/src/main/java/google/registry/tools/ListDomainsCommand.java
similarity index 100%
rename from java/google/registry/tools/ListDomainsCommand.java
rename to core/src/main/java/google/registry/tools/ListDomainsCommand.java
diff --git a/java/google/registry/tools/ListHostsCommand.java b/core/src/main/java/google/registry/tools/ListHostsCommand.java
similarity index 100%
rename from java/google/registry/tools/ListHostsCommand.java
rename to core/src/main/java/google/registry/tools/ListHostsCommand.java
diff --git a/java/google/registry/tools/ListObjectsCommand.java b/core/src/main/java/google/registry/tools/ListObjectsCommand.java
similarity index 100%
rename from java/google/registry/tools/ListObjectsCommand.java
rename to core/src/main/java/google/registry/tools/ListObjectsCommand.java
diff --git a/java/google/registry/tools/ListPremiumListsCommand.java b/core/src/main/java/google/registry/tools/ListPremiumListsCommand.java
similarity index 100%
rename from java/google/registry/tools/ListPremiumListsCommand.java
rename to core/src/main/java/google/registry/tools/ListPremiumListsCommand.java
diff --git a/java/google/registry/tools/ListRegistrarsCommand.java b/core/src/main/java/google/registry/tools/ListRegistrarsCommand.java
similarity index 100%
rename from java/google/registry/tools/ListRegistrarsCommand.java
rename to core/src/main/java/google/registry/tools/ListRegistrarsCommand.java
diff --git a/java/google/registry/tools/ListReservedListsCommand.java b/core/src/main/java/google/registry/tools/ListReservedListsCommand.java
similarity index 100%
rename from java/google/registry/tools/ListReservedListsCommand.java
rename to core/src/main/java/google/registry/tools/ListReservedListsCommand.java
diff --git a/java/google/registry/tools/ListTldsCommand.java b/core/src/main/java/google/registry/tools/ListTldsCommand.java
similarity index 100%
rename from java/google/registry/tools/ListTldsCommand.java
rename to core/src/main/java/google/registry/tools/ListTldsCommand.java
diff --git a/java/google/registry/tools/LoadSnapshotCommand.java b/core/src/main/java/google/registry/tools/LoadSnapshotCommand.java
similarity index 100%
rename from java/google/registry/tools/LoadSnapshotCommand.java
rename to core/src/main/java/google/registry/tools/LoadSnapshotCommand.java
diff --git a/java/google/registry/tools/LoadTestCommand.java b/core/src/main/java/google/registry/tools/LoadTestCommand.java
similarity index 100%
rename from java/google/registry/tools/LoadTestCommand.java
rename to core/src/main/java/google/registry/tools/LoadTestCommand.java
diff --git a/java/google/registry/tools/LockDomainCommand.java b/core/src/main/java/google/registry/tools/LockDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/LockDomainCommand.java
rename to core/src/main/java/google/registry/tools/LockDomainCommand.java
diff --git a/java/google/registry/tools/LockOrUnlockDomainCommand.java b/core/src/main/java/google/registry/tools/LockOrUnlockDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/LockOrUnlockDomainCommand.java
rename to core/src/main/java/google/registry/tools/LockOrUnlockDomainCommand.java
diff --git a/java/google/registry/tools/LoggingParameters.java b/core/src/main/java/google/registry/tools/LoggingParameters.java
similarity index 100%
rename from java/google/registry/tools/LoggingParameters.java
rename to core/src/main/java/google/registry/tools/LoggingParameters.java
diff --git a/java/google/registry/tools/LoginCommand.java b/core/src/main/java/google/registry/tools/LoginCommand.java
similarity index 100%
rename from java/google/registry/tools/LoginCommand.java
rename to core/src/main/java/google/registry/tools/LoginCommand.java
diff --git a/java/google/registry/tools/LogoutCommand.java b/core/src/main/java/google/registry/tools/LogoutCommand.java
similarity index 100%
rename from java/google/registry/tools/LogoutCommand.java
rename to core/src/main/java/google/registry/tools/LogoutCommand.java
diff --git a/java/google/registry/tools/MutatingCommand.java b/core/src/main/java/google/registry/tools/MutatingCommand.java
similarity index 100%
rename from java/google/registry/tools/MutatingCommand.java
rename to core/src/main/java/google/registry/tools/MutatingCommand.java
diff --git a/java/google/registry/tools/MutatingEppToolCommand.java b/core/src/main/java/google/registry/tools/MutatingEppToolCommand.java
similarity index 100%
rename from java/google/registry/tools/MutatingEppToolCommand.java
rename to core/src/main/java/google/registry/tools/MutatingEppToolCommand.java
diff --git a/java/google/registry/tools/NonMutatingEppToolCommand.java b/core/src/main/java/google/registry/tools/NonMutatingEppToolCommand.java
similarity index 100%
rename from java/google/registry/tools/NonMutatingEppToolCommand.java
rename to core/src/main/java/google/registry/tools/NonMutatingEppToolCommand.java
diff --git a/java/google/registry/tools/PendingEscrowCommand.java b/core/src/main/java/google/registry/tools/PendingEscrowCommand.java
similarity index 100%
rename from java/google/registry/tools/PendingEscrowCommand.java
rename to core/src/main/java/google/registry/tools/PendingEscrowCommand.java
diff --git a/java/google/registry/tools/RecordAccumulator.java b/core/src/main/java/google/registry/tools/RecordAccumulator.java
similarity index 100%
rename from java/google/registry/tools/RecordAccumulator.java
rename to core/src/main/java/google/registry/tools/RecordAccumulator.java
diff --git a/java/google/registry/tools/RegistrarContactCommand.java b/core/src/main/java/google/registry/tools/RegistrarContactCommand.java
similarity index 100%
rename from java/google/registry/tools/RegistrarContactCommand.java
rename to core/src/main/java/google/registry/tools/RegistrarContactCommand.java
diff --git a/java/google/registry/tools/RegistryCli.java b/core/src/main/java/google/registry/tools/RegistryCli.java
similarity index 100%
rename from java/google/registry/tools/RegistryCli.java
rename to core/src/main/java/google/registry/tools/RegistryCli.java
diff --git a/java/google/registry/tools/RegistryTool.java b/core/src/main/java/google/registry/tools/RegistryTool.java
similarity index 100%
rename from java/google/registry/tools/RegistryTool.java
rename to core/src/main/java/google/registry/tools/RegistryTool.java
diff --git a/java/google/registry/tools/RegistryToolComponent.java b/core/src/main/java/google/registry/tools/RegistryToolComponent.java
similarity index 100%
rename from java/google/registry/tools/RegistryToolComponent.java
rename to core/src/main/java/google/registry/tools/RegistryToolComponent.java
diff --git a/java/google/registry/tools/RegistryToolEnvironment.java b/core/src/main/java/google/registry/tools/RegistryToolEnvironment.java
similarity index 100%
rename from java/google/registry/tools/RegistryToolEnvironment.java
rename to core/src/main/java/google/registry/tools/RegistryToolEnvironment.java
diff --git a/java/google/registry/tools/RemoteApiOptionsUtil.java b/core/src/main/java/google/registry/tools/RemoteApiOptionsUtil.java
similarity index 100%
rename from java/google/registry/tools/RemoteApiOptionsUtil.java
rename to core/src/main/java/google/registry/tools/RemoteApiOptionsUtil.java
diff --git a/java/google/registry/tools/RenewDomainCommand.java b/core/src/main/java/google/registry/tools/RenewDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/RenewDomainCommand.java
rename to core/src/main/java/google/registry/tools/RenewDomainCommand.java
diff --git a/java/google/registry/tools/RequestFactoryModule.java b/core/src/main/java/google/registry/tools/RequestFactoryModule.java
similarity index 100%
rename from java/google/registry/tools/RequestFactoryModule.java
rename to core/src/main/java/google/registry/tools/RequestFactoryModule.java
diff --git a/java/google/registry/tools/ResaveEntitiesCommand.java b/core/src/main/java/google/registry/tools/ResaveEntitiesCommand.java
similarity index 100%
rename from java/google/registry/tools/ResaveEntitiesCommand.java
rename to core/src/main/java/google/registry/tools/ResaveEntitiesCommand.java
diff --git a/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java b/core/src/main/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java
similarity index 100%
rename from java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java
rename to core/src/main/java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java
diff --git a/java/google/registry/tools/ResaveEppResourceCommand.java b/core/src/main/java/google/registry/tools/ResaveEppResourceCommand.java
similarity index 100%
rename from java/google/registry/tools/ResaveEppResourceCommand.java
rename to core/src/main/java/google/registry/tools/ResaveEppResourceCommand.java
diff --git a/java/google/registry/tools/SendEscrowReportToIcannCommand.java b/core/src/main/java/google/registry/tools/SendEscrowReportToIcannCommand.java
similarity index 100%
rename from java/google/registry/tools/SendEscrowReportToIcannCommand.java
rename to core/src/main/java/google/registry/tools/SendEscrowReportToIcannCommand.java
diff --git a/java/google/registry/tools/SetNumInstancesCommand.java b/core/src/main/java/google/registry/tools/SetNumInstancesCommand.java
similarity index 100%
rename from java/google/registry/tools/SetNumInstancesCommand.java
rename to core/src/main/java/google/registry/tools/SetNumInstancesCommand.java
diff --git a/java/google/registry/tools/SetupOteCommand.java b/core/src/main/java/google/registry/tools/SetupOteCommand.java
similarity index 100%
rename from java/google/registry/tools/SetupOteCommand.java
rename to core/src/main/java/google/registry/tools/SetupOteCommand.java
diff --git a/java/google/registry/tools/ShellCommand.java b/core/src/main/java/google/registry/tools/ShellCommand.java
similarity index 100%
rename from java/google/registry/tools/ShellCommand.java
rename to core/src/main/java/google/registry/tools/ShellCommand.java
diff --git a/java/google/registry/tools/UniformRapidSuspensionCommand.java b/core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java
similarity index 100%
rename from java/google/registry/tools/UniformRapidSuspensionCommand.java
rename to core/src/main/java/google/registry/tools/UniformRapidSuspensionCommand.java
diff --git a/java/google/registry/tools/UnlockDomainCommand.java b/core/src/main/java/google/registry/tools/UnlockDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/UnlockDomainCommand.java
rename to core/src/main/java/google/registry/tools/UnlockDomainCommand.java
diff --git a/java/google/registry/tools/UnrenewDomainCommand.java b/core/src/main/java/google/registry/tools/UnrenewDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/UnrenewDomainCommand.java
rename to core/src/main/java/google/registry/tools/UnrenewDomainCommand.java
diff --git a/java/google/registry/tools/UpdateAllocationTokensCommand.java b/core/src/main/java/google/registry/tools/UpdateAllocationTokensCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateAllocationTokensCommand.java
rename to core/src/main/java/google/registry/tools/UpdateAllocationTokensCommand.java
diff --git a/java/google/registry/tools/UpdateCursorsCommand.java b/core/src/main/java/google/registry/tools/UpdateCursorsCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateCursorsCommand.java
rename to core/src/main/java/google/registry/tools/UpdateCursorsCommand.java
diff --git a/java/google/registry/tools/UpdateDomainCommand.java b/core/src/main/java/google/registry/tools/UpdateDomainCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateDomainCommand.java
rename to core/src/main/java/google/registry/tools/UpdateDomainCommand.java
diff --git a/java/google/registry/tools/UpdateKmsKeyringCommand.java b/core/src/main/java/google/registry/tools/UpdateKmsKeyringCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateKmsKeyringCommand.java
rename to core/src/main/java/google/registry/tools/UpdateKmsKeyringCommand.java
diff --git a/java/google/registry/tools/UpdateOrDeleteAllocationTokensCommand.java b/core/src/main/java/google/registry/tools/UpdateOrDeleteAllocationTokensCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateOrDeleteAllocationTokensCommand.java
rename to core/src/main/java/google/registry/tools/UpdateOrDeleteAllocationTokensCommand.java
diff --git a/java/google/registry/tools/UpdatePremiumListCommand.java b/core/src/main/java/google/registry/tools/UpdatePremiumListCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdatePremiumListCommand.java
rename to core/src/main/java/google/registry/tools/UpdatePremiumListCommand.java
diff --git a/java/google/registry/tools/UpdateRegistrarCommand.java b/core/src/main/java/google/registry/tools/UpdateRegistrarCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateRegistrarCommand.java
rename to core/src/main/java/google/registry/tools/UpdateRegistrarCommand.java
diff --git a/java/google/registry/tools/UpdateReservedListCommand.java b/core/src/main/java/google/registry/tools/UpdateReservedListCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateReservedListCommand.java
rename to core/src/main/java/google/registry/tools/UpdateReservedListCommand.java
diff --git a/java/google/registry/tools/UpdateSandboxTldCommand.java b/core/src/main/java/google/registry/tools/UpdateSandboxTldCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateSandboxTldCommand.java
rename to core/src/main/java/google/registry/tools/UpdateSandboxTldCommand.java
diff --git a/java/google/registry/tools/UpdateServerLocksCommand.java b/core/src/main/java/google/registry/tools/UpdateServerLocksCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateServerLocksCommand.java
rename to core/src/main/java/google/registry/tools/UpdateServerLocksCommand.java
diff --git a/java/google/registry/tools/UpdateTldCommand.java b/core/src/main/java/google/registry/tools/UpdateTldCommand.java
similarity index 100%
rename from java/google/registry/tools/UpdateTldCommand.java
rename to core/src/main/java/google/registry/tools/UpdateTldCommand.java
diff --git a/java/google/registry/tools/UploadClaimsListCommand.java b/core/src/main/java/google/registry/tools/UploadClaimsListCommand.java
similarity index 100%
rename from java/google/registry/tools/UploadClaimsListCommand.java
rename to core/src/main/java/google/registry/tools/UploadClaimsListCommand.java
diff --git a/java/google/registry/tools/ValidateEscrowDepositCommand.java b/core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java
similarity index 100%
rename from java/google/registry/tools/ValidateEscrowDepositCommand.java
rename to core/src/main/java/google/registry/tools/ValidateEscrowDepositCommand.java
diff --git a/java/google/registry/tools/ValidateLoginCredentialsCommand.java b/core/src/main/java/google/registry/tools/ValidateLoginCredentialsCommand.java
similarity index 100%
rename from java/google/registry/tools/ValidateLoginCredentialsCommand.java
rename to core/src/main/java/google/registry/tools/ValidateLoginCredentialsCommand.java
diff --git a/java/google/registry/tools/VerifyOteCommand.java b/core/src/main/java/google/registry/tools/VerifyOteCommand.java
similarity index 100%
rename from java/google/registry/tools/VerifyOteCommand.java
rename to core/src/main/java/google/registry/tools/VerifyOteCommand.java
diff --git a/java/google/registry/tools/WhoisQueryCommand.java b/core/src/main/java/google/registry/tools/WhoisQueryCommand.java
similarity index 100%
rename from java/google/registry/tools/WhoisQueryCommand.java
rename to core/src/main/java/google/registry/tools/WhoisQueryCommand.java
diff --git a/java/google/registry/tools/javascrap/PopulateNullRegistrarFieldsCommand.java b/core/src/main/java/google/registry/tools/javascrap/PopulateNullRegistrarFieldsCommand.java
similarity index 100%
rename from java/google/registry/tools/javascrap/PopulateNullRegistrarFieldsCommand.java
rename to core/src/main/java/google/registry/tools/javascrap/PopulateNullRegistrarFieldsCommand.java
diff --git a/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java b/core/src/main/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java
similarity index 100%
rename from java/google/registry/tools/javascrap/RemoveIpAddressCommand.java
rename to core/src/main/java/google/registry/tools/javascrap/RemoveIpAddressCommand.java
diff --git a/java/google/registry/tools/logging.properties b/core/src/main/java/google/registry/tools/logging.properties
similarity index 100%
rename from java/google/registry/tools/logging.properties
rename to core/src/main/java/google/registry/tools/logging.properties
diff --git a/java/google/registry/tools/package-info.java b/core/src/main/java/google/registry/tools/package-info.java
similarity index 100%
rename from java/google/registry/tools/package-info.java
rename to core/src/main/java/google/registry/tools/package-info.java
diff --git a/java/google/registry/tools/params/BUILD b/core/src/main/java/google/registry/tools/params/BUILD
similarity index 100%
rename from java/google/registry/tools/params/BUILD
rename to core/src/main/java/google/registry/tools/params/BUILD
diff --git a/java/google/registry/tools/params/DateParameter.java b/core/src/main/java/google/registry/tools/params/DateParameter.java
similarity index 100%
rename from java/google/registry/tools/params/DateParameter.java
rename to core/src/main/java/google/registry/tools/params/DateParameter.java
diff --git a/java/google/registry/tools/params/DateTimeParameter.java b/core/src/main/java/google/registry/tools/params/DateTimeParameter.java
similarity index 100%
rename from java/google/registry/tools/params/DateTimeParameter.java
rename to core/src/main/java/google/registry/tools/params/DateTimeParameter.java
diff --git a/java/google/registry/tools/params/DurationParameter.java b/core/src/main/java/google/registry/tools/params/DurationParameter.java
similarity index 100%
rename from java/google/registry/tools/params/DurationParameter.java
rename to core/src/main/java/google/registry/tools/params/DurationParameter.java
diff --git a/java/google/registry/tools/params/EnumParameter.java b/core/src/main/java/google/registry/tools/params/EnumParameter.java
similarity index 100%
rename from java/google/registry/tools/params/EnumParameter.java
rename to core/src/main/java/google/registry/tools/params/EnumParameter.java
diff --git a/java/google/registry/tools/params/EppResourceTypeParameter.java b/core/src/main/java/google/registry/tools/params/EppResourceTypeParameter.java
similarity index 100%
rename from java/google/registry/tools/params/EppResourceTypeParameter.java
rename to core/src/main/java/google/registry/tools/params/EppResourceTypeParameter.java
diff --git a/java/google/registry/tools/params/HostAndPortParameter.java b/core/src/main/java/google/registry/tools/params/HostAndPortParameter.java
similarity index 100%
rename from java/google/registry/tools/params/HostAndPortParameter.java
rename to core/src/main/java/google/registry/tools/params/HostAndPortParameter.java
diff --git a/java/google/registry/tools/params/InternetDomainNameParameter.java b/core/src/main/java/google/registry/tools/params/InternetDomainNameParameter.java
similarity index 100%
rename from java/google/registry/tools/params/InternetDomainNameParameter.java
rename to core/src/main/java/google/registry/tools/params/InternetDomainNameParameter.java
diff --git a/java/google/registry/tools/params/IntervalParameter.java b/core/src/main/java/google/registry/tools/params/IntervalParameter.java
similarity index 100%
rename from java/google/registry/tools/params/IntervalParameter.java
rename to core/src/main/java/google/registry/tools/params/IntervalParameter.java
diff --git a/java/google/registry/tools/params/KeyValueMapParameter.java b/core/src/main/java/google/registry/tools/params/KeyValueMapParameter.java
similarity index 100%
rename from java/google/registry/tools/params/KeyValueMapParameter.java
rename to core/src/main/java/google/registry/tools/params/KeyValueMapParameter.java
diff --git a/java/google/registry/tools/params/KeyringKeyName.java b/core/src/main/java/google/registry/tools/params/KeyringKeyName.java
similarity index 100%
rename from java/google/registry/tools/params/KeyringKeyName.java
rename to core/src/main/java/google/registry/tools/params/KeyringKeyName.java
diff --git a/java/google/registry/tools/params/LocalDateParameter.java b/core/src/main/java/google/registry/tools/params/LocalDateParameter.java
similarity index 100%
rename from java/google/registry/tools/params/LocalDateParameter.java
rename to core/src/main/java/google/registry/tools/params/LocalDateParameter.java
diff --git a/java/google/registry/tools/params/LoggingLevelParameter.java b/core/src/main/java/google/registry/tools/params/LoggingLevelParameter.java
similarity index 100%
rename from java/google/registry/tools/params/LoggingLevelParameter.java
rename to core/src/main/java/google/registry/tools/params/LoggingLevelParameter.java
diff --git a/java/google/registry/tools/params/LongParameter.java b/core/src/main/java/google/registry/tools/params/LongParameter.java
similarity index 100%
rename from java/google/registry/tools/params/LongParameter.java
rename to core/src/main/java/google/registry/tools/params/LongParameter.java
diff --git a/java/google/registry/tools/params/MoneyParameter.java b/core/src/main/java/google/registry/tools/params/MoneyParameter.java
similarity index 100%
rename from java/google/registry/tools/params/MoneyParameter.java
rename to core/src/main/java/google/registry/tools/params/MoneyParameter.java
diff --git a/java/google/registry/tools/params/NameserversParameter.java b/core/src/main/java/google/registry/tools/params/NameserversParameter.java
similarity index 100%
rename from java/google/registry/tools/params/NameserversParameter.java
rename to core/src/main/java/google/registry/tools/params/NameserversParameter.java
diff --git a/java/google/registry/tools/params/OptionalIntervalParameter.java b/core/src/main/java/google/registry/tools/params/OptionalIntervalParameter.java
similarity index 100%
rename from java/google/registry/tools/params/OptionalIntervalParameter.java
rename to core/src/main/java/google/registry/tools/params/OptionalIntervalParameter.java
diff --git a/java/google/registry/tools/params/OptionalLongParameter.java b/core/src/main/java/google/registry/tools/params/OptionalLongParameter.java
similarity index 100%
rename from java/google/registry/tools/params/OptionalLongParameter.java
rename to core/src/main/java/google/registry/tools/params/OptionalLongParameter.java
diff --git a/java/google/registry/tools/params/OptionalParameterConverterValidator.java b/core/src/main/java/google/registry/tools/params/OptionalParameterConverterValidator.java
similarity index 100%
rename from java/google/registry/tools/params/OptionalParameterConverterValidator.java
rename to core/src/main/java/google/registry/tools/params/OptionalParameterConverterValidator.java
diff --git a/java/google/registry/tools/params/OptionalPhoneNumberParameter.java b/core/src/main/java/google/registry/tools/params/OptionalPhoneNumberParameter.java
similarity index 100%
rename from java/google/registry/tools/params/OptionalPhoneNumberParameter.java
rename to core/src/main/java/google/registry/tools/params/OptionalPhoneNumberParameter.java
diff --git a/java/google/registry/tools/params/OptionalStringParameter.java b/core/src/main/java/google/registry/tools/params/OptionalStringParameter.java
similarity index 100%
rename from java/google/registry/tools/params/OptionalStringParameter.java
rename to core/src/main/java/google/registry/tools/params/OptionalStringParameter.java
diff --git a/java/google/registry/tools/params/ParameterConverterValidator.java b/core/src/main/java/google/registry/tools/params/ParameterConverterValidator.java
similarity index 100%
rename from java/google/registry/tools/params/ParameterConverterValidator.java
rename to core/src/main/java/google/registry/tools/params/ParameterConverterValidator.java
diff --git a/java/google/registry/tools/params/ParameterFactory.java b/core/src/main/java/google/registry/tools/params/ParameterFactory.java
similarity index 100%
rename from java/google/registry/tools/params/ParameterFactory.java
rename to core/src/main/java/google/registry/tools/params/ParameterFactory.java
diff --git a/java/google/registry/tools/params/PathParameter.java b/core/src/main/java/google/registry/tools/params/PathParameter.java
similarity index 100%
rename from java/google/registry/tools/params/PathParameter.java
rename to core/src/main/java/google/registry/tools/params/PathParameter.java
diff --git a/java/google/registry/tools/params/PhoneNumberParameter.java b/core/src/main/java/google/registry/tools/params/PhoneNumberParameter.java
similarity index 100%
rename from java/google/registry/tools/params/PhoneNumberParameter.java
rename to core/src/main/java/google/registry/tools/params/PhoneNumberParameter.java
diff --git a/java/google/registry/tools/params/StringParameter.java b/core/src/main/java/google/registry/tools/params/StringParameter.java
similarity index 100%
rename from java/google/registry/tools/params/StringParameter.java
rename to core/src/main/java/google/registry/tools/params/StringParameter.java
diff --git a/java/google/registry/tools/params/TldStateParameter.java b/core/src/main/java/google/registry/tools/params/TldStateParameter.java
similarity index 100%
rename from java/google/registry/tools/params/TldStateParameter.java
rename to core/src/main/java/google/registry/tools/params/TldStateParameter.java
diff --git a/java/google/registry/tools/params/TransitionListParameter.java b/core/src/main/java/google/registry/tools/params/TransitionListParameter.java
similarity index 100%
rename from java/google/registry/tools/params/TransitionListParameter.java
rename to core/src/main/java/google/registry/tools/params/TransitionListParameter.java
diff --git a/java/google/registry/tools/params/YearMonthParameter.java b/core/src/main/java/google/registry/tools/params/YearMonthParameter.java
similarity index 100%
rename from java/google/registry/tools/params/YearMonthParameter.java
rename to core/src/main/java/google/registry/tools/params/YearMonthParameter.java
diff --git a/java/google/registry/tools/params/package-info.java b/core/src/main/java/google/registry/tools/params/package-info.java
similarity index 100%
rename from java/google/registry/tools/params/package-info.java
rename to core/src/main/java/google/registry/tools/params/package-info.java
diff --git a/java/google/registry/tools/server/BUILD b/core/src/main/java/google/registry/tools/server/BUILD
similarity index 100%
rename from java/google/registry/tools/server/BUILD
rename to core/src/main/java/google/registry/tools/server/BUILD
diff --git a/java/google/registry/tools/server/CreateGroupsAction.java b/core/src/main/java/google/registry/tools/server/CreateGroupsAction.java
similarity index 100%
rename from java/google/registry/tools/server/CreateGroupsAction.java
rename to core/src/main/java/google/registry/tools/server/CreateGroupsAction.java
diff --git a/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java b/core/src/main/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java
similarity index 100%
rename from java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java
rename to core/src/main/java/google/registry/tools/server/CreateOrUpdatePremiumListAction.java
diff --git a/java/google/registry/tools/server/CreatePremiumListAction.java b/core/src/main/java/google/registry/tools/server/CreatePremiumListAction.java
similarity index 100%
rename from java/google/registry/tools/server/CreatePremiumListAction.java
rename to core/src/main/java/google/registry/tools/server/CreatePremiumListAction.java
diff --git a/java/google/registry/tools/server/DeleteEntityAction.java b/core/src/main/java/google/registry/tools/server/DeleteEntityAction.java
similarity index 100%
rename from java/google/registry/tools/server/DeleteEntityAction.java
rename to core/src/main/java/google/registry/tools/server/DeleteEntityAction.java
diff --git a/java/google/registry/tools/server/GenerateZoneFilesAction.java b/core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java
similarity index 100%
rename from java/google/registry/tools/server/GenerateZoneFilesAction.java
rename to core/src/main/java/google/registry/tools/server/GenerateZoneFilesAction.java
diff --git a/java/google/registry/tools/server/KillAllCommitLogsAction.java b/core/src/main/java/google/registry/tools/server/KillAllCommitLogsAction.java
similarity index 100%
rename from java/google/registry/tools/server/KillAllCommitLogsAction.java
rename to core/src/main/java/google/registry/tools/server/KillAllCommitLogsAction.java
diff --git a/java/google/registry/tools/server/KillAllEntitiesReducer.java b/core/src/main/java/google/registry/tools/server/KillAllEntitiesReducer.java
similarity index 100%
rename from java/google/registry/tools/server/KillAllEntitiesReducer.java
rename to core/src/main/java/google/registry/tools/server/KillAllEntitiesReducer.java
diff --git a/java/google/registry/tools/server/KillAllEppResourcesAction.java b/core/src/main/java/google/registry/tools/server/KillAllEppResourcesAction.java
similarity index 100%
rename from java/google/registry/tools/server/KillAllEppResourcesAction.java
rename to core/src/main/java/google/registry/tools/server/KillAllEppResourcesAction.java
diff --git a/java/google/registry/tools/server/ListDomainsAction.java b/core/src/main/java/google/registry/tools/server/ListDomainsAction.java
similarity index 100%
rename from java/google/registry/tools/server/ListDomainsAction.java
rename to core/src/main/java/google/registry/tools/server/ListDomainsAction.java
diff --git a/java/google/registry/tools/server/ListHostsAction.java b/core/src/main/java/google/registry/tools/server/ListHostsAction.java
similarity index 100%
rename from java/google/registry/tools/server/ListHostsAction.java
rename to core/src/main/java/google/registry/tools/server/ListHostsAction.java
diff --git a/java/google/registry/tools/server/ListObjectsAction.java b/core/src/main/java/google/registry/tools/server/ListObjectsAction.java
similarity index 100%
rename from java/google/registry/tools/server/ListObjectsAction.java
rename to core/src/main/java/google/registry/tools/server/ListObjectsAction.java
diff --git a/java/google/registry/tools/server/ListPremiumListsAction.java b/core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java
similarity index 100%
rename from java/google/registry/tools/server/ListPremiumListsAction.java
rename to core/src/main/java/google/registry/tools/server/ListPremiumListsAction.java
diff --git a/java/google/registry/tools/server/ListRegistrarsAction.java b/core/src/main/java/google/registry/tools/server/ListRegistrarsAction.java
similarity index 100%
rename from java/google/registry/tools/server/ListRegistrarsAction.java
rename to core/src/main/java/google/registry/tools/server/ListRegistrarsAction.java
diff --git a/java/google/registry/tools/server/ListReservedListsAction.java b/core/src/main/java/google/registry/tools/server/ListReservedListsAction.java
similarity index 100%
rename from java/google/registry/tools/server/ListReservedListsAction.java
rename to core/src/main/java/google/registry/tools/server/ListReservedListsAction.java
diff --git a/java/google/registry/tools/server/ListTldsAction.java b/core/src/main/java/google/registry/tools/server/ListTldsAction.java
similarity index 100%
rename from java/google/registry/tools/server/ListTldsAction.java
rename to core/src/main/java/google/registry/tools/server/ListTldsAction.java
diff --git a/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java b/core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java
similarity index 100%
rename from java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java
rename to core/src/main/java/google/registry/tools/server/RefreshDnsForAllDomainsAction.java
diff --git a/java/google/registry/tools/server/ResaveAllHistoryEntriesAction.java b/core/src/main/java/google/registry/tools/server/ResaveAllHistoryEntriesAction.java
similarity index 100%
rename from java/google/registry/tools/server/ResaveAllHistoryEntriesAction.java
rename to core/src/main/java/google/registry/tools/server/ResaveAllHistoryEntriesAction.java
diff --git a/java/google/registry/tools/server/ToolsServerModule.java b/core/src/main/java/google/registry/tools/server/ToolsServerModule.java
similarity index 100%
rename from java/google/registry/tools/server/ToolsServerModule.java
rename to core/src/main/java/google/registry/tools/server/ToolsServerModule.java
diff --git a/java/google/registry/tools/server/UpdatePremiumListAction.java b/core/src/main/java/google/registry/tools/server/UpdatePremiumListAction.java
similarity index 100%
rename from java/google/registry/tools/server/UpdatePremiumListAction.java
rename to core/src/main/java/google/registry/tools/server/UpdatePremiumListAction.java
diff --git a/java/google/registry/tools/server/VerifyOteAction.java b/core/src/main/java/google/registry/tools/server/VerifyOteAction.java
similarity index 100%
rename from java/google/registry/tools/server/VerifyOteAction.java
rename to core/src/main/java/google/registry/tools/server/VerifyOteAction.java
diff --git a/java/google/registry/tools/soy/BUILD b/core/src/main/java/google/registry/tools/soy/BUILD
similarity index 100%
rename from java/google/registry/tools/soy/BUILD
rename to core/src/main/java/google/registry/tools/soy/BUILD
diff --git a/java/google/registry/tools/soy/ContactCreate.soy b/core/src/main/java/google/registry/tools/soy/ContactCreate.soy
similarity index 100%
rename from java/google/registry/tools/soy/ContactCreate.soy
rename to core/src/main/java/google/registry/tools/soy/ContactCreate.soy
diff --git a/java/google/registry/tools/soy/CreateAnchorTenant.soy b/core/src/main/java/google/registry/tools/soy/CreateAnchorTenant.soy
similarity index 100%
rename from java/google/registry/tools/soy/CreateAnchorTenant.soy
rename to core/src/main/java/google/registry/tools/soy/CreateAnchorTenant.soy
diff --git a/java/google/registry/tools/soy/DeleteDomain.soy b/core/src/main/java/google/registry/tools/soy/DeleteDomain.soy
similarity index 100%
rename from java/google/registry/tools/soy/DeleteDomain.soy
rename to core/src/main/java/google/registry/tools/soy/DeleteDomain.soy
diff --git a/java/google/registry/tools/soy/DeleteHost.soy b/core/src/main/java/google/registry/tools/soy/DeleteHost.soy
similarity index 100%
rename from java/google/registry/tools/soy/DeleteHost.soy
rename to core/src/main/java/google/registry/tools/soy/DeleteHost.soy
diff --git a/java/google/registry/tools/soy/DomainCheck.soy b/core/src/main/java/google/registry/tools/soy/DomainCheck.soy
similarity index 100%
rename from java/google/registry/tools/soy/DomainCheck.soy
rename to core/src/main/java/google/registry/tools/soy/DomainCheck.soy
diff --git a/java/google/registry/tools/soy/DomainCheckClaims.soy b/core/src/main/java/google/registry/tools/soy/DomainCheckClaims.soy
similarity index 100%
rename from java/google/registry/tools/soy/DomainCheckClaims.soy
rename to core/src/main/java/google/registry/tools/soy/DomainCheckClaims.soy
diff --git a/java/google/registry/tools/soy/DomainCreate.soy b/core/src/main/java/google/registry/tools/soy/DomainCreate.soy
similarity index 100%
rename from java/google/registry/tools/soy/DomainCreate.soy
rename to core/src/main/java/google/registry/tools/soy/DomainCreate.soy
diff --git a/java/google/registry/tools/soy/DomainUpdate.soy b/core/src/main/java/google/registry/tools/soy/DomainUpdate.soy
similarity index 100%
rename from java/google/registry/tools/soy/DomainUpdate.soy
rename to core/src/main/java/google/registry/tools/soy/DomainUpdate.soy
diff --git a/java/google/registry/tools/soy/HostCreate.soy b/core/src/main/java/google/registry/tools/soy/HostCreate.soy
similarity index 100%
rename from java/google/registry/tools/soy/HostCreate.soy
rename to core/src/main/java/google/registry/tools/soy/HostCreate.soy
diff --git a/java/google/registry/tools/soy/RemoveIpAddress.soy b/core/src/main/java/google/registry/tools/soy/RemoveIpAddress.soy
similarity index 100%
rename from java/google/registry/tools/soy/RemoveIpAddress.soy
rename to core/src/main/java/google/registry/tools/soy/RemoveIpAddress.soy
diff --git a/java/google/registry/tools/soy/RenewDomain.soy b/core/src/main/java/google/registry/tools/soy/RenewDomain.soy
similarity index 100%
rename from java/google/registry/tools/soy/RenewDomain.soy
rename to core/src/main/java/google/registry/tools/soy/RenewDomain.soy
diff --git a/java/google/registry/tools/soy/UniformRapidSuspension.soy b/core/src/main/java/google/registry/tools/soy/UniformRapidSuspension.soy
similarity index 100%
rename from java/google/registry/tools/soy/UniformRapidSuspension.soy
rename to core/src/main/java/google/registry/tools/soy/UniformRapidSuspension.soy
diff --git a/java/google/registry/tools/soy/UpdateServerLocks.soy b/core/src/main/java/google/registry/tools/soy/UpdateServerLocks.soy
similarity index 100%
rename from java/google/registry/tools/soy/UpdateServerLocks.soy
rename to core/src/main/java/google/registry/tools/soy/UpdateServerLocks.soy
diff --git a/java/google/registry/ui/BUILD b/core/src/main/java/google/registry/ui/BUILD
similarity index 100%
rename from java/google/registry/ui/BUILD
rename to core/src/main/java/google/registry/ui/BUILD
diff --git a/java/google/registry/ui/ConsoleDebug.java b/core/src/main/java/google/registry/ui/ConsoleDebug.java
similarity index 100%
rename from java/google/registry/ui/ConsoleDebug.java
rename to core/src/main/java/google/registry/ui/ConsoleDebug.java
diff --git a/java/google/registry/ui/assets/images/ajax-loader.gif b/core/src/main/java/google/registry/ui/assets/images/ajax-loader.gif
similarity index 100%
rename from java/google/registry/ui/assets/images/ajax-loader.gif
rename to core/src/main/java/google/registry/ui/assets/images/ajax-loader.gif
diff --git a/java/google/registry/ui/assets/images/android_sad.png b/core/src/main/java/google/registry/ui/assets/images/android_sad.png
similarity index 100%
rename from java/google/registry/ui/assets/images/android_sad.png
rename to core/src/main/java/google/registry/ui/assets/images/android_sad.png
diff --git a/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey.png b/core/src/main/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey.png
similarity index 100%
rename from java/google/registry/ui/assets/images/disclosure_arrow_dk_grey.png
rename to core/src/main/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey.png
diff --git a/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_down.png b/core/src/main/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_down.png
similarity index 100%
rename from java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_down.png
rename to core/src/main/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_down.png
diff --git a/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_up_down.png b/core/src/main/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_up_down.png
similarity index 100%
rename from java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_up_down.png
rename to core/src/main/java/google/registry/ui/assets/images/disclosure_arrow_dk_grey_up_down.png
diff --git a/java/google/registry/ui/assets/images/explore_24.png b/core/src/main/java/google/registry/ui/assets/images/explore_24.png
similarity index 100%
rename from java/google/registry/ui/assets/images/explore_24.png
rename to core/src/main/java/google/registry/ui/assets/images/explore_24.png
diff --git a/java/google/registry/ui/assets/images/folder.png b/core/src/main/java/google/registry/ui/assets/images/folder.png
similarity index 100%
rename from java/google/registry/ui/assets/images/folder.png
rename to core/src/main/java/google/registry/ui/assets/images/folder.png
diff --git a/java/google/registry/ui/assets/images/google_registry.png b/core/src/main/java/google/registry/ui/assets/images/google_registry.png
similarity index 100%
rename from java/google/registry/ui/assets/images/google_registry.png
rename to core/src/main/java/google/registry/ui/assets/images/google_registry.png
diff --git a/java/google/registry/ui/assets/images/homeContact.png b/core/src/main/java/google/registry/ui/assets/images/homeContact.png
similarity index 100%
rename from java/google/registry/ui/assets/images/homeContact.png
rename to core/src/main/java/google/registry/ui/assets/images/homeContact.png
diff --git a/java/google/registry/ui/assets/images/homeResources.png b/core/src/main/java/google/registry/ui/assets/images/homeResources.png
similarity index 100%
rename from java/google/registry/ui/assets/images/homeResources.png
rename to core/src/main/java/google/registry/ui/assets/images/homeResources.png
diff --git a/java/google/registry/ui/assets/images/homeSettings.png b/core/src/main/java/google/registry/ui/assets/images/homeSettings.png
similarity index 100%
rename from java/google/registry/ui/assets/images/homeSettings.png
rename to core/src/main/java/google/registry/ui/assets/images/homeSettings.png
diff --git a/java/google/registry/ui/assets/images/ic_contacts_blue_12.png b/core/src/main/java/google/registry/ui/assets/images/ic_contacts_blue_12.png
similarity index 100%
rename from java/google/registry/ui/assets/images/ic_contacts_blue_12.png
rename to core/src/main/java/google/registry/ui/assets/images/ic_contacts_blue_12.png
diff --git a/java/google/registry/ui/assets/images/ic_contacts_blue_8.png b/core/src/main/java/google/registry/ui/assets/images/ic_contacts_blue_8.png
similarity index 100%
rename from java/google/registry/ui/assets/images/ic_contacts_blue_8.png
rename to core/src/main/java/google/registry/ui/assets/images/ic_contacts_blue_8.png
diff --git a/java/google/registry/ui/assets/images/icons/svg/Gcomm/search.svg b/core/src/main/java/google/registry/ui/assets/images/icons/svg/Gcomm/search.svg
similarity index 100%
rename from java/google/registry/ui/assets/images/icons/svg/Gcomm/search.svg
rename to core/src/main/java/google/registry/ui/assets/images/icons/svg/Gcomm/search.svg
diff --git a/java/google/registry/ui/assets/images/icons/svg/search.svg b/core/src/main/java/google/registry/ui/assets/images/icons/svg/search.svg
similarity index 100%
rename from java/google/registry/ui/assets/images/icons/svg/search.svg
rename to core/src/main/java/google/registry/ui/assets/images/icons/svg/search.svg
diff --git a/java/google/registry/ui/assets/images/icons/svg/settings.svg b/core/src/main/java/google/registry/ui/assets/images/icons/svg/settings.svg
similarity index 100%
rename from java/google/registry/ui/assets/images/icons/svg/settings.svg
rename to core/src/main/java/google/registry/ui/assets/images/icons/svg/settings.svg
diff --git a/java/google/registry/ui/assets/images/loader1x.gif b/core/src/main/java/google/registry/ui/assets/images/loader1x.gif
similarity index 100%
rename from java/google/registry/ui/assets/images/loader1x.gif
rename to core/src/main/java/google/registry/ui/assets/images/loader1x.gif
diff --git a/java/google/registry/ui/assets/images/loader4x.gif b/core/src/main/java/google/registry/ui/assets/images/loader4x.gif
similarity index 100%
rename from java/google/registry/ui/assets/images/loader4x.gif
rename to core/src/main/java/google/registry/ui/assets/images/loader4x.gif
diff --git a/java/google/registry/ui/assets/images/logo.png b/core/src/main/java/google/registry/ui/assets/images/logo.png
similarity index 100%
rename from java/google/registry/ui/assets/images/logo.png
rename to core/src/main/java/google/registry/ui/assets/images/logo.png
diff --git a/java/google/registry/ui/assets/images/logo_sm.gif b/core/src/main/java/google/registry/ui/assets/images/logo_sm.gif
similarity index 100%
rename from java/google/registry/ui/assets/images/logo_sm.gif
rename to core/src/main/java/google/registry/ui/assets/images/logo_sm.gif
diff --git a/java/google/registry/ui/assets/images/offline_lightning.png b/core/src/main/java/google/registry/ui/assets/images/offline_lightning.png
similarity index 100%
rename from java/google/registry/ui/assets/images/offline_lightning.png
rename to core/src/main/java/google/registry/ui/assets/images/offline_lightning.png
diff --git a/java/google/registry/ui/assets/images/ribbon_certified-128.png b/core/src/main/java/google/registry/ui/assets/images/ribbon_certified-128.png
similarity index 100%
rename from java/google/registry/ui/assets/images/ribbon_certified-128.png
rename to core/src/main/java/google/registry/ui/assets/images/ribbon_certified-128.png
diff --git a/java/google/registry/ui/assets/images/ribbon_certified-64.png b/core/src/main/java/google/registry/ui/assets/images/ribbon_certified-64.png
similarity index 100%
rename from java/google/registry/ui/assets/images/ribbon_certified-64.png
rename to core/src/main/java/google/registry/ui/assets/images/ribbon_certified-64.png
diff --git a/java/google/registry/ui/assets/images/visibleOff_16.png b/core/src/main/java/google/registry/ui/assets/images/visibleOff_16.png
similarity index 100%
rename from java/google/registry/ui/assets/images/visibleOff_16.png
rename to core/src/main/java/google/registry/ui/assets/images/visibleOff_16.png
diff --git a/java/google/registry/ui/assets/images/visibleOn_16.png b/core/src/main/java/google/registry/ui/assets/images/visibleOn_16.png
similarity index 100%
rename from java/google/registry/ui/assets/images/visibleOn_16.png
rename to core/src/main/java/google/registry/ui/assets/images/visibleOn_16.png
diff --git a/java/google/registry/ui/compile_test.js b/core/src/main/java/google/registry/ui/compile_test.js
similarity index 100%
rename from java/google/registry/ui/compile_test.js
rename to core/src/main/java/google/registry/ui/compile_test.js
diff --git a/java/google/registry/ui/conformance_proto.txt b/core/src/main/java/google/registry/ui/conformance_proto.txt
similarity index 100%
rename from java/google/registry/ui/conformance_proto.txt
rename to core/src/main/java/google/registry/ui/conformance_proto.txt
diff --git a/java/google/registry/ui/css/BUILD b/core/src/main/java/google/registry/ui/css/BUILD
similarity index 100%
rename from java/google/registry/ui/css/BUILD
rename to core/src/main/java/google/registry/ui/css/BUILD
diff --git a/java/google/registry/ui/css/admin-settings.css b/core/src/main/java/google/registry/ui/css/admin-settings.css
similarity index 100%
rename from java/google/registry/ui/css/admin-settings.css
rename to core/src/main/java/google/registry/ui/css/admin-settings.css
diff --git a/java/google/registry/ui/css/console.css b/core/src/main/java/google/registry/ui/css/console.css
similarity index 100%
rename from java/google/registry/ui/css/console.css
rename to core/src/main/java/google/registry/ui/css/console.css
diff --git a/java/google/registry/ui/css/contact-settings.css b/core/src/main/java/google/registry/ui/css/contact-settings.css
similarity index 100%
rename from java/google/registry/ui/css/contact-settings.css
rename to core/src/main/java/google/registry/ui/css/contact-settings.css
diff --git a/java/google/registry/ui/css/contact-us.css b/core/src/main/java/google/registry/ui/css/contact-us.css
similarity index 100%
rename from java/google/registry/ui/css/contact-us.css
rename to core/src/main/java/google/registry/ui/css/contact-us.css
diff --git a/java/google/registry/ui/css/dashboard.css b/core/src/main/java/google/registry/ui/css/dashboard.css
similarity index 100%
rename from java/google/registry/ui/css/dashboard.css
rename to core/src/main/java/google/registry/ui/css/dashboard.css
diff --git a/java/google/registry/ui/css/demo_css.css b/core/src/main/java/google/registry/ui/css/demo_css.css
similarity index 100%
rename from java/google/registry/ui/css/demo_css.css
rename to core/src/main/java/google/registry/ui/css/demo_css.css
diff --git a/java/google/registry/ui/css/epp.css b/core/src/main/java/google/registry/ui/css/epp.css
similarity index 100%
rename from java/google/registry/ui/css/epp.css
rename to core/src/main/java/google/registry/ui/css/epp.css
diff --git a/java/google/registry/ui/css/forms.css b/core/src/main/java/google/registry/ui/css/forms.css
similarity index 100%
rename from java/google/registry/ui/css/forms.css
rename to core/src/main/java/google/registry/ui/css/forms.css
diff --git a/java/google/registry/ui/css/kd_components.css b/core/src/main/java/google/registry/ui/css/kd_components.css
similarity index 100%
rename from java/google/registry/ui/css/kd_components.css
rename to core/src/main/java/google/registry/ui/css/kd_components.css
diff --git a/java/google/registry/ui/css/registrar_imports_raw.css b/core/src/main/java/google/registry/ui/css/registrar_imports_raw.css
similarity index 100%
rename from java/google/registry/ui/css/registrar_imports_raw.css
rename to core/src/main/java/google/registry/ui/css/registrar_imports_raw.css
diff --git a/java/google/registry/ui/css/registry.css b/core/src/main/java/google/registry/ui/css/registry.css
similarity index 100%
rename from java/google/registry/ui/css/registry.css
rename to core/src/main/java/google/registry/ui/css/registry.css
diff --git a/java/google/registry/ui/css/resources.css b/core/src/main/java/google/registry/ui/css/resources.css
similarity index 100%
rename from java/google/registry/ui/css/resources.css
rename to core/src/main/java/google/registry/ui/css/resources.css
diff --git a/java/google/registry/ui/css/security-settings.css b/core/src/main/java/google/registry/ui/css/security-settings.css
similarity index 100%
rename from java/google/registry/ui/css/security-settings.css
rename to core/src/main/java/google/registry/ui/css/security-settings.css
diff --git a/java/google/registry/ui/epptmpl/contact_info.xml b/core/src/main/java/google/registry/ui/epptmpl/contact_info.xml
similarity index 100%
rename from java/google/registry/ui/epptmpl/contact_info.xml
rename to core/src/main/java/google/registry/ui/epptmpl/contact_info.xml
diff --git a/java/google/registry/ui/epptmpl/contact_transfer_request.xml b/core/src/main/java/google/registry/ui/epptmpl/contact_transfer_request.xml
similarity index 100%
rename from java/google/registry/ui/epptmpl/contact_transfer_request.xml
rename to core/src/main/java/google/registry/ui/epptmpl/contact_transfer_request.xml
diff --git a/java/google/registry/ui/epptmpl/domain_create_no_hosts_or_dsdata.xml b/core/src/main/java/google/registry/ui/epptmpl/domain_create_no_hosts_or_dsdata.xml
similarity index 100%
rename from java/google/registry/ui/epptmpl/domain_create_no_hosts_or_dsdata.xml
rename to core/src/main/java/google/registry/ui/epptmpl/domain_create_no_hosts_or_dsdata.xml
diff --git a/java/google/registry/ui/epptmpl/domain_delete.xml b/core/src/main/java/google/registry/ui/epptmpl/domain_delete.xml
similarity index 100%
rename from java/google/registry/ui/epptmpl/domain_delete.xml
rename to core/src/main/java/google/registry/ui/epptmpl/domain_delete.xml
diff --git a/java/google/registry/ui/epptmpl/domain_update_restore_request.xml b/core/src/main/java/google/registry/ui/epptmpl/domain_update_restore_request.xml
similarity index 100%
rename from java/google/registry/ui/epptmpl/domain_update_restore_request.xml
rename to core/src/main/java/google/registry/ui/epptmpl/domain_update_restore_request.xml
diff --git a/java/google/registry/ui/epptmpl/login_valid.xml b/core/src/main/java/google/registry/ui/epptmpl/login_valid.xml
similarity index 100%
rename from java/google/registry/ui/epptmpl/login_valid.xml
rename to core/src/main/java/google/registry/ui/epptmpl/login_valid.xml
diff --git a/java/google/registry/ui/epptmpl/logout.xml b/core/src/main/java/google/registry/ui/epptmpl/logout.xml
similarity index 100%
rename from java/google/registry/ui/epptmpl/logout.xml
rename to core/src/main/java/google/registry/ui/epptmpl/logout.xml
diff --git a/java/google/registry/ui/epptmpl/poll.xml b/core/src/main/java/google/registry/ui/epptmpl/poll.xml
similarity index 100%
rename from java/google/registry/ui/epptmpl/poll.xml
rename to core/src/main/java/google/registry/ui/epptmpl/poll.xml
diff --git a/java/google/registry/ui/externs/BUILD b/core/src/main/java/google/registry/ui/externs/BUILD
similarity index 100%
rename from java/google/registry/ui/externs/BUILD
rename to core/src/main/java/google/registry/ui/externs/BUILD
diff --git a/java/google/registry/ui/externs/json.js b/core/src/main/java/google/registry/ui/externs/json.js
similarity index 100%
rename from java/google/registry/ui/externs/json.js
rename to core/src/main/java/google/registry/ui/externs/json.js
diff --git a/java/google/registry/ui/forms/BUILD b/core/src/main/java/google/registry/ui/forms/BUILD
similarity index 100%
rename from java/google/registry/ui/forms/BUILD
rename to core/src/main/java/google/registry/ui/forms/BUILD
diff --git a/java/google/registry/ui/forms/FormException.java b/core/src/main/java/google/registry/ui/forms/FormException.java
similarity index 100%
rename from java/google/registry/ui/forms/FormException.java
rename to core/src/main/java/google/registry/ui/forms/FormException.java
diff --git a/java/google/registry/ui/forms/FormField.java b/core/src/main/java/google/registry/ui/forms/FormField.java
similarity index 100%
rename from java/google/registry/ui/forms/FormField.java
rename to core/src/main/java/google/registry/ui/forms/FormField.java
diff --git a/java/google/registry/ui/forms/FormFieldException.java b/core/src/main/java/google/registry/ui/forms/FormFieldException.java
similarity index 100%
rename from java/google/registry/ui/forms/FormFieldException.java
rename to core/src/main/java/google/registry/ui/forms/FormFieldException.java
diff --git a/java/google/registry/ui/forms/FormFields.java b/core/src/main/java/google/registry/ui/forms/FormFields.java
similarity index 100%
rename from java/google/registry/ui/forms/FormFields.java
rename to core/src/main/java/google/registry/ui/forms/FormFields.java
diff --git a/java/google/registry/ui/forms/package-info.java b/core/src/main/java/google/registry/ui/forms/package-info.java
similarity index 100%
rename from java/google/registry/ui/forms/package-info.java
rename to core/src/main/java/google/registry/ui/forms/package-info.java
diff --git a/java/google/registry/ui/globals.txt b/core/src/main/java/google/registry/ui/globals.txt
similarity index 100%
rename from java/google/registry/ui/globals.txt
rename to core/src/main/java/google/registry/ui/globals.txt
diff --git a/java/google/registry/ui/html/BUILD b/core/src/main/java/google/registry/ui/html/BUILD
similarity index 100%
rename from java/google/registry/ui/html/BUILD
rename to core/src/main/java/google/registry/ui/html/BUILD
diff --git a/java/google/registry/ui/html/error.html b/core/src/main/java/google/registry/ui/html/error.html
similarity index 100%
rename from java/google/registry/ui/html/error.html
rename to core/src/main/java/google/registry/ui/html/error.html
diff --git a/java/google/registry/ui/html/index.html b/core/src/main/java/google/registry/ui/html/index.html
similarity index 100%
rename from java/google/registry/ui/html/index.html
rename to core/src/main/java/google/registry/ui/html/index.html
diff --git a/java/google/registry/ui/js/BUILD b/core/src/main/java/google/registry/ui/js/BUILD
similarity index 100%
rename from java/google/registry/ui/js/BUILD
rename to core/src/main/java/google/registry/ui/js/BUILD
diff --git a/java/google/registry/ui/js/component.js b/core/src/main/java/google/registry/ui/js/component.js
similarity index 100%
rename from java/google/registry/ui/js/component.js
rename to core/src/main/java/google/registry/ui/js/component.js
diff --git a/java/google/registry/ui/js/console.js b/core/src/main/java/google/registry/ui/js/console.js
similarity index 100%
rename from java/google/registry/ui/js/console.js
rename to core/src/main/java/google/registry/ui/js/console.js
diff --git a/java/google/registry/ui/js/edit_item.js b/core/src/main/java/google/registry/ui/js/edit_item.js
similarity index 100%
rename from java/google/registry/ui/js/edit_item.js
rename to core/src/main/java/google/registry/ui/js/edit_item.js
diff --git a/java/google/registry/ui/js/forms.js b/core/src/main/java/google/registry/ui/js/forms.js
similarity index 100%
rename from java/google/registry/ui/js/forms.js
rename to core/src/main/java/google/registry/ui/js/forms.js
diff --git a/java/google/registry/ui/js/menu_button.js b/core/src/main/java/google/registry/ui/js/menu_button.js
similarity index 100%
rename from java/google/registry/ui/js/menu_button.js
rename to core/src/main/java/google/registry/ui/js/menu_button.js
diff --git a/java/google/registry/ui/js/registrar/BUILD b/core/src/main/java/google/registry/ui/js/registrar/BUILD
similarity index 100%
rename from java/google/registry/ui/js/registrar/BUILD
rename to core/src/main/java/google/registry/ui/js/registrar/BUILD
diff --git a/java/google/registry/ui/js/registrar/admin_settings.js b/core/src/main/java/google/registry/ui/js/registrar/admin_settings.js
similarity index 100%
rename from java/google/registry/ui/js/registrar/admin_settings.js
rename to core/src/main/java/google/registry/ui/js/registrar/admin_settings.js
diff --git a/java/google/registry/ui/js/registrar/console.js b/core/src/main/java/google/registry/ui/js/registrar/console.js
similarity index 100%
rename from java/google/registry/ui/js/registrar/console.js
rename to core/src/main/java/google/registry/ui/js/registrar/console.js
diff --git a/java/google/registry/ui/js/registrar/contact_settings.js b/core/src/main/java/google/registry/ui/js/registrar/contact_settings.js
similarity index 100%
rename from java/google/registry/ui/js/registrar/contact_settings.js
rename to core/src/main/java/google/registry/ui/js/registrar/contact_settings.js
diff --git a/java/google/registry/ui/js/registrar/contact_us.js b/core/src/main/java/google/registry/ui/js/registrar/contact_us.js
similarity index 100%
rename from java/google/registry/ui/js/registrar/contact_us.js
rename to core/src/main/java/google/registry/ui/js/registrar/contact_us.js
diff --git a/java/google/registry/ui/js/registrar/dashboard.js b/core/src/main/java/google/registry/ui/js/registrar/dashboard.js
similarity index 100%
rename from java/google/registry/ui/js/registrar/dashboard.js
rename to core/src/main/java/google/registry/ui/js/registrar/dashboard.js
diff --git a/java/google/registry/ui/js/registrar/main.js b/core/src/main/java/google/registry/ui/js/registrar/main.js
similarity index 100%
rename from java/google/registry/ui/js/registrar/main.js
rename to core/src/main/java/google/registry/ui/js/registrar/main.js
diff --git a/java/google/registry/ui/js/registrar/resources.js b/core/src/main/java/google/registry/ui/js/registrar/resources.js
similarity index 100%
rename from java/google/registry/ui/js/registrar/resources.js
rename to core/src/main/java/google/registry/ui/js/registrar/resources.js
diff --git a/java/google/registry/ui/js/registrar/security_settings.js b/core/src/main/java/google/registry/ui/js/registrar/security_settings.js
similarity index 100%
rename from java/google/registry/ui/js/registrar/security_settings.js
rename to core/src/main/java/google/registry/ui/js/registrar/security_settings.js
diff --git a/java/google/registry/ui/js/registrar/whois_settings.js b/core/src/main/java/google/registry/ui/js/registrar/whois_settings.js
similarity index 100%
rename from java/google/registry/ui/js/registrar/whois_settings.js
rename to core/src/main/java/google/registry/ui/js/registrar/whois_settings.js
diff --git a/java/google/registry/ui/js/resource.js b/core/src/main/java/google/registry/ui/js/resource.js
similarity index 100%
rename from java/google/registry/ui/js/resource.js
rename to core/src/main/java/google/registry/ui/js/resource.js
diff --git a/java/google/registry/ui/js/resource_component.js b/core/src/main/java/google/registry/ui/js/resource_component.js
similarity index 100%
rename from java/google/registry/ui/js/resource_component.js
rename to core/src/main/java/google/registry/ui/js/resource_component.js
diff --git a/java/google/registry/ui/js/session.js b/core/src/main/java/google/registry/ui/js/session.js
similarity index 100%
rename from java/google/registry/ui/js/session.js
rename to core/src/main/java/google/registry/ui/js/session.js
diff --git a/java/google/registry/ui/js/util.js b/core/src/main/java/google/registry/ui/js/util.js
similarity index 100%
rename from java/google/registry/ui/js/util.js
rename to core/src/main/java/google/registry/ui/js/util.js
diff --git a/java/google/registry/ui/package-info.java b/core/src/main/java/google/registry/ui/package-info.java
similarity index 100%
rename from java/google/registry/ui/package-info.java
rename to core/src/main/java/google/registry/ui/package-info.java
diff --git a/java/google/registry/ui/server/BUILD b/core/src/main/java/google/registry/ui/server/BUILD
similarity index 100%
rename from java/google/registry/ui/server/BUILD
rename to core/src/main/java/google/registry/ui/server/BUILD
diff --git a/java/google/registry/ui/server/RegistrarFormFields.java b/core/src/main/java/google/registry/ui/server/RegistrarFormFields.java
similarity index 100%
rename from java/google/registry/ui/server/RegistrarFormFields.java
rename to core/src/main/java/google/registry/ui/server/RegistrarFormFields.java
diff --git a/java/google/registry/ui/server/SendEmailUtils.java b/core/src/main/java/google/registry/ui/server/SendEmailUtils.java
similarity index 100%
rename from java/google/registry/ui/server/SendEmailUtils.java
rename to core/src/main/java/google/registry/ui/server/SendEmailUtils.java
diff --git a/java/google/registry/ui/server/SoyTemplateUtils.java b/core/src/main/java/google/registry/ui/server/SoyTemplateUtils.java
similarity index 100%
rename from java/google/registry/ui/server/SoyTemplateUtils.java
rename to core/src/main/java/google/registry/ui/server/SoyTemplateUtils.java
diff --git a/java/google/registry/ui/server/StateCode.java b/core/src/main/java/google/registry/ui/server/StateCode.java
similarity index 100%
rename from java/google/registry/ui/server/StateCode.java
rename to core/src/main/java/google/registry/ui/server/StateCode.java
diff --git a/java/google/registry/ui/server/package-info.java b/core/src/main/java/google/registry/ui/server/package-info.java
similarity index 100%
rename from java/google/registry/ui/server/package-info.java
rename to core/src/main/java/google/registry/ui/server/package-info.java
diff --git a/java/google/registry/ui/server/registrar/BUILD b/core/src/main/java/google/registry/ui/server/registrar/BUILD
similarity index 100%
rename from java/google/registry/ui/server/registrar/BUILD
rename to core/src/main/java/google/registry/ui/server/registrar/BUILD
diff --git a/java/google/registry/ui/server/registrar/ConsoleOteSetupAction.java b/core/src/main/java/google/registry/ui/server/registrar/ConsoleOteSetupAction.java
similarity index 100%
rename from java/google/registry/ui/server/registrar/ConsoleOteSetupAction.java
rename to core/src/main/java/google/registry/ui/server/registrar/ConsoleOteSetupAction.java
diff --git a/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorAction.java b/core/src/main/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorAction.java
similarity index 100%
rename from java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorAction.java
rename to core/src/main/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorAction.java
diff --git a/java/google/registry/ui/server/registrar/ConsoleUiAction.java b/core/src/main/java/google/registry/ui/server/registrar/ConsoleUiAction.java
similarity index 100%
rename from java/google/registry/ui/server/registrar/ConsoleUiAction.java
rename to core/src/main/java/google/registry/ui/server/registrar/ConsoleUiAction.java
diff --git a/java/google/registry/ui/server/registrar/OteStatusAction.java b/core/src/main/java/google/registry/ui/server/registrar/OteStatusAction.java
similarity index 100%
rename from java/google/registry/ui/server/registrar/OteStatusAction.java
rename to core/src/main/java/google/registry/ui/server/registrar/OteStatusAction.java
diff --git a/java/google/registry/ui/server/registrar/RegistrarConsoleMetrics.java b/core/src/main/java/google/registry/ui/server/registrar/RegistrarConsoleMetrics.java
similarity index 100%
rename from java/google/registry/ui/server/registrar/RegistrarConsoleMetrics.java
rename to core/src/main/java/google/registry/ui/server/registrar/RegistrarConsoleMetrics.java
diff --git a/java/google/registry/ui/server/registrar/RegistrarConsoleModule.java b/core/src/main/java/google/registry/ui/server/registrar/RegistrarConsoleModule.java
similarity index 100%
rename from java/google/registry/ui/server/registrar/RegistrarConsoleModule.java
rename to core/src/main/java/google/registry/ui/server/registrar/RegistrarConsoleModule.java
diff --git a/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java b/core/src/main/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java
similarity index 100%
rename from java/google/registry/ui/server/registrar/RegistrarSettingsAction.java
rename to core/src/main/java/google/registry/ui/server/registrar/RegistrarSettingsAction.java
diff --git a/java/google/registry/ui/server/registrar/package-info.java b/core/src/main/java/google/registry/ui/server/registrar/package-info.java
similarity index 100%
rename from java/google/registry/ui/server/registrar/package-info.java
rename to core/src/main/java/google/registry/ui/server/registrar/package-info.java
diff --git a/java/google/registry/ui/soy/Analytics.soy b/core/src/main/java/google/registry/ui/soy/Analytics.soy
similarity index 100%
rename from java/google/registry/ui/soy/Analytics.soy
rename to core/src/main/java/google/registry/ui/soy/Analytics.soy
diff --git a/java/google/registry/ui/soy/BUILD b/core/src/main/java/google/registry/ui/soy/BUILD
similarity index 100%
rename from java/google/registry/ui/soy/BUILD
rename to core/src/main/java/google/registry/ui/soy/BUILD
diff --git a/java/google/registry/ui/soy/Console.soy b/core/src/main/java/google/registry/ui/soy/Console.soy
similarity index 100%
rename from java/google/registry/ui/soy/Console.soy
rename to core/src/main/java/google/registry/ui/soy/Console.soy
diff --git a/java/google/registry/ui/soy/Forms.soy b/core/src/main/java/google/registry/ui/soy/Forms.soy
similarity index 100%
rename from java/google/registry/ui/soy/Forms.soy
rename to core/src/main/java/google/registry/ui/soy/Forms.soy
diff --git a/java/google/registry/ui/soy/registrar/AdminSettings.soy b/core/src/main/java/google/registry/ui/soy/registrar/AdminSettings.soy
similarity index 100%
rename from java/google/registry/ui/soy/registrar/AdminSettings.soy
rename to core/src/main/java/google/registry/ui/soy/registrar/AdminSettings.soy
diff --git a/java/google/registry/ui/soy/registrar/BUILD b/core/src/main/java/google/registry/ui/soy/registrar/BUILD
similarity index 100%
rename from java/google/registry/ui/soy/registrar/BUILD
rename to core/src/main/java/google/registry/ui/soy/registrar/BUILD
diff --git a/java/google/registry/ui/soy/registrar/Console.soy b/core/src/main/java/google/registry/ui/soy/registrar/Console.soy
similarity index 100%
rename from java/google/registry/ui/soy/registrar/Console.soy
rename to core/src/main/java/google/registry/ui/soy/registrar/Console.soy
diff --git a/java/google/registry/ui/soy/registrar/ContactSettings.soy b/core/src/main/java/google/registry/ui/soy/registrar/ContactSettings.soy
similarity index 100%
rename from java/google/registry/ui/soy/registrar/ContactSettings.soy
rename to core/src/main/java/google/registry/ui/soy/registrar/ContactSettings.soy
diff --git a/java/google/registry/ui/soy/registrar/OteSetupConsole.soy b/core/src/main/java/google/registry/ui/soy/registrar/OteSetupConsole.soy
similarity index 100%
rename from java/google/registry/ui/soy/registrar/OteSetupConsole.soy
rename to core/src/main/java/google/registry/ui/soy/registrar/OteSetupConsole.soy
diff --git a/java/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy b/core/src/main/java/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy
similarity index 100%
rename from java/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy
rename to core/src/main/java/google/registry/ui/soy/registrar/RegistrarCreateConsole.soy
diff --git a/java/google/registry/ui/soy/registrar/SecuritySettings.soy b/core/src/main/java/google/registry/ui/soy/registrar/SecuritySettings.soy
similarity index 100%
rename from java/google/registry/ui/soy/registrar/SecuritySettings.soy
rename to core/src/main/java/google/registry/ui/soy/registrar/SecuritySettings.soy
diff --git a/java/google/registry/ui/soy/registrar/WhoisSettings.soy b/core/src/main/java/google/registry/ui/soy/registrar/WhoisSettings.soy
similarity index 100%
rename from java/google/registry/ui/soy/registrar/WhoisSettings.soy
rename to core/src/main/java/google/registry/ui/soy/registrar/WhoisSettings.soy
diff --git a/java/google/registry/whois/BUILD b/core/src/main/java/google/registry/whois/BUILD
similarity index 100%
rename from java/google/registry/whois/BUILD
rename to core/src/main/java/google/registry/whois/BUILD
diff --git a/java/google/registry/whois/DomainLookupCommand.java b/core/src/main/java/google/registry/whois/DomainLookupCommand.java
similarity index 100%
rename from java/google/registry/whois/DomainLookupCommand.java
rename to core/src/main/java/google/registry/whois/DomainLookupCommand.java
diff --git a/java/google/registry/whois/DomainOrHostLookupCommand.java b/core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java
similarity index 100%
rename from java/google/registry/whois/DomainOrHostLookupCommand.java
rename to core/src/main/java/google/registry/whois/DomainOrHostLookupCommand.java
diff --git a/java/google/registry/whois/DomainWhoisResponse.java b/core/src/main/java/google/registry/whois/DomainWhoisResponse.java
similarity index 100%
rename from java/google/registry/whois/DomainWhoisResponse.java
rename to core/src/main/java/google/registry/whois/DomainWhoisResponse.java
diff --git a/java/google/registry/whois/NameserverLookupByHostCommand.java b/core/src/main/java/google/registry/whois/NameserverLookupByHostCommand.java
similarity index 100%
rename from java/google/registry/whois/NameserverLookupByHostCommand.java
rename to core/src/main/java/google/registry/whois/NameserverLookupByHostCommand.java
diff --git a/java/google/registry/whois/NameserverLookupByIpCommand.java b/core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java
similarity index 100%
rename from java/google/registry/whois/NameserverLookupByIpCommand.java
rename to core/src/main/java/google/registry/whois/NameserverLookupByIpCommand.java
diff --git a/java/google/registry/whois/NameserverWhoisResponse.java b/core/src/main/java/google/registry/whois/NameserverWhoisResponse.java
similarity index 100%
rename from java/google/registry/whois/NameserverWhoisResponse.java
rename to core/src/main/java/google/registry/whois/NameserverWhoisResponse.java
diff --git a/java/google/registry/whois/RegistrarLookupCommand.java b/core/src/main/java/google/registry/whois/RegistrarLookupCommand.java
similarity index 100%
rename from java/google/registry/whois/RegistrarLookupCommand.java
rename to core/src/main/java/google/registry/whois/RegistrarLookupCommand.java
diff --git a/java/google/registry/whois/RegistrarWhoisResponse.java b/core/src/main/java/google/registry/whois/RegistrarWhoisResponse.java
similarity index 100%
rename from java/google/registry/whois/RegistrarWhoisResponse.java
rename to core/src/main/java/google/registry/whois/RegistrarWhoisResponse.java
diff --git a/java/google/registry/whois/Whois.java b/core/src/main/java/google/registry/whois/Whois.java
similarity index 100%
rename from java/google/registry/whois/Whois.java
rename to core/src/main/java/google/registry/whois/Whois.java
diff --git a/java/google/registry/whois/WhoisAction.java b/core/src/main/java/google/registry/whois/WhoisAction.java
similarity index 100%
rename from java/google/registry/whois/WhoisAction.java
rename to core/src/main/java/google/registry/whois/WhoisAction.java
diff --git a/java/google/registry/whois/WhoisCommand.java b/core/src/main/java/google/registry/whois/WhoisCommand.java
similarity index 100%
rename from java/google/registry/whois/WhoisCommand.java
rename to core/src/main/java/google/registry/whois/WhoisCommand.java
diff --git a/java/google/registry/whois/WhoisCommandFactory.java b/core/src/main/java/google/registry/whois/WhoisCommandFactory.java
similarity index 100%
rename from java/google/registry/whois/WhoisCommandFactory.java
rename to core/src/main/java/google/registry/whois/WhoisCommandFactory.java
diff --git a/java/google/registry/whois/WhoisException.java b/core/src/main/java/google/registry/whois/WhoisException.java
similarity index 100%
rename from java/google/registry/whois/WhoisException.java
rename to core/src/main/java/google/registry/whois/WhoisException.java
diff --git a/java/google/registry/whois/WhoisHttpAction.java b/core/src/main/java/google/registry/whois/WhoisHttpAction.java
similarity index 100%
rename from java/google/registry/whois/WhoisHttpAction.java
rename to core/src/main/java/google/registry/whois/WhoisHttpAction.java
diff --git a/java/google/registry/whois/WhoisMetrics.java b/core/src/main/java/google/registry/whois/WhoisMetrics.java
similarity index 100%
rename from java/google/registry/whois/WhoisMetrics.java
rename to core/src/main/java/google/registry/whois/WhoisMetrics.java
diff --git a/java/google/registry/whois/WhoisModule.java b/core/src/main/java/google/registry/whois/WhoisModule.java
similarity index 100%
rename from java/google/registry/whois/WhoisModule.java
rename to core/src/main/java/google/registry/whois/WhoisModule.java
diff --git a/java/google/registry/whois/WhoisReader.java b/core/src/main/java/google/registry/whois/WhoisReader.java
similarity index 100%
rename from java/google/registry/whois/WhoisReader.java
rename to core/src/main/java/google/registry/whois/WhoisReader.java
diff --git a/java/google/registry/whois/WhoisResponse.java b/core/src/main/java/google/registry/whois/WhoisResponse.java
similarity index 100%
rename from java/google/registry/whois/WhoisResponse.java
rename to core/src/main/java/google/registry/whois/WhoisResponse.java
diff --git a/java/google/registry/whois/WhoisResponseImpl.java b/core/src/main/java/google/registry/whois/WhoisResponseImpl.java
similarity index 100%
rename from java/google/registry/whois/WhoisResponseImpl.java
rename to core/src/main/java/google/registry/whois/WhoisResponseImpl.java
diff --git a/java/google/registry/whois/package-info.java b/core/src/main/java/google/registry/whois/package-info.java
similarity index 100%
rename from java/google/registry/whois/package-info.java
rename to core/src/main/java/google/registry/whois/package-info.java
diff --git a/java/google/registry/xjc/BUILD b/core/src/main/java/google/registry/xjc/BUILD
similarity index 100%
rename from java/google/registry/xjc/BUILD
rename to core/src/main/java/google/registry/xjc/BUILD
diff --git a/java/google/registry/xjc/JaxbFragment.java b/core/src/main/java/google/registry/xjc/JaxbFragment.java
similarity index 100%
rename from java/google/registry/xjc/JaxbFragment.java
rename to core/src/main/java/google/registry/xjc/JaxbFragment.java
diff --git a/java/google/registry/xjc/README.missing-code b/core/src/main/java/google/registry/xjc/README.missing-code
similarity index 100%
rename from java/google/registry/xjc/README.missing-code
rename to core/src/main/java/google/registry/xjc/README.missing-code
diff --git a/java/google/registry/xjc/XjcObject.java b/core/src/main/java/google/registry/xjc/XjcObject.java
similarity index 100%
rename from java/google/registry/xjc/XjcObject.java
rename to core/src/main/java/google/registry/xjc/XjcObject.java
diff --git a/java/google/registry/xjc/XjcXmlTransformer.java b/core/src/main/java/google/registry/xjc/XjcXmlTransformer.java
similarity index 100%
rename from java/google/registry/xjc/XjcXmlTransformer.java
rename to core/src/main/java/google/registry/xjc/XjcXmlTransformer.java
diff --git a/java/google/registry/xjc/bindings.xjb b/core/src/main/java/google/registry/xjc/bindings.xjb
similarity index 100%
rename from java/google/registry/xjc/bindings.xjb
rename to core/src/main/java/google/registry/xjc/bindings.xjb
diff --git a/java/google/registry/xjc/generated_files.bzl b/core/src/main/java/google/registry/xjc/generated_files.bzl
similarity index 100%
rename from java/google/registry/xjc/generated_files.bzl
rename to core/src/main/java/google/registry/xjc/generated_files.bzl
diff --git a/java/google/registry/xjc/list_generated_files.sh b/core/src/main/java/google/registry/xjc/list_generated_files.sh
similarity index 100%
rename from java/google/registry/xjc/list_generated_files.sh
rename to core/src/main/java/google/registry/xjc/list_generated_files.sh
diff --git a/java/google/registry/xjc/make_pkginfo.sh b/core/src/main/java/google/registry/xjc/make_pkginfo.sh
similarity index 100%
rename from java/google/registry/xjc/make_pkginfo.sh
rename to core/src/main/java/google/registry/xjc/make_pkginfo.sh
diff --git a/java/google/registry/xjc/package-info.java b/core/src/main/java/google/registry/xjc/package-info.java
similarity index 100%
rename from java/google/registry/xjc/package-info.java
rename to core/src/main/java/google/registry/xjc/package-info.java
diff --git a/java/google/registry/xjc/package-info.java.in b/core/src/main/java/google/registry/xjc/package-info.java.in
similarity index 100%
rename from java/google/registry/xjc/package-info.java.in
rename to core/src/main/java/google/registry/xjc/package-info.java.in
diff --git a/java/google/registry/xml/BUILD b/core/src/main/java/google/registry/xml/BUILD
similarity index 100%
rename from java/google/registry/xml/BUILD
rename to core/src/main/java/google/registry/xml/BUILD
diff --git a/java/google/registry/xml/DateAdapter.java b/core/src/main/java/google/registry/xml/DateAdapter.java
similarity index 100%
rename from java/google/registry/xml/DateAdapter.java
rename to core/src/main/java/google/registry/xml/DateAdapter.java
diff --git a/java/google/registry/xml/PeriodAdapter.java b/core/src/main/java/google/registry/xml/PeriodAdapter.java
similarity index 100%
rename from java/google/registry/xml/PeriodAdapter.java
rename to core/src/main/java/google/registry/xml/PeriodAdapter.java
diff --git a/java/google/registry/xml/TrimWhitespaceAdapter.java b/core/src/main/java/google/registry/xml/TrimWhitespaceAdapter.java
similarity index 100%
rename from java/google/registry/xml/TrimWhitespaceAdapter.java
rename to core/src/main/java/google/registry/xml/TrimWhitespaceAdapter.java
diff --git a/java/google/registry/xml/UtcDateTimeAdapter.java b/core/src/main/java/google/registry/xml/UtcDateTimeAdapter.java
similarity index 100%
rename from java/google/registry/xml/UtcDateTimeAdapter.java
rename to core/src/main/java/google/registry/xml/UtcDateTimeAdapter.java
diff --git a/java/google/registry/xml/ValidationMode.java b/core/src/main/java/google/registry/xml/ValidationMode.java
similarity index 100%
rename from java/google/registry/xml/ValidationMode.java
rename to core/src/main/java/google/registry/xml/ValidationMode.java
diff --git a/java/google/registry/xml/XmlException.java b/core/src/main/java/google/registry/xml/XmlException.java
similarity index 100%
rename from java/google/registry/xml/XmlException.java
rename to core/src/main/java/google/registry/xml/XmlException.java
diff --git a/java/google/registry/xml/XmlFragmentMarshaller.java b/core/src/main/java/google/registry/xml/XmlFragmentMarshaller.java
similarity index 100%
rename from java/google/registry/xml/XmlFragmentMarshaller.java
rename to core/src/main/java/google/registry/xml/XmlFragmentMarshaller.java
diff --git a/java/google/registry/xml/XmlTransformer.java b/core/src/main/java/google/registry/xml/XmlTransformer.java
similarity index 100%
rename from java/google/registry/xml/XmlTransformer.java
rename to core/src/main/java/google/registry/xml/XmlTransformer.java
diff --git a/java/google/registry/xml/package-info.java b/core/src/main/java/google/registry/xml/package-info.java
similarity index 100%
rename from java/google/registry/xml/package-info.java
rename to core/src/main/java/google/registry/xml/package-info.java
diff --git a/java/google/registry/xml/xsd/allocate.xsd b/core/src/main/java/google/registry/xml/xsd/allocate.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/allocate.xsd
rename to core/src/main/java/google/registry/xml/xsd/allocate.xsd
diff --git a/java/google/registry/xml/xsd/allocationToken-1.0.xsd b/core/src/main/java/google/registry/xml/xsd/allocationToken-1.0.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/allocationToken-1.0.xsd
rename to core/src/main/java/google/registry/xml/xsd/allocationToken-1.0.xsd
diff --git a/java/google/registry/xml/xsd/contact.xsd b/core/src/main/java/google/registry/xml/xsd/contact.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/contact.xsd
rename to core/src/main/java/google/registry/xml/xsd/contact.xsd
diff --git a/java/google/registry/xml/xsd/domain.xsd b/core/src/main/java/google/registry/xml/xsd/domain.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/domain.xsd
rename to core/src/main/java/google/registry/xml/xsd/domain.xsd
diff --git a/java/google/registry/xml/xsd/dsig.xsd b/core/src/main/java/google/registry/xml/xsd/dsig.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/dsig.xsd
rename to core/src/main/java/google/registry/xml/xsd/dsig.xsd
diff --git a/java/google/registry/xml/xsd/epp.xsd b/core/src/main/java/google/registry/xml/xsd/epp.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/epp.xsd
rename to core/src/main/java/google/registry/xml/xsd/epp.xsd
diff --git a/java/google/registry/xml/xsd/eppcom.xsd b/core/src/main/java/google/registry/xml/xsd/eppcom.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/eppcom.xsd
rename to core/src/main/java/google/registry/xml/xsd/eppcom.xsd
diff --git a/java/google/registry/xml/xsd/fee06.xsd b/core/src/main/java/google/registry/xml/xsd/fee06.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/fee06.xsd
rename to core/src/main/java/google/registry/xml/xsd/fee06.xsd
diff --git a/java/google/registry/xml/xsd/fee11.xsd b/core/src/main/java/google/registry/xml/xsd/fee11.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/fee11.xsd
rename to core/src/main/java/google/registry/xml/xsd/fee11.xsd
diff --git a/java/google/registry/xml/xsd/fee12.xsd b/core/src/main/java/google/registry/xml/xsd/fee12.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/fee12.xsd
rename to core/src/main/java/google/registry/xml/xsd/fee12.xsd
diff --git a/java/google/registry/xml/xsd/host.xsd b/core/src/main/java/google/registry/xml/xsd/host.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/host.xsd
rename to core/src/main/java/google/registry/xml/xsd/host.xsd
diff --git a/java/google/registry/xml/xsd/iirdea.xsd b/core/src/main/java/google/registry/xml/xsd/iirdea.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/iirdea.xsd
rename to core/src/main/java/google/registry/xml/xsd/iirdea.xsd
diff --git a/java/google/registry/xml/xsd/launch.xsd b/core/src/main/java/google/registry/xml/xsd/launch.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/launch.xsd
rename to core/src/main/java/google/registry/xml/xsd/launch.xsd
diff --git a/java/google/registry/xml/xsd/mark.xsd b/core/src/main/java/google/registry/xml/xsd/mark.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/mark.xsd
rename to core/src/main/java/google/registry/xml/xsd/mark.xsd
diff --git a/java/google/registry/xml/xsd/metadata.xsd b/core/src/main/java/google/registry/xml/xsd/metadata.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/metadata.xsd
rename to core/src/main/java/google/registry/xml/xsd/metadata.xsd
diff --git a/java/google/registry/xml/xsd/rde-contact.xsd b/core/src/main/java/google/registry/xml/xsd/rde-contact.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-contact.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-contact.xsd
diff --git a/java/google/registry/xml/xsd/rde-domain.xsd b/core/src/main/java/google/registry/xml/xsd/rde-domain.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-domain.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-domain.xsd
diff --git a/java/google/registry/xml/xsd/rde-eppparams.xsd b/core/src/main/java/google/registry/xml/xsd/rde-eppparams.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-eppparams.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-eppparams.xsd
diff --git a/java/google/registry/xml/xsd/rde-header.xsd b/core/src/main/java/google/registry/xml/xsd/rde-header.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-header.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-header.xsd
diff --git a/java/google/registry/xml/xsd/rde-host.xsd b/core/src/main/java/google/registry/xml/xsd/rde-host.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-host.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-host.xsd
diff --git a/java/google/registry/xml/xsd/rde-idn.xsd b/core/src/main/java/google/registry/xml/xsd/rde-idn.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-idn.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-idn.xsd
diff --git a/java/google/registry/xml/xsd/rde-nndn.xsd b/core/src/main/java/google/registry/xml/xsd/rde-nndn.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-nndn.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-nndn.xsd
diff --git a/java/google/registry/xml/xsd/rde-notification.xsd b/core/src/main/java/google/registry/xml/xsd/rde-notification.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-notification.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-notification.xsd
diff --git a/java/google/registry/xml/xsd/rde-policy.xsd b/core/src/main/java/google/registry/xml/xsd/rde-policy.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-policy.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-policy.xsd
diff --git a/java/google/registry/xml/xsd/rde-registrar.xsd b/core/src/main/java/google/registry/xml/xsd/rde-registrar.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-registrar.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-registrar.xsd
diff --git a/java/google/registry/xml/xsd/rde-report.xsd b/core/src/main/java/google/registry/xml/xsd/rde-report.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde-report.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde-report.xsd
diff --git a/java/google/registry/xml/xsd/rde.xsd b/core/src/main/java/google/registry/xml/xsd/rde.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rde.xsd
rename to core/src/main/java/google/registry/xml/xsd/rde.xsd
diff --git a/java/google/registry/xml/xsd/rgp.xsd b/core/src/main/java/google/registry/xml/xsd/rgp.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/rgp.xsd
rename to core/src/main/java/google/registry/xml/xsd/rgp.xsd
diff --git a/java/google/registry/xml/xsd/secdns.xsd b/core/src/main/java/google/registry/xml/xsd/secdns.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/secdns.xsd
rename to core/src/main/java/google/registry/xml/xsd/secdns.xsd
diff --git a/java/google/registry/xml/xsd/smd.xsd b/core/src/main/java/google/registry/xml/xsd/smd.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/smd.xsd
rename to core/src/main/java/google/registry/xml/xsd/smd.xsd
diff --git a/java/google/registry/xml/xsd/superuser.xsd b/core/src/main/java/google/registry/xml/xsd/superuser.xsd
similarity index 100%
rename from java/google/registry/xml/xsd/superuser.xsd
rename to core/src/main/java/google/registry/xml/xsd/superuser.xsd
diff --git a/javatests/google/registry/backup/BUILD b/core/src/test/java/google/registry/backup/BUILD
similarity index 100%
rename from javatests/google/registry/backup/BUILD
rename to core/src/test/java/google/registry/backup/BUILD
diff --git a/javatests/google/registry/backup/CommitLogCheckpointActionTest.java b/core/src/test/java/google/registry/backup/CommitLogCheckpointActionTest.java
similarity index 100%
rename from javatests/google/registry/backup/CommitLogCheckpointActionTest.java
rename to core/src/test/java/google/registry/backup/CommitLogCheckpointActionTest.java
diff --git a/javatests/google/registry/backup/CommitLogCheckpointStrategyTest.java b/core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java
similarity index 100%
rename from javatests/google/registry/backup/CommitLogCheckpointStrategyTest.java
rename to core/src/test/java/google/registry/backup/CommitLogCheckpointStrategyTest.java
diff --git a/javatests/google/registry/backup/DeleteOldCommitLogsActionTest.java b/core/src/test/java/google/registry/backup/DeleteOldCommitLogsActionTest.java
similarity index 100%
rename from javatests/google/registry/backup/DeleteOldCommitLogsActionTest.java
rename to core/src/test/java/google/registry/backup/DeleteOldCommitLogsActionTest.java
diff --git a/javatests/google/registry/backup/ExportCommitLogDiffActionTest.java b/core/src/test/java/google/registry/backup/ExportCommitLogDiffActionTest.java
similarity index 100%
rename from javatests/google/registry/backup/ExportCommitLogDiffActionTest.java
rename to core/src/test/java/google/registry/backup/ExportCommitLogDiffActionTest.java
diff --git a/javatests/google/registry/backup/GcsDiffFileListerTest.java b/core/src/test/java/google/registry/backup/GcsDiffFileListerTest.java
similarity index 100%
rename from javatests/google/registry/backup/GcsDiffFileListerTest.java
rename to core/src/test/java/google/registry/backup/GcsDiffFileListerTest.java
diff --git a/javatests/google/registry/backup/RestoreCommitLogsActionTest.java b/core/src/test/java/google/registry/backup/RestoreCommitLogsActionTest.java
similarity index 100%
rename from javatests/google/registry/backup/RestoreCommitLogsActionTest.java
rename to core/src/test/java/google/registry/backup/RestoreCommitLogsActionTest.java
diff --git a/javatests/google/registry/batch/AsyncTaskEnqueuerTest.java b/core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java
similarity index 100%
rename from javatests/google/registry/batch/AsyncTaskEnqueuerTest.java
rename to core/src/test/java/google/registry/batch/AsyncTaskEnqueuerTest.java
diff --git a/javatests/google/registry/batch/AsyncTaskMetricsTest.java b/core/src/test/java/google/registry/batch/AsyncTaskMetricsTest.java
similarity index 100%
rename from javatests/google/registry/batch/AsyncTaskMetricsTest.java
rename to core/src/test/java/google/registry/batch/AsyncTaskMetricsTest.java
diff --git a/javatests/google/registry/batch/BUILD b/core/src/test/java/google/registry/batch/BUILD
similarity index 100%
rename from javatests/google/registry/batch/BUILD
rename to core/src/test/java/google/registry/batch/BUILD
diff --git a/javatests/google/registry/batch/DeleteContactsAndHostsActionTest.java b/core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java
similarity index 100%
rename from javatests/google/registry/batch/DeleteContactsAndHostsActionTest.java
rename to core/src/test/java/google/registry/batch/DeleteContactsAndHostsActionTest.java
diff --git a/javatests/google/registry/batch/DeleteProberDataActionTest.java b/core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java
similarity index 100%
rename from javatests/google/registry/batch/DeleteProberDataActionTest.java
rename to core/src/test/java/google/registry/batch/DeleteProberDataActionTest.java
diff --git a/javatests/google/registry/batch/ExpandRecurringBillingEventsActionTest.java b/core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
similarity index 100%
rename from javatests/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
rename to core/src/test/java/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
diff --git a/javatests/google/registry/batch/RefreshDnsOnHostRenameActionTest.java b/core/src/test/java/google/registry/batch/RefreshDnsOnHostRenameActionTest.java
similarity index 100%
rename from javatests/google/registry/batch/RefreshDnsOnHostRenameActionTest.java
rename to core/src/test/java/google/registry/batch/RefreshDnsOnHostRenameActionTest.java
diff --git a/javatests/google/registry/batch/ResaveAllEppResourcesActionTest.java b/core/src/test/java/google/registry/batch/ResaveAllEppResourcesActionTest.java
similarity index 100%
rename from javatests/google/registry/batch/ResaveAllEppResourcesActionTest.java
rename to core/src/test/java/google/registry/batch/ResaveAllEppResourcesActionTest.java
diff --git a/javatests/google/registry/batch/ResaveEntityActionTest.java b/core/src/test/java/google/registry/batch/ResaveEntityActionTest.java
similarity index 100%
rename from javatests/google/registry/batch/ResaveEntityActionTest.java
rename to core/src/test/java/google/registry/batch/ResaveEntityActionTest.java
diff --git a/javatests/google/registry/beam/BUILD b/core/src/test/java/google/registry/beam/BUILD
similarity index 100%
rename from javatests/google/registry/beam/BUILD
rename to core/src/test/java/google/registry/beam/BUILD
diff --git a/javatests/google/registry/beam/BeamUtilsTest.java b/core/src/test/java/google/registry/beam/BeamUtilsTest.java
similarity index 100%
rename from javatests/google/registry/beam/BeamUtilsTest.java
rename to core/src/test/java/google/registry/beam/BeamUtilsTest.java
diff --git a/javatests/google/registry/beam/invoicing/BUILD b/core/src/test/java/google/registry/beam/invoicing/BUILD
similarity index 100%
rename from javatests/google/registry/beam/invoicing/BUILD
rename to core/src/test/java/google/registry/beam/invoicing/BUILD
diff --git a/javatests/google/registry/beam/invoicing/BillingEventTest.java b/core/src/test/java/google/registry/beam/invoicing/BillingEventTest.java
similarity index 100%
rename from javatests/google/registry/beam/invoicing/BillingEventTest.java
rename to core/src/test/java/google/registry/beam/invoicing/BillingEventTest.java
diff --git a/javatests/google/registry/beam/invoicing/InvoicingPipelineTest.java b/core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java
similarity index 100%
rename from javatests/google/registry/beam/invoicing/InvoicingPipelineTest.java
rename to core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java
diff --git a/javatests/google/registry/beam/invoicing/InvoicingUtilsTest.java b/core/src/test/java/google/registry/beam/invoicing/InvoicingUtilsTest.java
similarity index 100%
rename from javatests/google/registry/beam/invoicing/InvoicingUtilsTest.java
rename to core/src/test/java/google/registry/beam/invoicing/InvoicingUtilsTest.java
diff --git a/javatests/google/registry/beam/invoicing/testdata/billing_events_test.sql b/core/src/test/java/google/registry/beam/invoicing/testdata/billing_events_test.sql
similarity index 100%
rename from javatests/google/registry/beam/invoicing/testdata/billing_events_test.sql
rename to core/src/test/java/google/registry/beam/invoicing/testdata/billing_events_test.sql
diff --git a/javatests/google/registry/beam/spec11/BUILD b/core/src/test/java/google/registry/beam/spec11/BUILD
similarity index 100%
rename from javatests/google/registry/beam/spec11/BUILD
rename to core/src/test/java/google/registry/beam/spec11/BUILD
diff --git a/javatests/google/registry/beam/spec11/Spec11PipelineTest.java b/core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java
similarity index 100%
rename from javatests/google/registry/beam/spec11/Spec11PipelineTest.java
rename to core/src/test/java/google/registry/beam/spec11/Spec11PipelineTest.java
diff --git a/javatests/google/registry/bigquery/BUILD b/core/src/test/java/google/registry/bigquery/BUILD
similarity index 100%
rename from javatests/google/registry/bigquery/BUILD
rename to core/src/test/java/google/registry/bigquery/BUILD
diff --git a/javatests/google/registry/bigquery/BigqueryConnectionTest.java b/core/src/test/java/google/registry/bigquery/BigqueryConnectionTest.java
similarity index 100%
rename from javatests/google/registry/bigquery/BigqueryConnectionTest.java
rename to core/src/test/java/google/registry/bigquery/BigqueryConnectionTest.java
diff --git a/javatests/google/registry/bigquery/BigqueryUtilsTest.java b/core/src/test/java/google/registry/bigquery/BigqueryUtilsTest.java
similarity index 100%
rename from javatests/google/registry/bigquery/BigqueryUtilsTest.java
rename to core/src/test/java/google/registry/bigquery/BigqueryUtilsTest.java
diff --git a/javatests/google/registry/bigquery/CheckedBigqueryTest.java b/core/src/test/java/google/registry/bigquery/CheckedBigqueryTest.java
similarity index 100%
rename from javatests/google/registry/bigquery/CheckedBigqueryTest.java
rename to core/src/test/java/google/registry/bigquery/CheckedBigqueryTest.java
diff --git a/javatests/google/registry/builddefs/BUILD b/core/src/test/java/google/registry/builddefs/BUILD
similarity index 100%
rename from javatests/google/registry/builddefs/BUILD
rename to core/src/test/java/google/registry/builddefs/BUILD
diff --git a/javatests/google/registry/builddefs/hello.txt b/core/src/test/java/google/registry/builddefs/hello.txt
similarity index 100%
rename from javatests/google/registry/builddefs/hello.txt
rename to core/src/test/java/google/registry/builddefs/hello.txt
diff --git a/javatests/google/registry/builddefs/override/hello.txt b/core/src/test/java/google/registry/builddefs/override/hello.txt
similarity index 100%
rename from javatests/google/registry/builddefs/override/hello.txt
rename to core/src/test/java/google/registry/builddefs/override/hello.txt
diff --git a/javatests/google/registry/builddefs/world.txt b/core/src/test/java/google/registry/builddefs/world.txt
similarity index 100%
rename from javatests/google/registry/builddefs/world.txt
rename to core/src/test/java/google/registry/builddefs/world.txt
diff --git a/javatests/google/registry/builddefs/zip_contents_test.bzl b/core/src/test/java/google/registry/builddefs/zip_contents_test.bzl
similarity index 100%
rename from javatests/google/registry/builddefs/zip_contents_test.bzl
rename to core/src/test/java/google/registry/builddefs/zip_contents_test.bzl
diff --git a/javatests/google/registry/config/BUILD b/core/src/test/java/google/registry/config/BUILD
similarity index 100%
rename from javatests/google/registry/config/BUILD
rename to core/src/test/java/google/registry/config/BUILD
diff --git a/javatests/google/registry/config/RegistryConfigTest.java b/core/src/test/java/google/registry/config/RegistryConfigTest.java
similarity index 100%
rename from javatests/google/registry/config/RegistryConfigTest.java
rename to core/src/test/java/google/registry/config/RegistryConfigTest.java
diff --git a/javatests/google/registry/config/RegistryEnvironmentTest.java b/core/src/test/java/google/registry/config/RegistryEnvironmentTest.java
similarity index 100%
rename from javatests/google/registry/config/RegistryEnvironmentTest.java
rename to core/src/test/java/google/registry/config/RegistryEnvironmentTest.java
diff --git a/javatests/google/registry/cron/BUILD b/core/src/test/java/google/registry/cron/BUILD
similarity index 100%
rename from javatests/google/registry/cron/BUILD
rename to core/src/test/java/google/registry/cron/BUILD
diff --git a/javatests/google/registry/cron/CommitLogFanoutActionTest.java b/core/src/test/java/google/registry/cron/CommitLogFanoutActionTest.java
similarity index 100%
rename from javatests/google/registry/cron/CommitLogFanoutActionTest.java
rename to core/src/test/java/google/registry/cron/CommitLogFanoutActionTest.java
diff --git a/javatests/google/registry/cron/TldFanoutActionTest.java b/core/src/test/java/google/registry/cron/TldFanoutActionTest.java
similarity index 100%
rename from javatests/google/registry/cron/TldFanoutActionTest.java
rename to core/src/test/java/google/registry/cron/TldFanoutActionTest.java
diff --git a/javatests/google/registry/dns/BUILD b/core/src/test/java/google/registry/dns/BUILD
similarity index 100%
rename from javatests/google/registry/dns/BUILD
rename to core/src/test/java/google/registry/dns/BUILD
diff --git a/javatests/google/registry/dns/DnsInjectionTest.java b/core/src/test/java/google/registry/dns/DnsInjectionTest.java
similarity index 100%
rename from javatests/google/registry/dns/DnsInjectionTest.java
rename to core/src/test/java/google/registry/dns/DnsInjectionTest.java
diff --git a/javatests/google/registry/dns/DnsQueueTest.java b/core/src/test/java/google/registry/dns/DnsQueueTest.java
similarity index 100%
rename from javatests/google/registry/dns/DnsQueueTest.java
rename to core/src/test/java/google/registry/dns/DnsQueueTest.java
diff --git a/javatests/google/registry/dns/DnsTestComponent.java b/core/src/test/java/google/registry/dns/DnsTestComponent.java
similarity index 100%
rename from javatests/google/registry/dns/DnsTestComponent.java
rename to core/src/test/java/google/registry/dns/DnsTestComponent.java
diff --git a/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java b/core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java
similarity index 100%
rename from javatests/google/registry/dns/PublishDnsUpdatesActionTest.java
rename to core/src/test/java/google/registry/dns/PublishDnsUpdatesActionTest.java
diff --git a/javatests/google/registry/dns/ReadDnsQueueActionTest.java b/core/src/test/java/google/registry/dns/ReadDnsQueueActionTest.java
similarity index 100%
rename from javatests/google/registry/dns/ReadDnsQueueActionTest.java
rename to core/src/test/java/google/registry/dns/ReadDnsQueueActionTest.java
diff --git a/javatests/google/registry/dns/RefreshDnsActionTest.java b/core/src/test/java/google/registry/dns/RefreshDnsActionTest.java
similarity index 100%
rename from javatests/google/registry/dns/RefreshDnsActionTest.java
rename to core/src/test/java/google/registry/dns/RefreshDnsActionTest.java
diff --git a/javatests/google/registry/dns/writer/BaseDnsWriterTest.java b/core/src/test/java/google/registry/dns/writer/BaseDnsWriterTest.java
similarity index 100%
rename from javatests/google/registry/dns/writer/BaseDnsWriterTest.java
rename to core/src/test/java/google/registry/dns/writer/BaseDnsWriterTest.java
diff --git a/javatests/google/registry/dns/writer/clouddns/BUILD b/core/src/test/java/google/registry/dns/writer/clouddns/BUILD
similarity index 100%
rename from javatests/google/registry/dns/writer/clouddns/BUILD
rename to core/src/test/java/google/registry/dns/writer/clouddns/BUILD
diff --git a/javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java b/core/src/test/java/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java
similarity index 100%
rename from javatests/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java
rename to core/src/test/java/google/registry/dns/writer/clouddns/CloudDnsWriterTest.java
diff --git a/javatests/google/registry/dns/writer/dnsupdate/BUILD b/core/src/test/java/google/registry/dns/writer/dnsupdate/BUILD
similarity index 100%
rename from javatests/google/registry/dns/writer/dnsupdate/BUILD
rename to core/src/test/java/google/registry/dns/writer/dnsupdate/BUILD
diff --git a/javatests/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java b/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java
similarity index 100%
rename from javatests/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java
rename to core/src/test/java/google/registry/dns/writer/dnsupdate/DnsMessageTransportTest.java
diff --git a/javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java b/core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java
similarity index 100%
rename from javatests/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java
rename to core/src/test/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterTest.java
diff --git a/javatests/google/registry/documentation/FlowContext.java b/core/src/test/java/google/registry/documentation/FlowContext.java
similarity index 99%
rename from javatests/google/registry/documentation/FlowContext.java
rename to core/src/test/java/google/registry/documentation/FlowContext.java
index 0b871c92f..e198a4d43 100644
--- a/javatests/google/registry/documentation/FlowContext.java
+++ b/core/src/test/java/google/registry/documentation/FlowContext.java
@@ -21,7 +21,6 @@ import static com.google.common.collect.MoreCollectors.onlyElement;
 import static google.registry.util.BuildPathUtils.getProjectRoot;
 import static java.util.stream.Collectors.joining;
 
-
 import com.google.common.base.Ascii;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
@@ -102,7 +101,8 @@ public class FlowContext {
    */
   private static Set<String> getTestFilenames(String flowName) throws IOException {
     String commonPrefix =
-        getProjectRoot().resolve("javatests").resolve(flowName.replace('.', '/')).toString();
+        getProjectRoot().resolve("core/src/test/java").resolve(flowName.replace('.', '/'))
+            .toString();
     return Sets.union(
         getFilenamesMatchingGlob(commonPrefix + "*Test.java"),
         getFilenamesMatchingGlob(commonPrefix + "*TestCase.java"));
diff --git a/javatests/google/registry/documentation/FlowDocumentationTest.java b/core/src/test/java/google/registry/documentation/FlowDocumentationTest.java
similarity index 100%
rename from javatests/google/registry/documentation/FlowDocumentationTest.java
rename to core/src/test/java/google/registry/documentation/FlowDocumentationTest.java
diff --git a/javatests/google/registry/documentation/FlowExceptionsTest.java b/core/src/test/java/google/registry/documentation/FlowExceptionsTest.java
similarity index 100%
rename from javatests/google/registry/documentation/FlowExceptionsTest.java
rename to core/src/test/java/google/registry/documentation/FlowExceptionsTest.java
diff --git a/javatests/google/registry/documentation/MarkdownDocumentationFormatterTest.java b/core/src/test/java/google/registry/documentation/MarkdownDocumentationFormatterTest.java
similarity index 100%
rename from javatests/google/registry/documentation/MarkdownDocumentationFormatterTest.java
rename to core/src/test/java/google/registry/documentation/MarkdownDocumentationFormatterTest.java
diff --git a/javatests/google/registry/export/BUILD b/core/src/test/java/google/registry/export/BUILD
similarity index 100%
rename from javatests/google/registry/export/BUILD
rename to core/src/test/java/google/registry/export/BUILD
diff --git a/javatests/google/registry/export/BackupDatastoreActionTest.java b/core/src/test/java/google/registry/export/BackupDatastoreActionTest.java
similarity index 100%
rename from javatests/google/registry/export/BackupDatastoreActionTest.java
rename to core/src/test/java/google/registry/export/BackupDatastoreActionTest.java
diff --git a/javatests/google/registry/export/BigqueryPollJobActionTest.java b/core/src/test/java/google/registry/export/BigqueryPollJobActionTest.java
similarity index 100%
rename from javatests/google/registry/export/BigqueryPollJobActionTest.java
rename to core/src/test/java/google/registry/export/BigqueryPollJobActionTest.java
diff --git a/javatests/google/registry/export/CheckBackupActionTest.java b/core/src/test/java/google/registry/export/CheckBackupActionTest.java
similarity index 100%
rename from javatests/google/registry/export/CheckBackupActionTest.java
rename to core/src/test/java/google/registry/export/CheckBackupActionTest.java
diff --git a/javatests/google/registry/export/ExportConstantsTest.java b/core/src/test/java/google/registry/export/ExportConstantsTest.java
similarity index 100%
rename from javatests/google/registry/export/ExportConstantsTest.java
rename to core/src/test/java/google/registry/export/ExportConstantsTest.java
diff --git a/javatests/google/registry/export/ExportDomainListsActionTest.java b/core/src/test/java/google/registry/export/ExportDomainListsActionTest.java
similarity index 100%
rename from javatests/google/registry/export/ExportDomainListsActionTest.java
rename to core/src/test/java/google/registry/export/ExportDomainListsActionTest.java
diff --git a/javatests/google/registry/export/ExportPremiumTermsActionTest.java b/core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java
similarity index 100%
rename from javatests/google/registry/export/ExportPremiumTermsActionTest.java
rename to core/src/test/java/google/registry/export/ExportPremiumTermsActionTest.java
diff --git a/javatests/google/registry/export/ExportReservedTermsActionTest.java b/core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java
similarity index 100%
rename from javatests/google/registry/export/ExportReservedTermsActionTest.java
rename to core/src/test/java/google/registry/export/ExportReservedTermsActionTest.java
diff --git a/javatests/google/registry/export/ExportUtilsTest.java b/core/src/test/java/google/registry/export/ExportUtilsTest.java
similarity index 100%
rename from javatests/google/registry/export/ExportUtilsTest.java
rename to core/src/test/java/google/registry/export/ExportUtilsTest.java
diff --git a/javatests/google/registry/export/SyncGroupMembersActionTest.java b/core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java
similarity index 100%
rename from javatests/google/registry/export/SyncGroupMembersActionTest.java
rename to core/src/test/java/google/registry/export/SyncGroupMembersActionTest.java
diff --git a/javatests/google/registry/export/UpdateSnapshotViewActionTest.java b/core/src/test/java/google/registry/export/UpdateSnapshotViewActionTest.java
similarity index 100%
rename from javatests/google/registry/export/UpdateSnapshotViewActionTest.java
rename to core/src/test/java/google/registry/export/UpdateSnapshotViewActionTest.java
diff --git a/javatests/google/registry/export/UploadDatastoreBackupActionTest.java b/core/src/test/java/google/registry/export/UploadDatastoreBackupActionTest.java
similarity index 100%
rename from javatests/google/registry/export/UploadDatastoreBackupActionTest.java
rename to core/src/test/java/google/registry/export/UploadDatastoreBackupActionTest.java
diff --git a/javatests/google/registry/export/backup_kinds.txt b/core/src/test/java/google/registry/export/backup_kinds.txt
similarity index 100%
rename from javatests/google/registry/export/backup_kinds.txt
rename to core/src/test/java/google/registry/export/backup_kinds.txt
diff --git a/javatests/google/registry/export/datastore/BUILD b/core/src/test/java/google/registry/export/datastore/BUILD
similarity index 100%
rename from javatests/google/registry/export/datastore/BUILD
rename to core/src/test/java/google/registry/export/datastore/BUILD
diff --git a/javatests/google/registry/export/datastore/DatastoreAdminTest.java b/core/src/test/java/google/registry/export/datastore/DatastoreAdminTest.java
similarity index 100%
rename from javatests/google/registry/export/datastore/DatastoreAdminTest.java
rename to core/src/test/java/google/registry/export/datastore/DatastoreAdminTest.java
diff --git a/javatests/google/registry/export/datastore/EntityFilterTest.java b/core/src/test/java/google/registry/export/datastore/EntityFilterTest.java
similarity index 100%
rename from javatests/google/registry/export/datastore/EntityFilterTest.java
rename to core/src/test/java/google/registry/export/datastore/EntityFilterTest.java
diff --git a/javatests/google/registry/export/datastore/OperationTest.java b/core/src/test/java/google/registry/export/datastore/OperationTest.java
similarity index 100%
rename from javatests/google/registry/export/datastore/OperationTest.java
rename to core/src/test/java/google/registry/export/datastore/OperationTest.java
diff --git a/javatests/google/registry/export/datastore/testdata/common_metadata.json b/core/src/test/java/google/registry/export/datastore/testdata/common_metadata.json
similarity index 100%
rename from javatests/google/registry/export/datastore/testdata/common_metadata.json
rename to core/src/test/java/google/registry/export/datastore/testdata/common_metadata.json
diff --git a/javatests/google/registry/export/datastore/testdata/entity_filter.json b/core/src/test/java/google/registry/export/datastore/testdata/entity_filter.json
similarity index 100%
rename from javatests/google/registry/export/datastore/testdata/entity_filter.json
rename to core/src/test/java/google/registry/export/datastore/testdata/entity_filter.json
diff --git a/javatests/google/registry/export/datastore/testdata/export_request_content.json b/core/src/test/java/google/registry/export/datastore/testdata/export_request_content.json
similarity index 100%
rename from javatests/google/registry/export/datastore/testdata/export_request_content.json
rename to core/src/test/java/google/registry/export/datastore/testdata/export_request_content.json
diff --git a/javatests/google/registry/export/datastore/testdata/metadata.json b/core/src/test/java/google/registry/export/datastore/testdata/metadata.json
similarity index 100%
rename from javatests/google/registry/export/datastore/testdata/metadata.json
rename to core/src/test/java/google/registry/export/datastore/testdata/metadata.json
diff --git a/javatests/google/registry/export/datastore/testdata/operation.json b/core/src/test/java/google/registry/export/datastore/testdata/operation.json
similarity index 100%
rename from javatests/google/registry/export/datastore/testdata/operation.json
rename to core/src/test/java/google/registry/export/datastore/testdata/operation.json
diff --git a/javatests/google/registry/export/datastore/testdata/operation_list.json b/core/src/test/java/google/registry/export/datastore/testdata/operation_list.json
similarity index 100%
rename from javatests/google/registry/export/datastore/testdata/operation_list.json
rename to core/src/test/java/google/registry/export/datastore/testdata/operation_list.json
diff --git a/javatests/google/registry/export/datastore/testdata/prettyprinted_operation.json b/core/src/test/java/google/registry/export/datastore/testdata/prettyprinted_operation.json
similarity index 100%
rename from javatests/google/registry/export/datastore/testdata/prettyprinted_operation.json
rename to core/src/test/java/google/registry/export/datastore/testdata/prettyprinted_operation.json
diff --git a/javatests/google/registry/export/datastore/testdata/progress.json b/core/src/test/java/google/registry/export/datastore/testdata/progress.json
similarity index 100%
rename from javatests/google/registry/export/datastore/testdata/progress.json
rename to core/src/test/java/google/registry/export/datastore/testdata/progress.json
diff --git a/javatests/google/registry/export/reporting_kinds.txt b/core/src/test/java/google/registry/export/reporting_kinds.txt
similarity index 100%
rename from javatests/google/registry/export/reporting_kinds.txt
rename to core/src/test/java/google/registry/export/reporting_kinds.txt
diff --git a/javatests/google/registry/export/sheet/BUILD b/core/src/test/java/google/registry/export/sheet/BUILD
similarity index 100%
rename from javatests/google/registry/export/sheet/BUILD
rename to core/src/test/java/google/registry/export/sheet/BUILD
diff --git a/javatests/google/registry/export/sheet/SheetSynchronizerTest.java b/core/src/test/java/google/registry/export/sheet/SheetSynchronizerTest.java
similarity index 100%
rename from javatests/google/registry/export/sheet/SheetSynchronizerTest.java
rename to core/src/test/java/google/registry/export/sheet/SheetSynchronizerTest.java
diff --git a/javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java b/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java
similarity index 100%
rename from javatests/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java
rename to core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetActionTest.java
diff --git a/javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java b/core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java
similarity index 100%
rename from javatests/google/registry/export/sheet/SyncRegistrarsSheetTest.java
rename to core/src/test/java/google/registry/export/sheet/SyncRegistrarsSheetTest.java
diff --git a/javatests/google/registry/export/testdata/backup_operation_in_progress.json b/core/src/test/java/google/registry/export/testdata/backup_operation_in_progress.json
similarity index 100%
rename from javatests/google/registry/export/testdata/backup_operation_in_progress.json
rename to core/src/test/java/google/registry/export/testdata/backup_operation_in_progress.json
diff --git a/javatests/google/registry/export/testdata/backup_operation_success.json b/core/src/test/java/google/registry/export/testdata/backup_operation_success.json
similarity index 100%
rename from javatests/google/registry/export/testdata/backup_operation_success.json
rename to core/src/test/java/google/registry/export/testdata/backup_operation_success.json
diff --git a/javatests/google/registry/export/testdata/pretty_printed_success_backup_operation.json b/core/src/test/java/google/registry/export/testdata/pretty_printed_success_backup_operation.json
similarity index 100%
rename from javatests/google/registry/export/testdata/pretty_printed_success_backup_operation.json
rename to core/src/test/java/google/registry/export/testdata/pretty_printed_success_backup_operation.json
diff --git a/javatests/google/registry/flows/BUILD b/core/src/test/java/google/registry/flows/BUILD
similarity index 100%
rename from javatests/google/registry/flows/BUILD
rename to core/src/test/java/google/registry/flows/BUILD
diff --git a/javatests/google/registry/flows/CheckApiActionTest.java b/core/src/test/java/google/registry/flows/CheckApiActionTest.java
similarity index 100%
rename from javatests/google/registry/flows/CheckApiActionTest.java
rename to core/src/test/java/google/registry/flows/CheckApiActionTest.java
diff --git a/javatests/google/registry/flows/EppCommitLogsTest.java b/core/src/test/java/google/registry/flows/EppCommitLogsTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppCommitLogsTest.java
rename to core/src/test/java/google/registry/flows/EppCommitLogsTest.java
diff --git a/javatests/google/registry/flows/EppControllerTest.java b/core/src/test/java/google/registry/flows/EppControllerTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppControllerTest.java
rename to core/src/test/java/google/registry/flows/EppControllerTest.java
diff --git a/javatests/google/registry/flows/EppLifecycleContactTest.java b/core/src/test/java/google/registry/flows/EppLifecycleContactTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppLifecycleContactTest.java
rename to core/src/test/java/google/registry/flows/EppLifecycleContactTest.java
diff --git a/javatests/google/registry/flows/EppLifecycleDomainTest.java b/core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppLifecycleDomainTest.java
rename to core/src/test/java/google/registry/flows/EppLifecycleDomainTest.java
diff --git a/javatests/google/registry/flows/EppLifecycleHostTest.java b/core/src/test/java/google/registry/flows/EppLifecycleHostTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppLifecycleHostTest.java
rename to core/src/test/java/google/registry/flows/EppLifecycleHostTest.java
diff --git a/javatests/google/registry/flows/EppLifecycleLoginTest.java b/core/src/test/java/google/registry/flows/EppLifecycleLoginTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppLifecycleLoginTest.java
rename to core/src/test/java/google/registry/flows/EppLifecycleLoginTest.java
diff --git a/javatests/google/registry/flows/EppLoggedOutTest.java b/core/src/test/java/google/registry/flows/EppLoggedOutTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppLoggedOutTest.java
rename to core/src/test/java/google/registry/flows/EppLoggedOutTest.java
diff --git a/javatests/google/registry/flows/EppLoginTlsTest.java b/core/src/test/java/google/registry/flows/EppLoginTlsTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppLoginTlsTest.java
rename to core/src/test/java/google/registry/flows/EppLoginTlsTest.java
diff --git a/javatests/google/registry/flows/EppTestCase.java b/core/src/test/java/google/registry/flows/EppTestCase.java
similarity index 100%
rename from javatests/google/registry/flows/EppTestCase.java
rename to core/src/test/java/google/registry/flows/EppTestCase.java
diff --git a/javatests/google/registry/flows/EppTestComponent.java b/core/src/test/java/google/registry/flows/EppTestComponent.java
similarity index 100%
rename from javatests/google/registry/flows/EppTestComponent.java
rename to core/src/test/java/google/registry/flows/EppTestComponent.java
diff --git a/javatests/google/registry/flows/EppTlsActionTest.java b/core/src/test/java/google/registry/flows/EppTlsActionTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppTlsActionTest.java
rename to core/src/test/java/google/registry/flows/EppTlsActionTest.java
diff --git a/javatests/google/registry/flows/EppToolActionTest.java b/core/src/test/java/google/registry/flows/EppToolActionTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppToolActionTest.java
rename to core/src/test/java/google/registry/flows/EppToolActionTest.java
diff --git a/javatests/google/registry/flows/EppXmlSanitizerTest.java b/core/src/test/java/google/registry/flows/EppXmlSanitizerTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppXmlSanitizerTest.java
rename to core/src/test/java/google/registry/flows/EppXmlSanitizerTest.java
diff --git a/javatests/google/registry/flows/EppXxeAttackTest.java b/core/src/test/java/google/registry/flows/EppXxeAttackTest.java
similarity index 100%
rename from javatests/google/registry/flows/EppXxeAttackTest.java
rename to core/src/test/java/google/registry/flows/EppXxeAttackTest.java
diff --git a/javatests/google/registry/flows/ExtensionManagerTest.java b/core/src/test/java/google/registry/flows/ExtensionManagerTest.java
similarity index 100%
rename from javatests/google/registry/flows/ExtensionManagerTest.java
rename to core/src/test/java/google/registry/flows/ExtensionManagerTest.java
diff --git a/javatests/google/registry/flows/FlowReporterTest.java b/core/src/test/java/google/registry/flows/FlowReporterTest.java
similarity index 100%
rename from javatests/google/registry/flows/FlowReporterTest.java
rename to core/src/test/java/google/registry/flows/FlowReporterTest.java
diff --git a/javatests/google/registry/flows/FlowRunnerTest.java b/core/src/test/java/google/registry/flows/FlowRunnerTest.java
similarity index 100%
rename from javatests/google/registry/flows/FlowRunnerTest.java
rename to core/src/test/java/google/registry/flows/FlowRunnerTest.java
diff --git a/javatests/google/registry/flows/FlowTestCase.java b/core/src/test/java/google/registry/flows/FlowTestCase.java
similarity index 100%
rename from javatests/google/registry/flows/FlowTestCase.java
rename to core/src/test/java/google/registry/flows/FlowTestCase.java
diff --git a/javatests/google/registry/flows/ResourceCheckFlowTestCase.java b/core/src/test/java/google/registry/flows/ResourceCheckFlowTestCase.java
similarity index 100%
rename from javatests/google/registry/flows/ResourceCheckFlowTestCase.java
rename to core/src/test/java/google/registry/flows/ResourceCheckFlowTestCase.java
diff --git a/javatests/google/registry/flows/ResourceFlowTestCase.java b/core/src/test/java/google/registry/flows/ResourceFlowTestCase.java
similarity index 100%
rename from javatests/google/registry/flows/ResourceFlowTestCase.java
rename to core/src/test/java/google/registry/flows/ResourceFlowTestCase.java
diff --git a/javatests/google/registry/flows/TlsCredentialsTest.java b/core/src/test/java/google/registry/flows/TlsCredentialsTest.java
similarity index 100%
rename from javatests/google/registry/flows/TlsCredentialsTest.java
rename to core/src/test/java/google/registry/flows/TlsCredentialsTest.java
diff --git a/javatests/google/registry/flows/contact/ContactCheckFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactCheckFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactCheckFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactCheckFlowTest.java
diff --git a/javatests/google/registry/flows/contact/ContactCreateFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactCreateFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactCreateFlowTest.java
diff --git a/javatests/google/registry/flows/contact/ContactDeleteFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactDeleteFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactDeleteFlowTest.java
diff --git a/javatests/google/registry/flows/contact/ContactInfoFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactInfoFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactInfoFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactInfoFlowTest.java
diff --git a/javatests/google/registry/flows/contact/ContactTransferApproveFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferApproveFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactTransferApproveFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactTransferApproveFlowTest.java
diff --git a/javatests/google/registry/flows/contact/ContactTransferCancelFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferCancelFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactTransferCancelFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactTransferCancelFlowTest.java
diff --git a/javatests/google/registry/flows/contact/ContactTransferFlowTestCase.java b/core/src/test/java/google/registry/flows/contact/ContactTransferFlowTestCase.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactTransferFlowTestCase.java
rename to core/src/test/java/google/registry/flows/contact/ContactTransferFlowTestCase.java
diff --git a/javatests/google/registry/flows/contact/ContactTransferQueryFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferQueryFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactTransferQueryFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactTransferQueryFlowTest.java
diff --git a/javatests/google/registry/flows/contact/ContactTransferRejectFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferRejectFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactTransferRejectFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactTransferRejectFlowTest.java
diff --git a/javatests/google/registry/flows/contact/ContactTransferRequestFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactTransferRequestFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactTransferRequestFlowTest.java
diff --git a/javatests/google/registry/flows/contact/ContactUpdateFlowTest.java b/core/src/test/java/google/registry/flows/contact/ContactUpdateFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/contact/ContactUpdateFlowTest.java
rename to core/src/test/java/google/registry/flows/contact/ContactUpdateFlowTest.java
diff --git a/javatests/google/registry/flows/contact/testdata/contact_check.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_check.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_check.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_check.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_check_50.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_check_50.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_check_50.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_check_50.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_check_51.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_check_51.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_check_51.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_check_51.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_check_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_check_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_check_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_check_response.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_create.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_create.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_create.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_create.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_create_decline_disclosure.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_create_decline_disclosure.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_create_decline_disclosure.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_create_decline_disclosure.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_create_hebrew_int.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_create_hebrew_int.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_create_hebrew_int.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_create_hebrew_int.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_create_hebrew_loc.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_create_hebrew_loc.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_create_hebrew_loc.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_create_hebrew_loc.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_create_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_create_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_create_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_create_response.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_delete.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_delete.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_delete.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_delete.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_delete_no_cltrid.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_delete_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_delete_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_delete_no_cltrid.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_delete_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_delete_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_delete_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_delete_response.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_delete_response_no_cltrid.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_delete_response_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_delete_response_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_delete_response_no_cltrid.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_info.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_info.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_info.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_info.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_info_no_authinfo.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_info_no_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_info_no_authinfo.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_info_no_authinfo.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_info_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_info_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_info_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_info_response.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_info_response_linked.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_info_response_linked.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_info_response_linked.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_info_response_linked.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_info_response_no_authinfo.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_info_response_no_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_info_response_no_authinfo.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_info_response_no_authinfo.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_approve.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_approve.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_approve_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_approve_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve_response.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_approve_with_authinfo.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_cancel.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_cancel.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_cancel_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_cancel_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel_response.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_cancel_with_authinfo.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_query.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_query.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_query_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_approved.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_cancelled.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_client_rejected.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_server_approved.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_response_server_cancelled.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_with_authinfo.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_query_with_roid.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_reject.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_reject.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_reject_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_reject_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject_response.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_reject_with_authinfo.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_request.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_request.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request_no_authinfo.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_transfer_request_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_transfer_request_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_transfer_request_response.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_add_remove_same.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update_add_remove_same.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update_add_remove_same.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update_add_remove_same.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_decline_disclosure.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update_decline_disclosure.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update_decline_disclosure.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update_decline_disclosure.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_hebrew_int.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update_hebrew_int.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update_hebrew_int.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update_hebrew_int.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_hebrew_loc.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update_hebrew_loc.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update_hebrew_loc.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update_hebrew_loc.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_localized.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update_localized.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update_localized.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update_localized.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update_partial_postalinfo.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_partial_postalinfo_preserve_int.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update_partial_postalinfo_preserve_int.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update_partial_postalinfo_preserve_int.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update_partial_postalinfo_preserve_int.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_prohibited_status.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update_prohibited_status.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update_prohibited_status.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update_prohibited_status.xml
diff --git a/javatests/google/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml b/core/src/test/java/google/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/contact_update_remove_client_update_prohibited.xml
diff --git a/javatests/google/registry/flows/contact/testdata/generic_success_response.xml b/core/src/test/java/google/registry/flows/contact/testdata/generic_success_response.xml
similarity index 100%
rename from javatests/google/registry/flows/contact/testdata/generic_success_response.xml
rename to core/src/test/java/google/registry/flows/contact/testdata/generic_success_response.xml
diff --git a/javatests/google/registry/flows/custom/TestCustomLogicFactory.java b/core/src/test/java/google/registry/flows/custom/TestCustomLogicFactory.java
similarity index 100%
rename from javatests/google/registry/flows/custom/TestCustomLogicFactory.java
rename to core/src/test/java/google/registry/flows/custom/TestCustomLogicFactory.java
diff --git a/javatests/google/registry/flows/custom/TestDomainCreateFlowCustomLogic.java b/core/src/test/java/google/registry/flows/custom/TestDomainCreateFlowCustomLogic.java
similarity index 100%
rename from javatests/google/registry/flows/custom/TestDomainCreateFlowCustomLogic.java
rename to core/src/test/java/google/registry/flows/custom/TestDomainCreateFlowCustomLogic.java
diff --git a/javatests/google/registry/flows/custom/TestDomainPricingCustomLogic.java b/core/src/test/java/google/registry/flows/custom/TestDomainPricingCustomLogic.java
similarity index 100%
rename from javatests/google/registry/flows/custom/TestDomainPricingCustomLogic.java
rename to core/src/test/java/google/registry/flows/custom/TestDomainPricingCustomLogic.java
diff --git a/javatests/google/registry/flows/domain/DomainCheckFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainCheckFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainClaimsCheckFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainClaimsCheckFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainClaimsCheckFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainClaimsCheckFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainCreateFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainCreateFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainCreateFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainDeleteFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainDeleteFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainDeleteFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainInfoFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainInfoFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainInfoFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainRenewFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainRenewFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainRenewFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainRestoreRequestFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainRestoreRequestFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainRestoreRequestFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainTransferApproveFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferApproveFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainTransferApproveFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainTransferApproveFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainTransferCancelFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferCancelFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainTransferCancelFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainTransferCancelFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainTransferFlowTestCase.java b/core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainTransferFlowTestCase.java
rename to core/src/test/java/google/registry/flows/domain/DomainTransferFlowTestCase.java
diff --git a/javatests/google/registry/flows/domain/DomainTransferQueryFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferQueryFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainTransferQueryFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainTransferQueryFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainTransferRejectFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferRejectFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainTransferRejectFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainTransferRejectFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainTransferRequestFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainTransferRequestFlowTest.java
diff --git a/javatests/google/registry/flows/domain/DomainUpdateFlowTest.java b/core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/DomainUpdateFlowTest.java
rename to core/src/test/java/google/registry/flows/domain/DomainUpdateFlowTest.java
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_50.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_50.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_50.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_50.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_50_allocationtoken.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_50_allocationtoken.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_50_allocationtoken.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_50_allocationtoken.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_51.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_51.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_51.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_51.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_allocationtoken.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_allocationtoken.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_allocationtoken_fee_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_anchor.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_anchor.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_anchor.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_anchor.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_avail.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_avail.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_avail.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_avail.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_claims.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_claims.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_claims_50.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_50.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_claims_50.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_50.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_claims_51.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_51.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_claims_51.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_51.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_claims_allocationtoken.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_allocationtoken.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_claims_allocationtoken.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_allocationtoken.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_bad_tld.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_multiple_tlds.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_claims_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_claims_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response_multiple_tlds.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_claims_response_none.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response_none.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_claims_response_none.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_claims_response_none.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_duplicates.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_duplicates.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_duplicates.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_duplicates.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_eap_fee_response_date_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_date_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_eap_fee_response_date_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_date_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_eap_fee_response_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_bad_period_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_phase_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_command_subphase_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_date_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_date_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_date_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_date_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_euro_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_euro_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_euro_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_euro_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_euro_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_euro_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_euro_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_fractional.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_fractional.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_fractional.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_fractional.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_fractional_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_invalid_command_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_response_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiple_commands_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_restore_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_multiyear_transfer_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_not_in_avail.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_eap_response_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_eap_response_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_eap_response_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_eap_response_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_create.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_create.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_create.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_create.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_renew.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_renew.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_renew.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_renew.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_restore.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_restore.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_restore.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_restore.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_transfer.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_transfer.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_transfer.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_update.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_update.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_update.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v11_update.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_response_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_create.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_create.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_create.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_create.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_renew.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_renew.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_renew.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_renew.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_restore.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_restore.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_restore.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_restore.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_transfer.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_transfer.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_transfer.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_update.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_update.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_update.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v11_update.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_premium_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_premium_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_create.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_create.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_create.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_create.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_renew.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_renew.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_renew.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_renew.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_restore.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_restore.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_restore.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_restore.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_transfer.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_transfer.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v11_transfer.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_response_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_create.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_create.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_create.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_create.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_renew.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_renew.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_renew.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_renew.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_restore.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_restore.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_restore.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_restore.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_transfer.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_transfer.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v11_transfer.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_sunrise_response_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_create.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_create.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_create.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_create.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_renew.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_renew.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_renew.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_renew.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_restore.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_restore.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_restore.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_restore.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_transfer.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_transfer.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v11_transfer.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_reserved_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_reserved_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_response_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_response_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_response_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_response_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_response_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_response_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_response_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_unknown_command_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_v06.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v06.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_v06.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v06.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_v11.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v11.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_v11.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v11.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_fee_v12.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v12.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_fee_v12.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_fee_v12.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_no_cltrid.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_no_cltrid.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_multipart_tld_reserved.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_one_tld.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_one_tld.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld_reserved.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_one_tld_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_one_tld_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_one_tld_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_premium.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_premium.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_premium.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_premium.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_reserved_allocationtoken.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_reserved_allocationtoken.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_reserved_allocationtoken.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_reserved_allocationtoken.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_check_template.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_check_template.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_check_template.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_check_template.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_11_years.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_11_years.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_11_years.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_11_years.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_13_nameservers.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_13_nameservers.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_13_nameservers.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_13_nameservers.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_14_nameservers.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_14_nameservers.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_14_nameservers.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_14_nameservers.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_allocationtoken.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_allocationtoken.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_allocationtoken.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_allocationtoken.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_anchor_allocationtoken.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_allocationtoken.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_anchor_allocationtoken.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_allocationtoken.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_anchor_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_anchor_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_claims.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_claims.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_claims.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_claims.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_invalid_years.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_invalid_years.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_invalid_years.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_invalid_years.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_metadata_extension.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_metadata_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_metadata_extension.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_metadata_extension.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_signed_mark.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_signed_mark.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_signed_mark.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_signed_mark.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_sunrise_metadata_extension.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_sunrise_metadata_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_anchor_tenant_sunrise_metadata_extension.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_anchor_tenant_sunrise_metadata_extension.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_checksum_claim_notice.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_idn_minna.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_bad_validator_id.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_validator_id.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_bad_validator_id.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_bad_validator_id.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_claim_notice.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_claim_notice.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_claim_notice.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_claim_notice.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_code_with_mark.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_code_with_mark.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_code_with_mark.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_code_with_mark.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_dsdata.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_dsdata.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_8_records.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_9_records.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_dsdata_no_maxsiglife.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_duplicate_contact.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_duplicate_contact.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_duplicate_contact.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_duplicate_contact.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_eap_combined_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_eap_combined_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_eap_combined_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_eap_combined_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_eap_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_eap_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_eap_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_eap_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_extra_fees.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_extra_fees.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_extra_fees.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_extra_fees.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_fee_applied.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_applied.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_fee_applied.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_applied.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_bad_scale.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_fee_defaults.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_defaults.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_fee_defaults.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_defaults.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_fee_grace_period.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_grace_period.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_fee_grace_period.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_grace_period.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_fee_refundable.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_refundable.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_fee_refundable.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_fee_refundable.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_idn_minna.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_idn_minna.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_idn_minna.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_idn_minna.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice1.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_malformed_claim_notice2.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_metadata.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_metadata.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_metadata.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_metadata.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_missing_admin.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_admin.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_missing_admin.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_admin.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_missing_contact_type.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_contact_type.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_missing_contact_type.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_contact_type.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_missing_non_registrant_contacts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_non_registrant_contacts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_missing_non_registrant_contacts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_non_registrant_contacts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_missing_period.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_period.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_missing_period.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_period.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_missing_registrant.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_registrant.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_missing_registrant.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_registrant.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_missing_tech.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_tech.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_missing_tech.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_missing_tech.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_months.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_months.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_months.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_months.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_no_cltrid.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_no_cltrid.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_no_hosts_or_dsdata.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_premium.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_premium.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_premium_allocationtoken.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium_allocationtoken.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_premium_allocationtoken.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium_allocationtoken.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_premium_eap.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium_eap.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_premium_eap.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_premium_eap.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_registration_encoded_signed_mark.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_encoded_signed_mark.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_registration_encoded_signed_mark.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_encoded_signed_mark.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_registration_start_date_sunrise_claims_notice.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_start_date_sunrise_claims_notice.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_registration_start_date_sunrise_claims_notice.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_start_date_sunrise_claims_notice.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_registration_sunrise.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_sunrise.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_registration_sunrise.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_registration_sunrise.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_reserved.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_reserved.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_reserved.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_reserved.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_reserved_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_reserved_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_reserved_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_reserved_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_response_claims.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_claims.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_response_claims.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_claims.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_response_eap_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_eap_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_response_eap_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_eap_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_response_encoded_signed_mark_name.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_encoded_signed_mark_name.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_response_encoded_signed_mark_name.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_encoded_signed_mark_name.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_response_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_response_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_response_idn_minna.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_idn_minna.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_response_idn_minna.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_idn_minna.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_response_no_cltrid.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_response_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_no_cltrid.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_response_premium.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_premium.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_response_premium.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_premium.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_response_premium_eap.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_premium_eap.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_response_premium_eap.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_response_premium_eap.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_no_type.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_no_type.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_no_type.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_sunrise_encoded_signed_mark_no_type.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_uppercase.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_uppercase.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_uppercase.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_uppercase.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_with_tld.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_with_tld.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_with_tld.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_with_tld.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_create_wrong_extension.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_create_wrong_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_create_wrong_extension.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_create_wrong_extension.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete_allocationtoken.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_allocationtoken.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete_allocationtoken.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete_allocationtoken.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete_flags.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_flags.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete_flags.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete_flags.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete_metadata.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_metadata.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete_metadata.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete_metadata.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_autorenew_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete_response_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete_response_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete_response_pending.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_pending.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete_response_pending.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_pending.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete_response_pending_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete_superuser_and_metadata_extension.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_superuser_and_metadata_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete_superuser_and_metadata_extension.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete_superuser_and_metadata_extension.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_delete_superuser_extension.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_delete_superuser_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_delete_superuser_extension.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_delete_superuser_extension.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_default_hosts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_default_hosts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_default_hosts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_default_hosts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_delegated_hosts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_delegated_hosts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_delegated_hosts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_delegated_hosts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_command_phase.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_command_phase.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee_command_phase.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_command_phase.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_command_subphase.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_premium_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_premium_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee_premium_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_premium_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_restore_premium_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_restore_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_fee_restore_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_fee_restore_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_flags_none.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_flags_none.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_flags_none.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_flags_none.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_flags_two.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_flags_two.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_flags_two.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_flags_two.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_no_cltrid.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_no_cltrid.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_none_hosts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_none_hosts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_none_hosts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_none_hosts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_addperiod.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_addperiod.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_addperiod.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_addperiod.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_autorenewperiod.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_delegated_hosts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_dsdata.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_dsdata.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_dsdata.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_dsdata.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_dsdata_addperiod.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_no_cltrid.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_no_cltrid.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_none_hosts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_none_hosts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_none_hosts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_none_hosts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_pendingdelete.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_redemptionperiod.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_renewperiod.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_renewperiod.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_renewperiod.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_renewperiod.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_stackedaddrenewperiod.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_subordinate_hosts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_transferperiod.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_transferperiod.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_transferperiod.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_transferperiod.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_response_unauthorized.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_unauthorized.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_response_unauthorized.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_response_unauthorized.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_subordinate_hosts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_with_auth.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_with_auth.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_with_auth.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_with_auth.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_info_with_contact_auth.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_info_with_contact_auth.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_info_with_contact_auth.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_info_with_contact_auth.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_11_years.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_11_years.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_11_years.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_11_years.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_fee_applied.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_applied.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_fee_applied.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_applied.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_bad_scale.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_fee_defaults.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_defaults.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_fee_defaults.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_defaults.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_grace_period.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_fee_refundable.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_refundable.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_fee_refundable.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_fee_refundable.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_flags.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_flags.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_flags.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_flags.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_missing_period.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_missing_period.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_missing_period.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_missing_period.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_months.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_months.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_months.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_months.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_premium.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_premium.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_premium.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_premium.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_response_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_response_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_renew_response_missing_period.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response_missing_period.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_renew_response_missing_period.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_renew_response_missing_period.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_contact_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_domain_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_extra.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_extra.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve_extra.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_extra.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_net.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_net.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve_net.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_net.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_autorenew.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_net.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period_autorenew_grace.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period_autorenew_grace.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period_autorenew_grace.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_approve_response_zero_period_autorenew_grace.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_cancel.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_cancel.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_contact_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_domain_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_extra.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_extra.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_extra.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_extra.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_cancel_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_cancel_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_contact_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_domain_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_10_years.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_10_years.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_10_years.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_10_years.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_approved.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_cancelled.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_client_rejected.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_server_approved.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_query_response_server_cancelled.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_reject.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_reject.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_contact_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_domain_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_reject_extra.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_extra.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_reject_extra.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_extra.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_reject_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_reject_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_reject_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_2_years.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_2_years.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_2_years.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_2_years.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_domain_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_and_superuser_extension.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_and_superuser_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_and_superuser_extension.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_and_superuser_extension.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_applied.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_bad_scale.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_defaults.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_grace_period.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_fee_refundable.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_missing_period.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_months.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_months.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_months.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_months.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_no_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_premium.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_premium.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_premium.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_premium.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_10_year_cap.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_10_year_cap.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_10_year_cap.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_10_year_cap.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_15_minutes.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_request_only.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_request_only.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_request_only.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_request_only.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_transfer_only.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_transfer_only.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_transfer_only.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_at_transfer_only.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_throughout_transfer_window.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_throughout_transfer_window.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_throughout_transfer_window.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_autorenew_grace_throughout_transfer_window.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_fees.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_fees.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_fees.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_fees.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_one_year_period_nonzero_transfer_length.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_one_year_period_nonzero_transfer_length.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_one_year_period_nonzero_transfer_length.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_one_year_period_nonzero_transfer_length.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_autorenew_grace.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_autorenew_grace.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_autorenew_grace.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_autorenew_grace.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_nonzero_transfer_length.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_nonzero_transfer_length.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_nonzero_transfer_length.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_nonzero_transfer_length.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_zero_transfer_length.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_zero_transfer_length.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_zero_transfer_length.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_response_su_ext_zero_period_zero_transfer_length.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_separate_fees.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_separate_fees.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_separate_fees.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_separate_fees.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_superuser_extension.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_superuser_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_superuser_extension.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_superuser_extension.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_transfer_request_wildcard.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_add_nameserver.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_nameserver.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_add_nameserver.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_nameserver.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_add_non_server_status.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_non_server_status.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_add_non_server_status.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_non_server_status.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_add_registry_lock.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_registry_lock.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_add_registry_lock.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_registry_lock.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_remove_same_contact.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_remove_same_host.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_hold_status.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_add_server_status.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_status.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_add_server_status.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_status.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_add_server_status_non_registrar.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_authinfo.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_authinfo.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_authinfo.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_authinfo.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_change_server_status.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_change_server_status.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_change_server_status.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_change_server_status.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_contacts_and_registrant.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_contacts_and_registrant.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_contacts_and_registrant.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_contacts_and_registrant.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_add_rem_same.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_empty.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_empty.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_dsdata_empty.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_empty.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_rem_all_false.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_dsdata_urgent.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_duplicate_contact.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_duplicate_contact.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_duplicate_contact.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_duplicate_contact.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_empty_registrant.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_empty_registrant.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_empty_registrant.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_empty_registrant.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_max_everything.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_max_everything.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_max_everything.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_max_everything.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_maxsiglife.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_maxsiglife.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_maxsiglife.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_maxsiglife.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_metadata.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_metadata.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_metadata.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_metadata.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_missing_contact_type.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_missing_contact_type.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_missing_contact_type.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_missing_contact_type.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_multiple_duplicate_contacts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_multiple_duplicate_contacts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_multiple_duplicate_contacts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_multiple_duplicate_contacts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_no_cltrid.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_no_cltrid.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_prohibited_status.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_prohibited_status.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_prohibited_status.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_prohibited_status.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_registrant.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_registrant.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_registrant.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_registrant.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_registrant_to_tech.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_remove_admin.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_admin.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_remove_admin.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_admin.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_remove_client_hold.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_client_hold.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_remove_client_hold.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_client_hold.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_remove_contact.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_contact.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_remove_contact.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_contact.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_multiple_contacts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_remove_nameserver.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_nameserver.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_remove_nameserver.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_nameserver.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_remove_server_hold.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_server_hold.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_remove_server_hold.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_server_hold.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_remove_server_status.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_server_status.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_remove_server_status.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_server_status.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_remove_tech.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_tech.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_remove_tech.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_remove_tech.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_applied.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_bad_scale.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_defaults.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_grace_period.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_fee_refundable.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_flags.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_flags.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_flags.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_flags.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_premium.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_premium.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_premium.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_premium.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_response_fee.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_response_premium.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_response_premium.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_response_premium.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_response_premium.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_add.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_change.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_remove.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_restore_request_with_secdns.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_subordinate_hosts.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_wildcard.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_wildcard.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_wildcard.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_wildcard.xml
diff --git a/javatests/google/registry/flows/domain/testdata/domain_update_wrong_extension.xml b/core/src/test/java/google/registry/flows/domain/testdata/domain_update_wrong_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/domain_update_wrong_extension.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/domain_update_wrong_extension.xml
diff --git a/javatests/google/registry/flows/domain/testdata/generic_success_response.xml b/core/src/test/java/google/registry/flows/domain/testdata/generic_success_response.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/generic_success_response.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/generic_success_response.xml
diff --git a/javatests/google/registry/flows/domain/testdata/generic_success_response_no_cltrid.xml b/core/src/test/java/google/registry/flows/domain/testdata/generic_success_response_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/domain/testdata/generic_success_response_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/domain/testdata/generic_success_response_no_cltrid.xml
diff --git a/javatests/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java b/core/src/test/java/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java
similarity index 100%
rename from javatests/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java
rename to core/src/test/java/google/registry/flows/domain/token/AllocationTokenFlowUtilsTest.java
diff --git a/javatests/google/registry/flows/host/HostCheckFlowTest.java b/core/src/test/java/google/registry/flows/host/HostCheckFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/host/HostCheckFlowTest.java
rename to core/src/test/java/google/registry/flows/host/HostCheckFlowTest.java
diff --git a/javatests/google/registry/flows/host/HostCreateFlowTest.java b/core/src/test/java/google/registry/flows/host/HostCreateFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/host/HostCreateFlowTest.java
rename to core/src/test/java/google/registry/flows/host/HostCreateFlowTest.java
diff --git a/javatests/google/registry/flows/host/HostDeleteFlowTest.java b/core/src/test/java/google/registry/flows/host/HostDeleteFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/host/HostDeleteFlowTest.java
rename to core/src/test/java/google/registry/flows/host/HostDeleteFlowTest.java
diff --git a/javatests/google/registry/flows/host/HostFlowUtilsTest.java b/core/src/test/java/google/registry/flows/host/HostFlowUtilsTest.java
similarity index 100%
rename from javatests/google/registry/flows/host/HostFlowUtilsTest.java
rename to core/src/test/java/google/registry/flows/host/HostFlowUtilsTest.java
diff --git a/javatests/google/registry/flows/host/HostInfoFlowTest.java b/core/src/test/java/google/registry/flows/host/HostInfoFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/host/HostInfoFlowTest.java
rename to core/src/test/java/google/registry/flows/host/HostInfoFlowTest.java
diff --git a/javatests/google/registry/flows/host/HostUpdateFlowTest.java b/core/src/test/java/google/registry/flows/host/HostUpdateFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/host/HostUpdateFlowTest.java
rename to core/src/test/java/google/registry/flows/host/HostUpdateFlowTest.java
diff --git a/javatests/google/registry/flows/host/testdata/generic_success_response.xml b/core/src/test/java/google/registry/flows/host/testdata/generic_success_response.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/generic_success_response.xml
rename to core/src/test/java/google/registry/flows/host/testdata/generic_success_response.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_check.xml b/core/src/test/java/google/registry/flows/host/testdata/host_check.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_check.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_check.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_check_50.xml b/core/src/test/java/google/registry/flows/host/testdata/host_check_50.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_check_50.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_check_50.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_check_51.xml b/core/src/test/java/google/registry/flows/host/testdata/host_check_51.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_check_51.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_check_51.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_check_response.xml b/core/src/test/java/google/registry/flows/host/testdata/host_check_response.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_check_response.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_check_response.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_create.xml b/core/src/test/java/google/registry/flows/host/testdata/host_create.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_create.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_create.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_create_response.xml b/core/src/test/java/google/registry/flows/host/testdata/host_create_response.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_create_response.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_create_response.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_delete.xml b/core/src/test/java/google/registry/flows/host/testdata/host_delete.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_delete.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_delete.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_delete_no_cltrid.xml b/core/src/test/java/google/registry/flows/host/testdata/host_delete_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_delete_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_delete_no_cltrid.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_delete_response.xml b/core/src/test/java/google/registry/flows/host/testdata/host_delete_response.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_delete_response.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_delete_response.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_delete_response_no_cltrid.xml b/core/src/test/java/google/registry/flows/host/testdata/host_delete_response_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_delete_response_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_delete_response_no_cltrid.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_info.xml b/core/src/test/java/google/registry/flows/host/testdata/host_info.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_info.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_info.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_info_response.xml b/core/src/test/java/google/registry/flows/host/testdata/host_info_response.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_info_response.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_info_response.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_info_response_linked.xml b/core/src/test/java/google/registry/flows/host/testdata/host_info_response_linked.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_info_response_linked.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_info_response_linked.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml b/core/src/test/java/google/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_info_response_superordinate_clientid.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_update.xml b/core/src/test/java/google/registry/flows/host/testdata/host_update.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_update.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_update.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_update_add_status.xml b/core/src/test/java/google/registry/flows/host/testdata/host_update_add_status.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_update_add_status.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_update_add_status.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_update_metadata.xml b/core/src/test/java/google/registry/flows/host/testdata/host_update_metadata.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_update_metadata.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_update_metadata.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_update_name_unchanged.xml b/core/src/test/java/google/registry/flows/host/testdata/host_update_name_unchanged.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_update_name_unchanged.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_update_name_unchanged.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_update_prohibited_status.xml b/core/src/test/java/google/registry/flows/host/testdata/host_update_prohibited_status.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_update_prohibited_status.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_update_prohibited_status.xml
diff --git a/javatests/google/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml b/core/src/test/java/google/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml
similarity index 100%
rename from javatests/google/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml
rename to core/src/test/java/google/registry/flows/host/testdata/host_update_remove_client_update_prohibited.xml
diff --git a/javatests/google/registry/flows/poll/PollAckFlowTest.java b/core/src/test/java/google/registry/flows/poll/PollAckFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/poll/PollAckFlowTest.java
rename to core/src/test/java/google/registry/flows/poll/PollAckFlowTest.java
diff --git a/javatests/google/registry/flows/poll/PollRequestFlowTest.java b/core/src/test/java/google/registry/flows/poll/PollRequestFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/poll/PollRequestFlowTest.java
rename to core/src/test/java/google/registry/flows/poll/PollRequestFlowTest.java
diff --git a/javatests/google/registry/flows/poll/testdata/poll.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_ack.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_ack.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_ack.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_ack.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_ack_missing_id.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_ack_missing_id.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_ack_missing_id.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_ack_missing_id.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_ack_response.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_ack_response.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_ack_response.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_ack_response.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_ack_response_empty.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_ack_response_empty.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_ack_response_empty.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_ack_response_empty.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_no_cltrid.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_no_cltrid.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_response_autorenew.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_response_autorenew.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_response_autorenew.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_response_autorenew.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_response_contact_delete.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_response_contact_delete.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_response_contact_delete.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_response_contact_delete.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_response_contact_transfer.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_response_contact_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_response_contact_transfer.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_response_contact_transfer.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_pending_notification.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_response_domain_transfer.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_response_domain_transfer.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_transfer.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_response_domain_transfer_no_cltrid.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_transfer_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_response_domain_transfer_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_response_domain_transfer_no_cltrid.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_response_empty.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_response_empty.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_response_empty.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_response_empty.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_response_host_delete.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_response_host_delete.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_response_host_delete.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_response_host_delete.xml
diff --git a/javatests/google/registry/flows/poll/testdata/poll_with_id.xml b/core/src/test/java/google/registry/flows/poll/testdata/poll_with_id.xml
similarity index 100%
rename from javatests/google/registry/flows/poll/testdata/poll_with_id.xml
rename to core/src/test/java/google/registry/flows/poll/testdata/poll_with_id.xml
diff --git a/javatests/google/registry/flows/session/HelloFlowTest.java b/core/src/test/java/google/registry/flows/session/HelloFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/session/HelloFlowTest.java
rename to core/src/test/java/google/registry/flows/session/HelloFlowTest.java
diff --git a/javatests/google/registry/flows/session/LoginFlowTestCase.java b/core/src/test/java/google/registry/flows/session/LoginFlowTestCase.java
similarity index 100%
rename from javatests/google/registry/flows/session/LoginFlowTestCase.java
rename to core/src/test/java/google/registry/flows/session/LoginFlowTestCase.java
diff --git a/javatests/google/registry/flows/session/LoginFlowViaTlsTest.java b/core/src/test/java/google/registry/flows/session/LoginFlowViaTlsTest.java
similarity index 100%
rename from javatests/google/registry/flows/session/LoginFlowViaTlsTest.java
rename to core/src/test/java/google/registry/flows/session/LoginFlowViaTlsTest.java
diff --git a/javatests/google/registry/flows/session/LogoutFlowTest.java b/core/src/test/java/google/registry/flows/session/LogoutFlowTest.java
similarity index 100%
rename from javatests/google/registry/flows/session/LogoutFlowTest.java
rename to core/src/test/java/google/registry/flows/session/LogoutFlowTest.java
diff --git a/javatests/google/registry/flows/session/testdata/generic_success_response.xml b/core/src/test/java/google/registry/flows/session/testdata/generic_success_response.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/generic_success_response.xml
rename to core/src/test/java/google/registry/flows/session/testdata/generic_success_response.xml
diff --git a/javatests/google/registry/flows/session/testdata/generic_syntax_exception.xml b/core/src/test/java/google/registry/flows/session/testdata/generic_syntax_exception.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/generic_syntax_exception.xml
rename to core/src/test/java/google/registry/flows/session/testdata/generic_syntax_exception.xml
diff --git a/javatests/google/registry/flows/session/testdata/greeting.xml b/core/src/test/java/google/registry/flows/session/testdata/greeting.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/greeting.xml
rename to core/src/test/java/google/registry/flows/session/testdata/greeting.xml
diff --git a/java/google/registry/proxy/resources/hello.xml b/core/src/test/java/google/registry/flows/session/testdata/hello.xml
similarity index 100%
rename from java/google/registry/proxy/resources/hello.xml
rename to core/src/test/java/google/registry/flows/session/testdata/hello.xml
diff --git a/javatests/google/registry/flows/session/testdata/login_invalid_extension.xml b/core/src/test/java/google/registry/flows/session/testdata/login_invalid_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/login_invalid_extension.xml
rename to core/src/test/java/google/registry/flows/session/testdata/login_invalid_extension.xml
diff --git a/javatests/google/registry/flows/session/testdata/login_invalid_language.xml b/core/src/test/java/google/registry/flows/session/testdata/login_invalid_language.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/login_invalid_language.xml
rename to core/src/test/java/google/registry/flows/session/testdata/login_invalid_language.xml
diff --git a/javatests/google/registry/flows/session/testdata/login_invalid_newpw.xml b/core/src/test/java/google/registry/flows/session/testdata/login_invalid_newpw.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/login_invalid_newpw.xml
rename to core/src/test/java/google/registry/flows/session/testdata/login_invalid_newpw.xml
diff --git a/javatests/google/registry/flows/session/testdata/login_invalid_types.xml b/core/src/test/java/google/registry/flows/session/testdata/login_invalid_types.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/login_invalid_types.xml
rename to core/src/test/java/google/registry/flows/session/testdata/login_invalid_types.xml
diff --git a/javatests/google/registry/flows/session/testdata/login_invalid_version.xml b/core/src/test/java/google/registry/flows/session/testdata/login_invalid_version.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/login_invalid_version.xml
rename to core/src/test/java/google/registry/flows/session/testdata/login_invalid_version.xml
diff --git a/javatests/google/registry/flows/session/testdata/login_valid.xml b/core/src/test/java/google/registry/flows/session/testdata/login_valid.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/login_valid.xml
rename to core/src/test/java/google/registry/flows/session/testdata/login_valid.xml
diff --git a/javatests/google/registry/flows/session/testdata/login_valid_missing_types.xml b/core/src/test/java/google/registry/flows/session/testdata/login_valid_missing_types.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/login_valid_missing_types.xml
rename to core/src/test/java/google/registry/flows/session/testdata/login_valid_missing_types.xml
diff --git a/javatests/google/registry/flows/session/testdata/logout.xml b/core/src/test/java/google/registry/flows/session/testdata/logout.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/logout.xml
rename to core/src/test/java/google/registry/flows/session/testdata/logout.xml
diff --git a/javatests/google/registry/flows/session/testdata/logout_response.xml b/core/src/test/java/google/registry/flows/session/testdata/logout_response.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/logout_response.xml
rename to core/src/test/java/google/registry/flows/session/testdata/logout_response.xml
diff --git a/javatests/google/registry/flows/testdata/contact_create_billion_laughs.xml b/core/src/test/java/google/registry/flows/testdata/contact_create_billion_laughs.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_create_billion_laughs.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_create_billion_laughs.xml
diff --git a/javatests/google/registry/flows/testdata/contact_create_jd1234.xml b/core/src/test/java/google/registry/flows/testdata/contact_create_jd1234.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_create_jd1234.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_create_jd1234.xml
diff --git a/javatests/google/registry/flows/testdata/contact_create_local_xxe.xml b/core/src/test/java/google/registry/flows/testdata/contact_create_local_xxe.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_create_local_xxe.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_create_local_xxe.xml
diff --git a/javatests/google/registry/flows/testdata/contact_create_remote_xxe.xml b/core/src/test/java/google/registry/flows/testdata/contact_create_remote_xxe.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_create_remote_xxe.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_create_remote_xxe.xml
diff --git a/javatests/google/registry/flows/testdata/contact_create_response_jd1234.xml b/core/src/test/java/google/registry/flows/testdata/contact_create_response_jd1234.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_create_response_jd1234.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_create_response_jd1234.xml
diff --git a/javatests/google/registry/flows/testdata/contact_create_response_sh8013.xml b/core/src/test/java/google/registry/flows/testdata/contact_create_response_sh8013.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_create_response_sh8013.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_create_response_sh8013.xml
diff --git a/javatests/google/registry/flows/testdata/contact_create_sh8013.xml b/core/src/test/java/google/registry/flows/testdata/contact_create_sh8013.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_create_sh8013.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_create_sh8013.xml
diff --git a/javatests/google/registry/flows/testdata/contact_delete_response_sh8013.xml b/core/src/test/java/google/registry/flows/testdata/contact_delete_response_sh8013.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_delete_response_sh8013.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_delete_response_sh8013.xml
diff --git a/javatests/google/registry/flows/testdata/contact_delete_sh8013.xml b/core/src/test/java/google/registry/flows/testdata/contact_delete_sh8013.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_delete_sh8013.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_delete_sh8013.xml
diff --git a/javatests/google/registry/flows/testdata/contact_info.xml b/core/src/test/java/google/registry/flows/testdata/contact_info.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_info.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_info.xml
diff --git a/javatests/google/registry/flows/testdata/contact_info_from_create_response.xml b/core/src/test/java/google/registry/flows/testdata/contact_info_from_create_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_info_from_create_response.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_info_from_create_response.xml
diff --git a/javatests/google/registry/flows/testdata/contact_info_from_create_response_sanitized.xml b/core/src/test/java/google/registry/flows/testdata/contact_info_from_create_response_sanitized.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_info_from_create_response_sanitized.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_info_from_create_response_sanitized.xml
diff --git a/javatests/google/registry/flows/testdata/contact_info_sanitized.xml b/core/src/test/java/google/registry/flows/testdata/contact_info_sanitized.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_info_sanitized.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_info_sanitized.xml
diff --git a/javatests/google/registry/flows/testdata/contact_transfer_request.xml b/core/src/test/java/google/registry/flows/testdata/contact_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_transfer_request.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_transfer_request.xml
diff --git a/javatests/google/registry/flows/testdata/contact_transfer_request_response_alternate.xml b/core/src/test/java/google/registry/flows/testdata/contact_transfer_request_response_alternate.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/contact_transfer_request_response_alternate.xml
rename to core/src/test/java/google/registry/flows/testdata/contact_transfer_request_response_alternate.xml
diff --git a/javatests/google/registry/flows/testdata/domain_check_fee_premium.xml b/core/src/test/java/google/registry/flows/testdata/domain_check_fee_premium.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_check_fee_premium.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_check_fee_premium.xml
diff --git a/javatests/google/registry/flows/testdata/domain_check_fee_premium_response.xml b/core/src/test/java/google/registry/flows/testdata/domain_check_fee_premium_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_check_fee_premium_response.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_check_fee_premium_response.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create.xml b/core/src/test/java/google/registry/flows/testdata/domain_create.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_eap_fee.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_eap_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_eap_fee.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_eap_fee.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_fakesite_no_nameservers.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_fakesite_no_nameservers.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_fakesite_no_nameservers.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_fakesite_no_nameservers.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_no_hosts_or_dsdata.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_prettyprinted.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_prettyprinted.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_prettyprinted.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_prettyprinted.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_response.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_response.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_response.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_response_eap_fee.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_response_eap_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_response_eap_fee.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_response_eap_fee.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_secondsite.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_secondsite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_secondsite.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_secondsite.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_no_type.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_no_type.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_no_type.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_no_type.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_start_date_sunrise_encoded_mark_wrong_phase.xml
diff --git a/javatests/google/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml b/core/src/test/java/google/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_create_sunrise_encoded_mark.xml
diff --git a/javatests/google/registry/flows/testdata/domain_delete.xml b/core/src/test/java/google/registry/flows/testdata/domain_delete.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_delete.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_delete.xml
diff --git a/javatests/google/registry/flows/testdata/domain_delete_response_fee.xml b/core/src/test/java/google/registry/flows/testdata/domain_delete_response_fee.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_delete_response_fee.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_delete_response_fee.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info.xml b/core/src/test/java/google/registry/flows/testdata/domain_info.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_pending_transfer.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_3_nameservers_transfer_successful.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_inactive.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_inactive.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_inactive.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_inactive.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_ok.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_ok.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_ok.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_ok.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_ok_post_host_update.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_delete.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_pending_transfer_autorenew.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_restored_ok.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_transfer_complete.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_fakesite_transfer_period.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_inactive.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_inactive.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_inactive.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_inactive.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_inactive_grace_period.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_inactive_grace_period.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_inactive_grace_period.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_inactive_grace_period.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_ok_wildcard.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_ok_wildcard.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_ok_wildcard.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_ok_wildcard.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_testvalidate_ok.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_testvalidate_ok.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_testvalidate_ok.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_testvalidate_ok.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_wildcard.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_wildcard.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_wildcard.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_wildcard.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_response_wildcard_after_redemption.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_response_wildcard_after_redemption.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_response_wildcard_after_redemption.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_response_wildcard_after_redemption.xml
diff --git a/javatests/google/registry/flows/testdata/domain_info_testvalidate.xml b/core/src/test/java/google/registry/flows/testdata/domain_info_testvalidate.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_info_testvalidate.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_info_testvalidate.xml
diff --git a/javatests/google/registry/flows/testdata/domain_renew.xml b/core/src/test/java/google/registry/flows/testdata/domain_renew.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_renew.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_renew.xml
diff --git a/javatests/google/registry/flows/testdata/domain_renew_response.xml b/core/src/test/java/google/registry/flows/testdata/domain_renew_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_renew_response.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_renew_response.xml
diff --git a/javatests/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml b/core/src/test/java/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_renew_response_exceeds_max_years.xml
diff --git a/javatests/google/registry/flows/testdata/domain_transfer_query_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/domain_transfer_query_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_transfer_query_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_transfer_query_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_transfer_query_response_completed_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/domain_transfer_query_response_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/domain_transfer_query_response_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_transfer_query_response_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_transfer_query_response_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/domain_transfer_request.xml b/core/src/test/java/google/registry/flows/testdata/domain_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_transfer_request.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_transfer_request.xml
diff --git a/javatests/google/registry/flows/testdata/domain_transfer_request_1_year.xml b/core/src/test/java/google/registry/flows/testdata/domain_transfer_request_1_year.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_transfer_request_1_year.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_transfer_request_1_year.xml
diff --git a/javatests/google/registry/flows/testdata/domain_transfer_response.xml b/core/src/test/java/google/registry/flows/testdata/domain_transfer_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_transfer_response.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_transfer_response.xml
diff --git a/javatests/google/registry/flows/testdata/domain_transfer_response_1_year.xml b/core/src/test/java/google/registry/flows/testdata/domain_transfer_response_1_year.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_transfer_response_1_year.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_transfer_response_1_year.xml
diff --git a/javatests/google/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_update_add_nameserver_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/domain_update_dsdata_add.xml b/core/src/test/java/google/registry/flows/testdata/domain_update_dsdata_add.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_update_dsdata_add.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_update_dsdata_add.xml
diff --git a/javatests/google/registry/flows/testdata/domain_update_dsdata_rem.xml b/core/src/test/java/google/registry/flows/testdata/domain_update_dsdata_rem.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_update_dsdata_rem.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_update_dsdata_rem.xml
diff --git a/javatests/google/registry/flows/testdata/domain_update_restore_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/domain_update_restore_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_update_restore_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_update_restore_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/domain_update_restore_request.xml b/core/src/test/java/google/registry/flows/testdata/domain_update_restore_request.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/domain_update_restore_request.xml
rename to core/src/test/java/google/registry/flows/testdata/domain_update_restore_request.xml
diff --git a/javatests/google/registry/flows/testdata/generic_success_action_pending_response.xml b/core/src/test/java/google/registry/flows/testdata/generic_success_action_pending_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/generic_success_action_pending_response.xml
rename to core/src/test/java/google/registry/flows/testdata/generic_success_action_pending_response.xml
diff --git a/javatests/google/registry/flows/testdata/generic_success_response.xml b/core/src/test/java/google/registry/flows/testdata/generic_success_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/generic_success_response.xml
rename to core/src/test/java/google/registry/flows/testdata/generic_success_response.xml
diff --git a/javatests/google/registry/flows/testdata/greeting.xml b/core/src/test/java/google/registry/flows/testdata/greeting.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/greeting.xml
rename to core/src/test/java/google/registry/flows/testdata/greeting.xml
diff --git a/java/google/registry/ui/epptmpl/hello.xml b/core/src/test/java/google/registry/flows/testdata/hello.xml
similarity index 100%
rename from java/google/registry/ui/epptmpl/hello.xml
rename to core/src/test/java/google/registry/flows/testdata/hello.xml
diff --git a/javatests/google/registry/flows/testdata/host_create.xml b/core/src/test/java/google/registry/flows/testdata/host_create.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_create.xml
rename to core/src/test/java/google/registry/flows/testdata/host_create.xml
diff --git a/javatests/google/registry/flows/testdata/host_create_example.xml b/core/src/test/java/google/registry/flows/testdata/host_create_example.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_create_example.xml
rename to core/src/test/java/google/registry/flows/testdata/host_create_example.xml
diff --git a/javatests/google/registry/flows/testdata/host_create_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/host_create_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_create_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/host_create_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/host_create_fakesite2.xml b/core/src/test/java/google/registry/flows/testdata/host_create_fakesite2.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_create_fakesite2.xml
rename to core/src/test/java/google/registry/flows/testdata/host_create_fakesite2.xml
diff --git a/javatests/google/registry/flows/testdata/host_create_response.xml b/core/src/test/java/google/registry/flows/testdata/host_create_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_create_response.xml
rename to core/src/test/java/google/registry/flows/testdata/host_create_response.xml
diff --git a/javatests/google/registry/flows/testdata/host_create_response_example.xml b/core/src/test/java/google/registry/flows/testdata/host_create_response_example.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_create_response_example.xml
rename to core/src/test/java/google/registry/flows/testdata/host_create_response_example.xml
diff --git a/javatests/google/registry/flows/testdata/host_create_response_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/host_create_response_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_create_response_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/host_create_response_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/host_create_response_fakesite2.xml b/core/src/test/java/google/registry/flows/testdata/host_create_response_fakesite2.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_create_response_fakesite2.xml
rename to core/src/test/java/google/registry/flows/testdata/host_create_response_fakesite2.xml
diff --git a/javatests/google/registry/flows/testdata/host_create_with_ips.xml b/core/src/test/java/google/registry/flows/testdata/host_create_with_ips.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_create_with_ips.xml
rename to core/src/test/java/google/registry/flows/testdata/host_create_with_ips.xml
diff --git a/javatests/google/registry/flows/testdata/host_delete.xml b/core/src/test/java/google/registry/flows/testdata/host_delete.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_delete.xml
rename to core/src/test/java/google/registry/flows/testdata/host_delete.xml
diff --git a/javatests/google/registry/flows/testdata/host_info.xml b/core/src/test/java/google/registry/flows/testdata/host_info.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/host_info_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_fakesite2.xml b/core/src/test/java/google/registry/flows/testdata/host_info_fakesite2.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_fakesite2.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_fakesite2.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_ns9000_example.xml b/core/src/test/java/google/registry/flows/testdata/host_info_ns9000_example.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_ns9000_example.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_ns9000_example.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_fakesite2.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite2.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_fakesite2.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite2.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_fakesite_linked.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_linked.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_fakesite_linked.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_linked.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_fakesite_ok.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_ok.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_fakesite_ok.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_ok.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_transfer_and_update_no_addresses.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_fakesite_post_update.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_update.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_fakesite_post_update.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_fakesite_post_update.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_ns1.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_ns1.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_ns1.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_ns1.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_ns2.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_ns2.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_ns2.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_ns2.xml
diff --git a/javatests/google/registry/flows/testdata/host_info_response_ns9000_example.xml b/core/src/test/java/google/registry/flows/testdata/host_info_response_ns9000_example.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_info_response_ns9000_example.xml
rename to core/src/test/java/google/registry/flows/testdata/host_info_response_ns9000_example.xml
diff --git a/javatests/google/registry/flows/testdata/host_update_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/host_update_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_update_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/host_update_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/host_update_fakesite1_to_fakesite2.xml b/core/src/test/java/google/registry/flows/testdata/host_update_fakesite1_to_fakesite2.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_update_fakesite1_to_fakesite2.xml
rename to core/src/test/java/google/registry/flows/testdata/host_update_fakesite1_to_fakesite2.xml
diff --git a/javatests/google/registry/flows/testdata/host_update_ns1_to_fakesite.xml b/core/src/test/java/google/registry/flows/testdata/host_update_ns1_to_fakesite.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_update_ns1_to_fakesite.xml
rename to core/src/test/java/google/registry/flows/testdata/host_update_ns1_to_fakesite.xml
diff --git a/javatests/google/registry/flows/testdata/host_update_ns1_to_ns2.xml b/core/src/test/java/google/registry/flows/testdata/host_update_ns1_to_ns2.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_update_ns1_to_ns2.xml
rename to core/src/test/java/google/registry/flows/testdata/host_update_ns1_to_ns2.xml
diff --git a/javatests/google/registry/flows/testdata/host_update_rename_and_remove_addresses.xml b/core/src/test/java/google/registry/flows/testdata/host_update_rename_and_remove_addresses.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_update_rename_and_remove_addresses.xml
rename to core/src/test/java/google/registry/flows/testdata/host_update_rename_and_remove_addresses.xml
diff --git a/javatests/google/registry/flows/testdata/host_update_rename_only.xml b/core/src/test/java/google/registry/flows/testdata/host_update_rename_only.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/host_update_rename_only.xml
rename to core/src/test/java/google/registry/flows/testdata/host_update_rename_only.xml
diff --git a/javatests/google/registry/flows/testdata/login.xml b/core/src/test/java/google/registry/flows/testdata/login.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/login.xml
rename to core/src/test/java/google/registry/flows/testdata/login.xml
diff --git a/javatests/google/registry/flows/testdata/login_update_password.xml b/core/src/test/java/google/registry/flows/testdata/login_update_password.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/login_update_password.xml
rename to core/src/test/java/google/registry/flows/testdata/login_update_password.xml
diff --git a/javatests/google/registry/flows/testdata/login_valid_fee_extension.xml b/core/src/test/java/google/registry/flows/testdata/login_valid_fee_extension.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/login_valid_fee_extension.xml
rename to core/src/test/java/google/registry/flows/testdata/login_valid_fee_extension.xml
diff --git a/javatests/google/registry/flows/testdata/login_wrong_case.xml b/core/src/test/java/google/registry/flows/testdata/login_wrong_case.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/login_wrong_case.xml
rename to core/src/test/java/google/registry/flows/testdata/login_wrong_case.xml
diff --git a/javatests/google/registry/flows/testdata/logout.xml b/core/src/test/java/google/registry/flows/testdata/logout.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/logout.xml
rename to core/src/test/java/google/registry/flows/testdata/logout.xml
diff --git a/javatests/google/registry/flows/testdata/logout_response.xml b/core/src/test/java/google/registry/flows/testdata/logout_response.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/logout_response.xml
rename to core/src/test/java/google/registry/flows/testdata/logout_response.xml
diff --git a/javatests/google/registry/flows/testdata/poll.xml b/core/src/test/java/google/registry/flows/testdata/poll.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll.xml
rename to core/src/test/java/google/registry/flows/testdata/poll.xml
diff --git a/javatests/google/registry/flows/testdata/poll_ack.xml b/core/src/test/java/google/registry/flows/testdata/poll_ack.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll_ack.xml
rename to core/src/test/java/google/registry/flows/testdata/poll_ack.xml
diff --git a/javatests/google/registry/flows/testdata/poll_ack_response_empty.xml b/core/src/test/java/google/registry/flows/testdata/poll_ack_response_empty.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll_ack_response_empty.xml
rename to core/src/test/java/google/registry/flows/testdata/poll_ack_response_empty.xml
diff --git a/javatests/google/registry/flows/testdata/poll_response_autorenew.xml b/core/src/test/java/google/registry/flows/testdata/poll_response_autorenew.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll_response_autorenew.xml
rename to core/src/test/java/google/registry/flows/testdata/poll_response_autorenew.xml
diff --git a/javatests/google/registry/flows/testdata/poll_response_contact_transfer.xml b/core/src/test/java/google/registry/flows/testdata/poll_response_contact_transfer.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll_response_contact_transfer.xml
rename to core/src/test/java/google/registry/flows/testdata/poll_response_contact_transfer.xml
diff --git a/javatests/google/registry/flows/testdata/poll_response_domain_transfer_request.xml b/core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll_response_domain_transfer_request.xml
rename to core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_request.xml
diff --git a/javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml b/core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml
rename to core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_loser.xml
diff --git a/javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml b/core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml
rename to core/src/test/java/google/registry/flows/testdata/poll_response_domain_transfer_server_approve_winner.xml
diff --git a/javatests/google/registry/flows/testdata/poll_response_empty.xml b/core/src/test/java/google/registry/flows/testdata/poll_response_empty.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll_response_empty.xml
rename to core/src/test/java/google/registry/flows/testdata/poll_response_empty.xml
diff --git a/javatests/google/registry/flows/testdata/poll_response_unrenew.xml b/core/src/test/java/google/registry/flows/testdata/poll_response_unrenew.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/poll_response_unrenew.xml
rename to core/src/test/java/google/registry/flows/testdata/poll_response_unrenew.xml
diff --git a/javatests/google/registry/flows/testdata/response_error.xml b/core/src/test/java/google/registry/flows/testdata/response_error.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/response_error.xml
rename to core/src/test/java/google/registry/flows/testdata/response_error.xml
diff --git a/javatests/google/registry/flows/testdata/response_error_no_cltrid.xml b/core/src/test/java/google/registry/flows/testdata/response_error_no_cltrid.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/response_error_no_cltrid.xml
rename to core/src/test/java/google/registry/flows/testdata/response_error_no_cltrid.xml
diff --git a/javatests/google/registry/flows/testdata/syntax_error.xml b/core/src/test/java/google/registry/flows/testdata/syntax_error.xml
similarity index 100%
rename from javatests/google/registry/flows/testdata/syntax_error.xml
rename to core/src/test/java/google/registry/flows/testdata/syntax_error.xml
diff --git a/javatests/google/registry/groups/BUILD b/core/src/test/java/google/registry/groups/BUILD
similarity index 100%
rename from javatests/google/registry/groups/BUILD
rename to core/src/test/java/google/registry/groups/BUILD
diff --git a/javatests/google/registry/groups/DirectoryGroupsConnectionTest.java b/core/src/test/java/google/registry/groups/DirectoryGroupsConnectionTest.java
similarity index 100%
rename from javatests/google/registry/groups/DirectoryGroupsConnectionTest.java
rename to core/src/test/java/google/registry/groups/DirectoryGroupsConnectionTest.java
diff --git a/javatests/google/registry/keyring/api/BUILD b/core/src/test/java/google/registry/keyring/api/BUILD
similarity index 100%
rename from javatests/google/registry/keyring/api/BUILD
rename to core/src/test/java/google/registry/keyring/api/BUILD
diff --git a/javatests/google/registry/keyring/api/ComparatorKeyringTest.java b/core/src/test/java/google/registry/keyring/api/ComparatorKeyringTest.java
similarity index 100%
rename from javatests/google/registry/keyring/api/ComparatorKeyringTest.java
rename to core/src/test/java/google/registry/keyring/api/ComparatorKeyringTest.java
diff --git a/javatests/google/registry/keyring/api/KeySerializerTest.java b/core/src/test/java/google/registry/keyring/api/KeySerializerTest.java
similarity index 100%
rename from javatests/google/registry/keyring/api/KeySerializerTest.java
rename to core/src/test/java/google/registry/keyring/api/KeySerializerTest.java
diff --git a/javatests/google/registry/keyring/kms/BUILD b/core/src/test/java/google/registry/keyring/kms/BUILD
similarity index 100%
rename from javatests/google/registry/keyring/kms/BUILD
rename to core/src/test/java/google/registry/keyring/kms/BUILD
diff --git a/javatests/google/registry/keyring/kms/FakeKmsConnection.java b/core/src/test/java/google/registry/keyring/kms/FakeKmsConnection.java
similarity index 100%
rename from javatests/google/registry/keyring/kms/FakeKmsConnection.java
rename to core/src/test/java/google/registry/keyring/kms/FakeKmsConnection.java
diff --git a/javatests/google/registry/keyring/kms/GoogleJsonResponseExceptionHelper.java b/core/src/test/java/google/registry/keyring/kms/GoogleJsonResponseExceptionHelper.java
similarity index 100%
rename from javatests/google/registry/keyring/kms/GoogleJsonResponseExceptionHelper.java
rename to core/src/test/java/google/registry/keyring/kms/GoogleJsonResponseExceptionHelper.java
diff --git a/javatests/google/registry/keyring/kms/KmsConnectionImplTest.java b/core/src/test/java/google/registry/keyring/kms/KmsConnectionImplTest.java
similarity index 100%
rename from javatests/google/registry/keyring/kms/KmsConnectionImplTest.java
rename to core/src/test/java/google/registry/keyring/kms/KmsConnectionImplTest.java
diff --git a/javatests/google/registry/keyring/kms/KmsKeyringTest.java b/core/src/test/java/google/registry/keyring/kms/KmsKeyringTest.java
similarity index 100%
rename from javatests/google/registry/keyring/kms/KmsKeyringTest.java
rename to core/src/test/java/google/registry/keyring/kms/KmsKeyringTest.java
diff --git a/javatests/google/registry/keyring/kms/KmsTestHelper.java b/core/src/test/java/google/registry/keyring/kms/KmsTestHelper.java
similarity index 100%
rename from javatests/google/registry/keyring/kms/KmsTestHelper.java
rename to core/src/test/java/google/registry/keyring/kms/KmsTestHelper.java
diff --git a/javatests/google/registry/keyring/kms/KmsUpdaterTest.java b/core/src/test/java/google/registry/keyring/kms/KmsUpdaterTest.java
similarity index 100%
rename from javatests/google/registry/keyring/kms/KmsUpdaterTest.java
rename to core/src/test/java/google/registry/keyring/kms/KmsUpdaterTest.java
diff --git a/javatests/google/registry/keyring/kms/pgp-private-keyring-registry.asc b/core/src/test/java/google/registry/keyring/kms/pgp-private-keyring-registry.asc
similarity index 100%
rename from javatests/google/registry/keyring/kms/pgp-private-keyring-registry.asc
rename to core/src/test/java/google/registry/keyring/kms/pgp-private-keyring-registry.asc
diff --git a/javatests/google/registry/keyring/kms/pgp-public-keyring.asc b/core/src/test/java/google/registry/keyring/kms/pgp-public-keyring.asc
similarity index 100%
rename from javatests/google/registry/keyring/kms/pgp-public-keyring.asc
rename to core/src/test/java/google/registry/keyring/kms/pgp-public-keyring.asc
diff --git a/javatests/google/registry/mapreduce/inputs/BUILD b/core/src/test/java/google/registry/mapreduce/inputs/BUILD
similarity index 100%
rename from javatests/google/registry/mapreduce/inputs/BUILD
rename to core/src/test/java/google/registry/mapreduce/inputs/BUILD
diff --git a/javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java b/core/src/test/java/google/registry/mapreduce/inputs/ChildEntityInputTest.java
similarity index 100%
rename from javatests/google/registry/mapreduce/inputs/ChildEntityInputTest.java
rename to core/src/test/java/google/registry/mapreduce/inputs/ChildEntityInputTest.java
diff --git a/javatests/google/registry/mapreduce/inputs/CommitLogManifestInputTest.java b/core/src/test/java/google/registry/mapreduce/inputs/CommitLogManifestInputTest.java
similarity index 100%
rename from javatests/google/registry/mapreduce/inputs/CommitLogManifestInputTest.java
rename to core/src/test/java/google/registry/mapreduce/inputs/CommitLogManifestInputTest.java
diff --git a/javatests/google/registry/mapreduce/inputs/EppResourceInputsTest.java b/core/src/test/java/google/registry/mapreduce/inputs/EppResourceInputsTest.java
similarity index 100%
rename from javatests/google/registry/mapreduce/inputs/EppResourceInputsTest.java
rename to core/src/test/java/google/registry/mapreduce/inputs/EppResourceInputsTest.java
diff --git a/javatests/google/registry/model/BUILD b/core/src/test/java/google/registry/model/BUILD
similarity index 100%
rename from javatests/google/registry/model/BUILD
rename to core/src/test/java/google/registry/model/BUILD
diff --git a/javatests/google/registry/model/CreateAutoTimestampTest.java b/core/src/test/java/google/registry/model/CreateAutoTimestampTest.java
similarity index 100%
rename from javatests/google/registry/model/CreateAutoTimestampTest.java
rename to core/src/test/java/google/registry/model/CreateAutoTimestampTest.java
diff --git a/javatests/google/registry/model/EntityClassesTest.java b/core/src/test/java/google/registry/model/EntityClassesTest.java
similarity index 100%
rename from javatests/google/registry/model/EntityClassesTest.java
rename to core/src/test/java/google/registry/model/EntityClassesTest.java
diff --git a/javatests/google/registry/model/EntityTestCase.java b/core/src/test/java/google/registry/model/EntityTestCase.java
similarity index 100%
rename from javatests/google/registry/model/EntityTestCase.java
rename to core/src/test/java/google/registry/model/EntityTestCase.java
diff --git a/javatests/google/registry/model/EppResourceTest.java b/core/src/test/java/google/registry/model/EppResourceTest.java
similarity index 100%
rename from javatests/google/registry/model/EppResourceTest.java
rename to core/src/test/java/google/registry/model/EppResourceTest.java
diff --git a/javatests/google/registry/model/EppResourceUtilsTest.java b/core/src/test/java/google/registry/model/EppResourceUtilsTest.java
similarity index 100%
rename from javatests/google/registry/model/EppResourceUtilsTest.java
rename to core/src/test/java/google/registry/model/EppResourceUtilsTest.java
diff --git a/javatests/google/registry/model/ImmutableObjectTest.java b/core/src/test/java/google/registry/model/ImmutableObjectTest.java
similarity index 100%
rename from javatests/google/registry/model/ImmutableObjectTest.java
rename to core/src/test/java/google/registry/model/ImmutableObjectTest.java
diff --git a/javatests/google/registry/model/ModelUtilsTest.java b/core/src/test/java/google/registry/model/ModelUtilsTest.java
similarity index 100%
rename from javatests/google/registry/model/ModelUtilsTest.java
rename to core/src/test/java/google/registry/model/ModelUtilsTest.java
diff --git a/javatests/google/registry/model/OteAccountBuilderTest.java b/core/src/test/java/google/registry/model/OteAccountBuilderTest.java
similarity index 100%
rename from javatests/google/registry/model/OteAccountBuilderTest.java
rename to core/src/test/java/google/registry/model/OteAccountBuilderTest.java
diff --git a/javatests/google/registry/model/OteStatsTest.java b/core/src/test/java/google/registry/model/OteStatsTest.java
similarity index 100%
rename from javatests/google/registry/model/OteStatsTest.java
rename to core/src/test/java/google/registry/model/OteStatsTest.java
diff --git a/javatests/google/registry/model/OteStatsTestHelper.java b/core/src/test/java/google/registry/model/OteStatsTestHelper.java
similarity index 100%
rename from javatests/google/registry/model/OteStatsTestHelper.java
rename to core/src/test/java/google/registry/model/OteStatsTestHelper.java
diff --git a/javatests/google/registry/model/ResourceCommandTestCase.java b/core/src/test/java/google/registry/model/ResourceCommandTestCase.java
similarity index 100%
rename from javatests/google/registry/model/ResourceCommandTestCase.java
rename to core/src/test/java/google/registry/model/ResourceCommandTestCase.java
diff --git a/javatests/google/registry/model/SchemaVersionTest.java b/core/src/test/java/google/registry/model/SchemaVersionTest.java
similarity index 100%
rename from javatests/google/registry/model/SchemaVersionTest.java
rename to core/src/test/java/google/registry/model/SchemaVersionTest.java
diff --git a/javatests/google/registry/model/UpdateAutoTimestampTest.java b/core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java
similarity index 100%
rename from javatests/google/registry/model/UpdateAutoTimestampTest.java
rename to core/src/test/java/google/registry/model/UpdateAutoTimestampTest.java
diff --git a/javatests/google/registry/model/billing/BillingEventTest.java b/core/src/test/java/google/registry/model/billing/BillingEventTest.java
similarity index 100%
rename from javatests/google/registry/model/billing/BillingEventTest.java
rename to core/src/test/java/google/registry/model/billing/BillingEventTest.java
diff --git a/javatests/google/registry/model/common/CursorTest.java b/core/src/test/java/google/registry/model/common/CursorTest.java
similarity index 100%
rename from javatests/google/registry/model/common/CursorTest.java
rename to core/src/test/java/google/registry/model/common/CursorTest.java
diff --git a/javatests/google/registry/model/common/GaeUserIdConverterTest.java b/core/src/test/java/google/registry/model/common/GaeUserIdConverterTest.java
similarity index 100%
rename from javatests/google/registry/model/common/GaeUserIdConverterTest.java
rename to core/src/test/java/google/registry/model/common/GaeUserIdConverterTest.java
diff --git a/javatests/google/registry/model/common/TimeOfYearTest.java b/core/src/test/java/google/registry/model/common/TimeOfYearTest.java
similarity index 100%
rename from javatests/google/registry/model/common/TimeOfYearTest.java
rename to core/src/test/java/google/registry/model/common/TimeOfYearTest.java
diff --git a/javatests/google/registry/model/common/TimedTransitionPropertyTest.java b/core/src/test/java/google/registry/model/common/TimedTransitionPropertyTest.java
similarity index 100%
rename from javatests/google/registry/model/common/TimedTransitionPropertyTest.java
rename to core/src/test/java/google/registry/model/common/TimedTransitionPropertyTest.java
diff --git a/javatests/google/registry/model/contact/ContactCommandTest.java b/core/src/test/java/google/registry/model/contact/ContactCommandTest.java
similarity index 100%
rename from javatests/google/registry/model/contact/ContactCommandTest.java
rename to core/src/test/java/google/registry/model/contact/ContactCommandTest.java
diff --git a/javatests/google/registry/model/contact/ContactResourceTest.java b/core/src/test/java/google/registry/model/contact/ContactResourceTest.java
similarity index 100%
rename from javatests/google/registry/model/contact/ContactResourceTest.java
rename to core/src/test/java/google/registry/model/contact/ContactResourceTest.java
diff --git a/javatests/google/registry/model/contact/testdata/contact_check.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_check.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_check.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_check.xml
diff --git a/javatests/google/registry/model/contact/testdata/contact_create.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_create.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_create.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_create.xml
diff --git a/javatests/google/registry/model/contact/testdata/contact_delete.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_delete.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_delete.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_delete.xml
diff --git a/javatests/google/registry/model/contact/testdata/contact_info.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_info.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_info.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_info.xml
diff --git a/javatests/google/registry/model/contact/testdata/contact_transfer_approve.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_approve.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_transfer_approve.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_transfer_approve.xml
diff --git a/javatests/google/registry/model/contact/testdata/contact_transfer_cancel.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_cancel.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_transfer_cancel.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_transfer_cancel.xml
diff --git a/javatests/google/registry/model/contact/testdata/contact_transfer_query.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_query.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_transfer_query.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_transfer_query.xml
diff --git a/javatests/google/registry/model/contact/testdata/contact_transfer_reject.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_reject.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_transfer_reject.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_transfer_reject.xml
diff --git a/javatests/google/registry/model/contact/testdata/contact_transfer_request.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_transfer_request.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_transfer_request.xml
diff --git a/javatests/google/registry/model/contact/testdata/contact_update.xml b/core/src/test/java/google/registry/model/contact/testdata/contact_update.xml
similarity index 100%
rename from javatests/google/registry/model/contact/testdata/contact_update.xml
rename to core/src/test/java/google/registry/model/contact/testdata/contact_update.xml
diff --git a/javatests/google/registry/model/domain/DomainBaseTest.java b/core/src/test/java/google/registry/model/domain/DomainBaseTest.java
similarity index 100%
rename from javatests/google/registry/model/domain/DomainBaseTest.java
rename to core/src/test/java/google/registry/model/domain/DomainBaseTest.java
diff --git a/javatests/google/registry/model/domain/DomainCommandTest.java b/core/src/test/java/google/registry/model/domain/DomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/model/domain/DomainCommandTest.java
rename to core/src/test/java/google/registry/model/domain/DomainCommandTest.java
diff --git a/javatests/google/registry/model/domain/GracePeriodTest.java b/core/src/test/java/google/registry/model/domain/GracePeriodTest.java
similarity index 100%
rename from javatests/google/registry/model/domain/GracePeriodTest.java
rename to core/src/test/java/google/registry/model/domain/GracePeriodTest.java
diff --git a/javatests/google/registry/model/domain/testdata/domain_check.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_check.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_check.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_check.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_check_avail.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_check_avail.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_check_avail.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_check_avail.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_check_claims.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_check_claims.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_check_claims.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_check_claims.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_check_fee.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_check_fee.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_check_fee.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_check_fee.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_create.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_create.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_create.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_create.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_create_empty.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_create_empty.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_create_empty.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_create_empty.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_create_fee.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_create_fee.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_create_fee.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_create_fee.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_create_missing_non_registrant_contacts.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_create_missing_non_registrant_contacts.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_create_missing_non_registrant_contacts.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_create_missing_non_registrant_contacts.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_create_sunrise_code.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_code.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_create_sunrise_code.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_code.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_code_with_mark.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_encoded_signed_mark.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_create_sunrise_mark.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_mark.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_create_sunrise_mark.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_mark.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_create_sunrise_signed_mark.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_delete.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_delete.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_delete.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_delete.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_info.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_info.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_info.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_info.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_info_fee.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_info_fee.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_info_fee.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_info_fee.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_info_sunrise.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_info_sunrise.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_info_sunrise.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_info_sunrise.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_renew.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_renew.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_renew.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_renew.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_renew_fee.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_renew_fee.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_renew_fee.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_renew_fee.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_transfer_approve.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_approve.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_transfer_approve.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_transfer_approve.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_transfer_cancel.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_cancel.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_transfer_cancel.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_transfer_cancel.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_transfer_query.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_query.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_transfer_query.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_transfer_query.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_transfer_reject.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_reject.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_transfer_reject.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_transfer_reject.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_transfer_request.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_transfer_request.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_transfer_request.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_transfer_request_fee.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_transfer_request_fee.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_transfer_request_fee.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_transfer_request_fee.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_update.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_update.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_update.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_update.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_update_empty.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_update_empty.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_update_empty.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_update_empty.xml
diff --git a/javatests/google/registry/model/domain/testdata/domain_update_fee.xml b/core/src/test/java/google/registry/model/domain/testdata/domain_update_fee.xml
similarity index 100%
rename from javatests/google/registry/model/domain/testdata/domain_update_fee.xml
rename to core/src/test/java/google/registry/model/domain/testdata/domain_update_fee.xml
diff --git a/javatests/google/registry/model/domain/token/AllocationTokenTest.java b/core/src/test/java/google/registry/model/domain/token/AllocationTokenTest.java
similarity index 100%
rename from javatests/google/registry/model/domain/token/AllocationTokenTest.java
rename to core/src/test/java/google/registry/model/domain/token/AllocationTokenTest.java
diff --git a/javatests/google/registry/model/eppcommon/EppXmlTransformerTest.java b/core/src/test/java/google/registry/model/eppcommon/EppXmlTransformerTest.java
similarity index 100%
rename from javatests/google/registry/model/eppcommon/EppXmlTransformerTest.java
rename to core/src/test/java/google/registry/model/eppcommon/EppXmlTransformerTest.java
diff --git a/javatests/google/registry/model/eppcommon/testdata/contact_info.xml b/core/src/test/java/google/registry/model/eppcommon/testdata/contact_info.xml
similarity index 100%
rename from javatests/google/registry/model/eppcommon/testdata/contact_info.xml
rename to core/src/test/java/google/registry/model/eppcommon/testdata/contact_info.xml
diff --git a/javatests/google/registry/model/eppinput/EppInputTest.java b/core/src/test/java/google/registry/model/eppinput/EppInputTest.java
similarity index 100%
rename from javatests/google/registry/model/eppinput/EppInputTest.java
rename to core/src/test/java/google/registry/model/eppinput/EppInputTest.java
diff --git a/javatests/google/registry/model/eppinput/testdata/login_valid.xml b/core/src/test/java/google/registry/model/eppinput/testdata/login_valid.xml
similarity index 100%
rename from javatests/google/registry/model/eppinput/testdata/login_valid.xml
rename to core/src/test/java/google/registry/model/eppinput/testdata/login_valid.xml
diff --git a/javatests/google/registry/model/eppinput/testdata/login_wrong_case.xml b/core/src/test/java/google/registry/model/eppinput/testdata/login_wrong_case.xml
similarity index 100%
rename from javatests/google/registry/model/eppinput/testdata/login_wrong_case.xml
rename to core/src/test/java/google/registry/model/eppinput/testdata/login_wrong_case.xml
diff --git a/javatests/google/registry/model/eppoutput/ResultTest.java b/core/src/test/java/google/registry/model/eppoutput/ResultTest.java
similarity index 100%
rename from javatests/google/registry/model/eppoutput/ResultTest.java
rename to core/src/test/java/google/registry/model/eppoutput/ResultTest.java
diff --git a/javatests/google/registry/model/host/HostCommandTest.java b/core/src/test/java/google/registry/model/host/HostCommandTest.java
similarity index 100%
rename from javatests/google/registry/model/host/HostCommandTest.java
rename to core/src/test/java/google/registry/model/host/HostCommandTest.java
diff --git a/javatests/google/registry/model/host/HostResourceTest.java b/core/src/test/java/google/registry/model/host/HostResourceTest.java
similarity index 100%
rename from javatests/google/registry/model/host/HostResourceTest.java
rename to core/src/test/java/google/registry/model/host/HostResourceTest.java
diff --git a/javatests/google/registry/model/host/testdata/host_check.xml b/core/src/test/java/google/registry/model/host/testdata/host_check.xml
similarity index 100%
rename from javatests/google/registry/model/host/testdata/host_check.xml
rename to core/src/test/java/google/registry/model/host/testdata/host_check.xml
diff --git a/javatests/google/registry/model/host/testdata/host_create.xml b/core/src/test/java/google/registry/model/host/testdata/host_create.xml
similarity index 100%
rename from javatests/google/registry/model/host/testdata/host_create.xml
rename to core/src/test/java/google/registry/model/host/testdata/host_create.xml
diff --git a/javatests/google/registry/model/host/testdata/host_delete.xml b/core/src/test/java/google/registry/model/host/testdata/host_delete.xml
similarity index 100%
rename from javatests/google/registry/model/host/testdata/host_delete.xml
rename to core/src/test/java/google/registry/model/host/testdata/host_delete.xml
diff --git a/javatests/google/registry/model/host/testdata/host_info.xml b/core/src/test/java/google/registry/model/host/testdata/host_info.xml
similarity index 100%
rename from javatests/google/registry/model/host/testdata/host_info.xml
rename to core/src/test/java/google/registry/model/host/testdata/host_info.xml
diff --git a/javatests/google/registry/model/host/testdata/host_update.xml b/core/src/test/java/google/registry/model/host/testdata/host_update.xml
similarity index 100%
rename from javatests/google/registry/model/host/testdata/host_update.xml
rename to core/src/test/java/google/registry/model/host/testdata/host_update.xml
diff --git a/javatests/google/registry/model/index/EppResourceIndexTest.java b/core/src/test/java/google/registry/model/index/EppResourceIndexTest.java
similarity index 100%
rename from javatests/google/registry/model/index/EppResourceIndexTest.java
rename to core/src/test/java/google/registry/model/index/EppResourceIndexTest.java
diff --git a/javatests/google/registry/model/index/ForeignKeyIndexTest.java b/core/src/test/java/google/registry/model/index/ForeignKeyIndexTest.java
similarity index 100%
rename from javatests/google/registry/model/index/ForeignKeyIndexTest.java
rename to core/src/test/java/google/registry/model/index/ForeignKeyIndexTest.java
diff --git a/javatests/google/registry/model/mark/MarkContactTest.java b/core/src/test/java/google/registry/model/mark/MarkContactTest.java
similarity index 100%
rename from javatests/google/registry/model/mark/MarkContactTest.java
rename to core/src/test/java/google/registry/model/mark/MarkContactTest.java
diff --git a/javatests/google/registry/model/mark/MarkHolderTest.java b/core/src/test/java/google/registry/model/mark/MarkHolderTest.java
similarity index 100%
rename from javatests/google/registry/model/mark/MarkHolderTest.java
rename to core/src/test/java/google/registry/model/mark/MarkHolderTest.java
diff --git a/javatests/google/registry/model/mark/MarkProtectionTest.java b/core/src/test/java/google/registry/model/mark/MarkProtectionTest.java
similarity index 100%
rename from javatests/google/registry/model/mark/MarkProtectionTest.java
rename to core/src/test/java/google/registry/model/mark/MarkProtectionTest.java
diff --git a/javatests/google/registry/model/ofy/CommitLogBucketTest.java b/core/src/test/java/google/registry/model/ofy/CommitLogBucketTest.java
similarity index 100%
rename from javatests/google/registry/model/ofy/CommitLogBucketTest.java
rename to core/src/test/java/google/registry/model/ofy/CommitLogBucketTest.java
diff --git a/javatests/google/registry/model/ofy/CommitLogCheckpointTest.java b/core/src/test/java/google/registry/model/ofy/CommitLogCheckpointTest.java
similarity index 100%
rename from javatests/google/registry/model/ofy/CommitLogCheckpointTest.java
rename to core/src/test/java/google/registry/model/ofy/CommitLogCheckpointTest.java
diff --git a/javatests/google/registry/model/ofy/CommitLogMutationTest.java b/core/src/test/java/google/registry/model/ofy/CommitLogMutationTest.java
similarity index 100%
rename from javatests/google/registry/model/ofy/CommitLogMutationTest.java
rename to core/src/test/java/google/registry/model/ofy/CommitLogMutationTest.java
diff --git a/javatests/google/registry/model/ofy/ObjectifyServiceTest.java b/core/src/test/java/google/registry/model/ofy/ObjectifyServiceTest.java
similarity index 100%
rename from javatests/google/registry/model/ofy/ObjectifyServiceTest.java
rename to core/src/test/java/google/registry/model/ofy/ObjectifyServiceTest.java
diff --git a/javatests/google/registry/model/ofy/OfyCommitLogTest.java b/core/src/test/java/google/registry/model/ofy/OfyCommitLogTest.java
similarity index 100%
rename from javatests/google/registry/model/ofy/OfyCommitLogTest.java
rename to core/src/test/java/google/registry/model/ofy/OfyCommitLogTest.java
diff --git a/javatests/google/registry/model/ofy/OfyFilterTest.java b/core/src/test/java/google/registry/model/ofy/OfyFilterTest.java
similarity index 100%
rename from javatests/google/registry/model/ofy/OfyFilterTest.java
rename to core/src/test/java/google/registry/model/ofy/OfyFilterTest.java
diff --git a/javatests/google/registry/model/ofy/OfyTest.java b/core/src/test/java/google/registry/model/ofy/OfyTest.java
similarity index 100%
rename from javatests/google/registry/model/ofy/OfyTest.java
rename to core/src/test/java/google/registry/model/ofy/OfyTest.java
diff --git a/javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java b/core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java
similarity index 100%
rename from javatests/google/registry/model/poll/PollMessageExternalKeyConverterTest.java
rename to core/src/test/java/google/registry/model/poll/PollMessageExternalKeyConverterTest.java
diff --git a/javatests/google/registry/model/poll/PollMessageTest.java b/core/src/test/java/google/registry/model/poll/PollMessageTest.java
similarity index 100%
rename from javatests/google/registry/model/poll/PollMessageTest.java
rename to core/src/test/java/google/registry/model/poll/PollMessageTest.java
diff --git a/javatests/google/registry/model/rde/RdeNamingUtilsTest.java b/core/src/test/java/google/registry/model/rde/RdeNamingUtilsTest.java
similarity index 100%
rename from javatests/google/registry/model/rde/RdeNamingUtilsTest.java
rename to core/src/test/java/google/registry/model/rde/RdeNamingUtilsTest.java
diff --git a/javatests/google/registry/model/rde/RdeRevisionTest.java b/core/src/test/java/google/registry/model/rde/RdeRevisionTest.java
similarity index 100%
rename from javatests/google/registry/model/rde/RdeRevisionTest.java
rename to core/src/test/java/google/registry/model/rde/RdeRevisionTest.java
diff --git a/javatests/google/registry/model/registrar/RegistrarTest.java b/core/src/test/java/google/registry/model/registrar/RegistrarTest.java
similarity index 100%
rename from javatests/google/registry/model/registrar/RegistrarTest.java
rename to core/src/test/java/google/registry/model/registrar/RegistrarTest.java
diff --git a/javatests/google/registry/model/registry/RegistriesTest.java b/core/src/test/java/google/registry/model/registry/RegistriesTest.java
similarity index 100%
rename from javatests/google/registry/model/registry/RegistriesTest.java
rename to core/src/test/java/google/registry/model/registry/RegistriesTest.java
diff --git a/javatests/google/registry/model/registry/RegistryTest.java b/core/src/test/java/google/registry/model/registry/RegistryTest.java
similarity index 100%
rename from javatests/google/registry/model/registry/RegistryTest.java
rename to core/src/test/java/google/registry/model/registry/RegistryTest.java
diff --git a/javatests/google/registry/model/registry/label/GenrulePremiumListTest.java b/core/src/test/java/google/registry/model/registry/label/GenrulePremiumListTest.java
similarity index 100%
rename from javatests/google/registry/model/registry/label/GenrulePremiumListTest.java
rename to core/src/test/java/google/registry/model/registry/label/GenrulePremiumListTest.java
diff --git a/javatests/google/registry/model/registry/label/GenruleReservedListTest.java b/core/src/test/java/google/registry/model/registry/label/GenruleReservedListTest.java
similarity index 100%
rename from javatests/google/registry/model/registry/label/GenruleReservedListTest.java
rename to core/src/test/java/google/registry/model/registry/label/GenruleReservedListTest.java
diff --git a/javatests/google/registry/model/registry/label/PremiumListTest.java b/core/src/test/java/google/registry/model/registry/label/PremiumListTest.java
similarity index 100%
rename from javatests/google/registry/model/registry/label/PremiumListTest.java
rename to core/src/test/java/google/registry/model/registry/label/PremiumListTest.java
diff --git a/javatests/google/registry/model/registry/label/PremiumListUtilsTest.java b/core/src/test/java/google/registry/model/registry/label/PremiumListUtilsTest.java
similarity index 100%
rename from javatests/google/registry/model/registry/label/PremiumListUtilsTest.java
rename to core/src/test/java/google/registry/model/registry/label/PremiumListUtilsTest.java
diff --git a/javatests/google/registry/model/registry/label/ReservedListTest.java b/core/src/test/java/google/registry/model/registry/label/ReservedListTest.java
similarity index 100%
rename from javatests/google/registry/model/registry/label/ReservedListTest.java
rename to core/src/test/java/google/registry/model/registry/label/ReservedListTest.java
diff --git a/javatests/google/registry/model/reporting/HistoryEntryTest.java b/core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java
similarity index 100%
rename from javatests/google/registry/model/reporting/HistoryEntryTest.java
rename to core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java
diff --git a/javatests/google/registry/model/server/KmsSecretRevisionTest.java b/core/src/test/java/google/registry/model/server/KmsSecretRevisionTest.java
similarity index 100%
rename from javatests/google/registry/model/server/KmsSecretRevisionTest.java
rename to core/src/test/java/google/registry/model/server/KmsSecretRevisionTest.java
diff --git a/javatests/google/registry/model/server/KmsSecretTest.java b/core/src/test/java/google/registry/model/server/KmsSecretTest.java
similarity index 100%
rename from javatests/google/registry/model/server/KmsSecretTest.java
rename to core/src/test/java/google/registry/model/server/KmsSecretTest.java
diff --git a/javatests/google/registry/model/server/LockTest.java b/core/src/test/java/google/registry/model/server/LockTest.java
similarity index 100%
rename from javatests/google/registry/model/server/LockTest.java
rename to core/src/test/java/google/registry/model/server/LockTest.java
diff --git a/javatests/google/registry/model/server/ServerSecretTest.java b/core/src/test/java/google/registry/model/server/ServerSecretTest.java
similarity index 100%
rename from javatests/google/registry/model/server/ServerSecretTest.java
rename to core/src/test/java/google/registry/model/server/ServerSecretTest.java
diff --git a/javatests/google/registry/model/smd/IssuerInfoTest.java b/core/src/test/java/google/registry/model/smd/IssuerInfoTest.java
similarity index 100%
rename from javatests/google/registry/model/smd/IssuerInfoTest.java
rename to core/src/test/java/google/registry/model/smd/IssuerInfoTest.java
diff --git a/javatests/google/registry/model/smd/SignedMarkRevocationListTest.java b/core/src/test/java/google/registry/model/smd/SignedMarkRevocationListTest.java
similarity index 100%
rename from javatests/google/registry/model/smd/SignedMarkRevocationListTest.java
rename to core/src/test/java/google/registry/model/smd/SignedMarkRevocationListTest.java
diff --git a/javatests/google/registry/model/testdata/domain_create_anchor_tenant_fee_standard.xml b/core/src/test/java/google/registry/model/testdata/domain_create_anchor_tenant_fee_standard.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_create_anchor_tenant_fee_standard.xml
rename to core/src/test/java/google/registry/model/testdata/domain_create_anchor_tenant_fee_standard.xml
diff --git a/javatests/google/registry/model/testdata/domain_create_claim_notice.xml b/core/src/test/java/google/registry/model/testdata/domain_create_claim_notice.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_create_claim_notice.xml
rename to core/src/test/java/google/registry/model/testdata/domain_create_claim_notice.xml
diff --git a/javatests/google/registry/model/testdata/domain_create_dsdata.xml b/core/src/test/java/google/registry/model/testdata/domain_create_dsdata.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_create_dsdata.xml
rename to core/src/test/java/google/registry/model/testdata/domain_create_dsdata.xml
diff --git a/javatests/google/registry/model/testdata/domain_create_idn.xml b/core/src/test/java/google/registry/model/testdata/domain_create_idn.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_create_idn.xml
rename to core/src/test/java/google/registry/model/testdata/domain_create_idn.xml
diff --git a/javatests/google/registry/model/testdata/domain_create_sunrise.xml b/core/src/test/java/google/registry/model/testdata/domain_create_sunrise.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_create_sunrise.xml
rename to core/src/test/java/google/registry/model/testdata/domain_create_sunrise.xml
diff --git a/javatests/google/registry/model/testdata/domain_delete.xml b/core/src/test/java/google/registry/model/testdata/domain_delete.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_delete.xml
rename to core/src/test/java/google/registry/model/testdata/domain_delete.xml
diff --git a/javatests/google/registry/model/testdata/domain_restore.xml b/core/src/test/java/google/registry/model/testdata/domain_restore.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_restore.xml
rename to core/src/test/java/google/registry/model/testdata/domain_restore.xml
diff --git a/javatests/google/registry/model/testdata/domain_transfer_approve.xml b/core/src/test/java/google/registry/model/testdata/domain_transfer_approve.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_transfer_approve.xml
rename to core/src/test/java/google/registry/model/testdata/domain_transfer_approve.xml
diff --git a/javatests/google/registry/model/testdata/domain_transfer_cancel.xml b/core/src/test/java/google/registry/model/testdata/domain_transfer_cancel.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_transfer_cancel.xml
rename to core/src/test/java/google/registry/model/testdata/domain_transfer_cancel.xml
diff --git a/javatests/google/registry/model/testdata/domain_transfer_reject.xml b/core/src/test/java/google/registry/model/testdata/domain_transfer_reject.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_transfer_reject.xml
rename to core/src/test/java/google/registry/model/testdata/domain_transfer_reject.xml
diff --git a/javatests/google/registry/model/testdata/domain_transfer_request.xml b/core/src/test/java/google/registry/model/testdata/domain_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_transfer_request.xml
rename to core/src/test/java/google/registry/model/testdata/domain_transfer_request.xml
diff --git a/javatests/google/registry/model/testdata/domain_update_with_secdns.xml b/core/src/test/java/google/registry/model/testdata/domain_update_with_secdns.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/domain_update_with_secdns.xml
rename to core/src/test/java/google/registry/model/testdata/domain_update_with_secdns.xml
diff --git a/javatests/google/registry/model/testdata/host_create_complete.xml b/core/src/test/java/google/registry/model/testdata/host_create_complete.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/host_create_complete.xml
rename to core/src/test/java/google/registry/model/testdata/host_create_complete.xml
diff --git a/javatests/google/registry/model/testdata/host_delete.xml b/core/src/test/java/google/registry/model/testdata/host_delete.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/host_delete.xml
rename to core/src/test/java/google/registry/model/testdata/host_delete.xml
diff --git a/javatests/google/registry/model/testdata/host_update.xml b/core/src/test/java/google/registry/model/testdata/host_update.xml
similarity index 100%
rename from javatests/google/registry/model/testdata/host_update.xml
rename to core/src/test/java/google/registry/model/testdata/host_update.xml
diff --git a/javatests/google/registry/model/testdata/schema.txt b/core/src/test/java/google/registry/model/testdata/schema.txt
similarity index 100%
rename from javatests/google/registry/model/testdata/schema.txt
rename to core/src/test/java/google/registry/model/testdata/schema.txt
diff --git a/javatests/google/registry/model/tmch/ClaimsListShardTest.java b/core/src/test/java/google/registry/model/tmch/ClaimsListShardTest.java
similarity index 100%
rename from javatests/google/registry/model/tmch/ClaimsListShardTest.java
rename to core/src/test/java/google/registry/model/tmch/ClaimsListShardTest.java
diff --git a/javatests/google/registry/model/tmch/TmchCrlTest.java b/core/src/test/java/google/registry/model/tmch/TmchCrlTest.java
similarity index 100%
rename from javatests/google/registry/model/tmch/TmchCrlTest.java
rename to core/src/test/java/google/registry/model/tmch/TmchCrlTest.java
diff --git a/javatests/google/registry/model/transfer/TransferDataTest.java b/core/src/test/java/google/registry/model/transfer/TransferDataTest.java
similarity index 100%
rename from javatests/google/registry/model/transfer/TransferDataTest.java
rename to core/src/test/java/google/registry/model/transfer/TransferDataTest.java
diff --git a/javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java b/core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java
similarity index 100%
rename from javatests/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java
rename to core/src/test/java/google/registry/model/translators/CommitLogRevisionsTranslatorFactoryTest.java
diff --git a/javatests/google/registry/model/translators/StatusValueAdapterTest.java b/core/src/test/java/google/registry/model/translators/StatusValueAdapterTest.java
similarity index 100%
rename from javatests/google/registry/model/translators/StatusValueAdapterTest.java
rename to core/src/test/java/google/registry/model/translators/StatusValueAdapterTest.java
diff --git a/javatests/google/registry/model/translators/testdata/host_update.xml b/core/src/test/java/google/registry/model/translators/testdata/host_update.xml
similarity index 100%
rename from javatests/google/registry/model/translators/testdata/host_update.xml
rename to core/src/test/java/google/registry/model/translators/testdata/host_update.xml
diff --git a/javatests/google/registry/module/backend/BUILD b/core/src/test/java/google/registry/module/backend/BUILD
similarity index 100%
rename from javatests/google/registry/module/backend/BUILD
rename to core/src/test/java/google/registry/module/backend/BUILD
diff --git a/javatests/google/registry/module/backend/BackendRequestComponentTest.java b/core/src/test/java/google/registry/module/backend/BackendRequestComponentTest.java
similarity index 100%
rename from javatests/google/registry/module/backend/BackendRequestComponentTest.java
rename to core/src/test/java/google/registry/module/backend/BackendRequestComponentTest.java
diff --git a/javatests/google/registry/module/backend/BackendServletTest.java b/core/src/test/java/google/registry/module/backend/BackendServletTest.java
similarity index 100%
rename from javatests/google/registry/module/backend/BackendServletTest.java
rename to core/src/test/java/google/registry/module/backend/BackendServletTest.java
diff --git a/javatests/google/registry/module/backend/testdata/backend_routing.txt b/core/src/test/java/google/registry/module/backend/testdata/backend_routing.txt
similarity index 100%
rename from javatests/google/registry/module/backend/testdata/backend_routing.txt
rename to core/src/test/java/google/registry/module/backend/testdata/backend_routing.txt
diff --git a/javatests/google/registry/module/frontend/BUILD b/core/src/test/java/google/registry/module/frontend/BUILD
similarity index 100%
rename from javatests/google/registry/module/frontend/BUILD
rename to core/src/test/java/google/registry/module/frontend/BUILD
diff --git a/javatests/google/registry/module/frontend/FrontendRequestComponentTest.java b/core/src/test/java/google/registry/module/frontend/FrontendRequestComponentTest.java
similarity index 100%
rename from javatests/google/registry/module/frontend/FrontendRequestComponentTest.java
rename to core/src/test/java/google/registry/module/frontend/FrontendRequestComponentTest.java
diff --git a/javatests/google/registry/module/frontend/FrontendServletTest.java b/core/src/test/java/google/registry/module/frontend/FrontendServletTest.java
similarity index 100%
rename from javatests/google/registry/module/frontend/FrontendServletTest.java
rename to core/src/test/java/google/registry/module/frontend/FrontendServletTest.java
diff --git a/javatests/google/registry/module/frontend/testdata/frontend_routing.txt b/core/src/test/java/google/registry/module/frontend/testdata/frontend_routing.txt
similarity index 100%
rename from javatests/google/registry/module/frontend/testdata/frontend_routing.txt
rename to core/src/test/java/google/registry/module/frontend/testdata/frontend_routing.txt
diff --git a/javatests/google/registry/module/pubapi/BUILD b/core/src/test/java/google/registry/module/pubapi/BUILD
similarity index 100%
rename from javatests/google/registry/module/pubapi/BUILD
rename to core/src/test/java/google/registry/module/pubapi/BUILD
diff --git a/javatests/google/registry/module/pubapi/PubApiRequestComponentTest.java b/core/src/test/java/google/registry/module/pubapi/PubApiRequestComponentTest.java
similarity index 100%
rename from javatests/google/registry/module/pubapi/PubApiRequestComponentTest.java
rename to core/src/test/java/google/registry/module/pubapi/PubApiRequestComponentTest.java
diff --git a/javatests/google/registry/module/pubapi/PubApiServletTest.java b/core/src/test/java/google/registry/module/pubapi/PubApiServletTest.java
similarity index 100%
rename from javatests/google/registry/module/pubapi/PubApiServletTest.java
rename to core/src/test/java/google/registry/module/pubapi/PubApiServletTest.java
diff --git a/javatests/google/registry/module/pubapi/testdata/pubapi_routing.txt b/core/src/test/java/google/registry/module/pubapi/testdata/pubapi_routing.txt
similarity index 100%
rename from javatests/google/registry/module/pubapi/testdata/pubapi_routing.txt
rename to core/src/test/java/google/registry/module/pubapi/testdata/pubapi_routing.txt
diff --git a/javatests/google/registry/module/tools/BUILD b/core/src/test/java/google/registry/module/tools/BUILD
similarity index 100%
rename from javatests/google/registry/module/tools/BUILD
rename to core/src/test/java/google/registry/module/tools/BUILD
diff --git a/javatests/google/registry/module/tools/ToolsRequestComponentTest.java b/core/src/test/java/google/registry/module/tools/ToolsRequestComponentTest.java
similarity index 100%
rename from javatests/google/registry/module/tools/ToolsRequestComponentTest.java
rename to core/src/test/java/google/registry/module/tools/ToolsRequestComponentTest.java
diff --git a/javatests/google/registry/module/tools/ToolsServletTest.java b/core/src/test/java/google/registry/module/tools/ToolsServletTest.java
similarity index 100%
rename from javatests/google/registry/module/tools/ToolsServletTest.java
rename to core/src/test/java/google/registry/module/tools/ToolsServletTest.java
diff --git a/javatests/google/registry/module/tools/testdata/tools_routing.txt b/core/src/test/java/google/registry/module/tools/testdata/tools_routing.txt
similarity index 100%
rename from javatests/google/registry/module/tools/testdata/tools_routing.txt
rename to core/src/test/java/google/registry/module/tools/testdata/tools_routing.txt
diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/core/src/test/java/google/registry/monitoring/whitebox/BUILD
similarity index 100%
rename from javatests/google/registry/monitoring/whitebox/BUILD
rename to core/src/test/java/google/registry/monitoring/whitebox/BUILD
diff --git a/javatests/google/registry/monitoring/whitebox/CheckApiMetricTest.java b/core/src/test/java/google/registry/monitoring/whitebox/CheckApiMetricTest.java
similarity index 100%
rename from javatests/google/registry/monitoring/whitebox/CheckApiMetricTest.java
rename to core/src/test/java/google/registry/monitoring/whitebox/CheckApiMetricTest.java
diff --git a/javatests/google/registry/monitoring/whitebox/EppMetricTest.java b/core/src/test/java/google/registry/monitoring/whitebox/EppMetricTest.java
similarity index 100%
rename from javatests/google/registry/monitoring/whitebox/EppMetricTest.java
rename to core/src/test/java/google/registry/monitoring/whitebox/EppMetricTest.java
diff --git a/javatests/google/registry/pricing/BUILD b/core/src/test/java/google/registry/pricing/BUILD
similarity index 100%
rename from javatests/google/registry/pricing/BUILD
rename to core/src/test/java/google/registry/pricing/BUILD
diff --git a/javatests/google/registry/pricing/PricingEngineProxyTest.java b/core/src/test/java/google/registry/pricing/PricingEngineProxyTest.java
similarity index 100%
rename from javatests/google/registry/pricing/PricingEngineProxyTest.java
rename to core/src/test/java/google/registry/pricing/PricingEngineProxyTest.java
diff --git a/javatests/google/registry/rdap/AbstractJsonableObjectTest.java b/core/src/test/java/google/registry/rdap/AbstractJsonableObjectTest.java
similarity index 100%
rename from javatests/google/registry/rdap/AbstractJsonableObjectTest.java
rename to core/src/test/java/google/registry/rdap/AbstractJsonableObjectTest.java
diff --git a/javatests/google/registry/rdap/BUILD b/core/src/test/java/google/registry/rdap/BUILD
similarity index 100%
rename from javatests/google/registry/rdap/BUILD
rename to core/src/test/java/google/registry/rdap/BUILD
diff --git a/javatests/google/registry/rdap/RdapActionBaseTest.java b/core/src/test/java/google/registry/rdap/RdapActionBaseTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapActionBaseTest.java
rename to core/src/test/java/google/registry/rdap/RdapActionBaseTest.java
diff --git a/javatests/google/registry/rdap/RdapActionBaseTestCase.java b/core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapActionBaseTestCase.java
rename to core/src/test/java/google/registry/rdap/RdapActionBaseTestCase.java
diff --git a/javatests/google/registry/rdap/RdapDataStructuresTest.java b/core/src/test/java/google/registry/rdap/RdapDataStructuresTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapDataStructuresTest.java
rename to core/src/test/java/google/registry/rdap/RdapDataStructuresTest.java
diff --git a/javatests/google/registry/rdap/RdapDomainActionTest.java b/core/src/test/java/google/registry/rdap/RdapDomainActionTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapDomainActionTest.java
rename to core/src/test/java/google/registry/rdap/RdapDomainActionTest.java
diff --git a/javatests/google/registry/rdap/RdapDomainSearchActionTest.java b/core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapDomainSearchActionTest.java
rename to core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java
diff --git a/javatests/google/registry/rdap/RdapEntityActionTest.java b/core/src/test/java/google/registry/rdap/RdapEntityActionTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapEntityActionTest.java
rename to core/src/test/java/google/registry/rdap/RdapEntityActionTest.java
diff --git a/javatests/google/registry/rdap/RdapEntitySearchActionTest.java b/core/src/test/java/google/registry/rdap/RdapEntitySearchActionTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapEntitySearchActionTest.java
rename to core/src/test/java/google/registry/rdap/RdapEntitySearchActionTest.java
diff --git a/javatests/google/registry/rdap/RdapHelpActionTest.java b/core/src/test/java/google/registry/rdap/RdapHelpActionTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapHelpActionTest.java
rename to core/src/test/java/google/registry/rdap/RdapHelpActionTest.java
diff --git a/javatests/google/registry/rdap/RdapJsonFormatterTest.java b/core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapJsonFormatterTest.java
rename to core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java
diff --git a/javatests/google/registry/rdap/RdapMetricsTest.java b/core/src/test/java/google/registry/rdap/RdapMetricsTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapMetricsTest.java
rename to core/src/test/java/google/registry/rdap/RdapMetricsTest.java
diff --git a/javatests/google/registry/rdap/RdapNameserverActionTest.java b/core/src/test/java/google/registry/rdap/RdapNameserverActionTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapNameserverActionTest.java
rename to core/src/test/java/google/registry/rdap/RdapNameserverActionTest.java
diff --git a/javatests/google/registry/rdap/RdapNameserverSearchActionTest.java b/core/src/test/java/google/registry/rdap/RdapNameserverSearchActionTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapNameserverSearchActionTest.java
rename to core/src/test/java/google/registry/rdap/RdapNameserverSearchActionTest.java
diff --git a/javatests/google/registry/rdap/RdapSearchActionTestCase.java b/core/src/test/java/google/registry/rdap/RdapSearchActionTestCase.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapSearchActionTestCase.java
rename to core/src/test/java/google/registry/rdap/RdapSearchActionTestCase.java
diff --git a/javatests/google/registry/rdap/RdapSearchPatternTest.java b/core/src/test/java/google/registry/rdap/RdapSearchPatternTest.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapSearchPatternTest.java
rename to core/src/test/java/google/registry/rdap/RdapSearchPatternTest.java
diff --git a/javatests/google/registry/rdap/RdapTestHelper.java b/core/src/test/java/google/registry/rdap/RdapTestHelper.java
similarity index 100%
rename from javatests/google/registry/rdap/RdapTestHelper.java
rename to core/src/test/java/google/registry/rdap/RdapTestHelper.java
diff --git a/javatests/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java b/core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java
similarity index 100%
rename from javatests/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java
rename to core/src/test/java/google/registry/rdap/UpdateRegistrarRdapBaseUrlsActionTest.java
diff --git a/javatests/google/registry/rdap/testdata/rdap_associated_contact.json b/core/src/test/java/google/registry/rdap/testdata/rdap_associated_contact.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_associated_contact.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_associated_contact.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_associated_contact_no_personal_data.json b/core/src/test/java/google/registry/rdap/testdata/rdap_associated_contact_no_personal_data.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_associated_contact_no_personal_data.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_associated_contact_no_personal_data.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_contact.json b/core/src/test/java/google/registry/rdap/testdata/rdap_contact.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_contact.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_contact.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_contact_deleted.json b/core/src/test/java/google/registry/rdap/testdata/rdap_contact_deleted.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_contact_deleted.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_contact_deleted.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_contact_no_personal_data_with_remark.json b/core/src/test/java/google/registry/rdap/testdata/rdap_contact_no_personal_data_with_remark.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_contact_no_personal_data_with_remark.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_contact_no_personal_data_with_remark.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domain.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domain.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domain.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_cat2.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domain_cat2.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domain_cat2.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domain_cat2.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_deleted.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domain_deleted.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domain_deleted.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domain_deleted.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domain_no_contacts_with_remark.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_unicode.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domain_unicode.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domain_unicode.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domain_unicode.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domain_unicode_no_contacts_with_remark.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domains_four_truncated.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_truncated.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domains_four_truncated.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_truncated.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domains_four_with_one_unicode_truncated.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_domains_two.json b/core/src/test/java/google/registry/rdap/testdata/rdap_domains_two.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_domains_two.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_domains_two.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_error.json b/core/src/test/java/google/registry/rdap/testdata/rdap_error.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_error.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_error.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_help_index.json b/core/src/test/java/google/registry/rdap/testdata/rdap_help_index.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_help_index.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_help_index.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_help_tos.json b/core/src/test/java/google/registry/rdap/testdata/rdap_help_tos.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_help_tos.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_help_tos.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_host.json b/core/src/test/java/google/registry/rdap/testdata/rdap_host.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_host.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_host.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_host_external.json b/core/src/test/java/google/registry/rdap/testdata/rdap_host_external.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_host_external.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_host_external.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_host_linked.json b/core/src/test/java/google/registry/rdap/testdata/rdap_host_linked.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_host_linked.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_host_linked.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_host_unicode.json b/core/src/test/java/google/registry/rdap/testdata/rdap_host_unicode.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_host_unicode.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_host_unicode.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json b/core/src/test/java/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_incomplete_domain_result_set.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_incomplete_domains.json b/core/src/test/java/google/registry/rdap/testdata/rdap_incomplete_domains.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_incomplete_domains.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_incomplete_domains.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_multiple_contacts.json b/core/src/test/java/google/registry/rdap/testdata/rdap_multiple_contacts.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_multiple_contacts.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_multiple_contacts.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_multiple_contacts2.json b/core/src/test/java/google/registry/rdap/testdata/rdap_multiple_contacts2.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_multiple_contacts2.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_multiple_contacts2.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json b/core/src/test/java/google/registry/rdap/testdata/rdap_multiple_hosts.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_multiple_hosts.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_multiple_hosts.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_nontruncated_contacts.json b/core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_contacts.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_nontruncated_contacts.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_contacts.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_nontruncated_domains.json b/core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_domains.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_nontruncated_domains.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_domains.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json b/core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_hosts.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_nontruncated_hosts.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_hosts.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_nontruncated_registrars.json b/core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_registrars.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_nontruncated_registrars.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_nontruncated_registrars.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_registrar.json b/core/src/test/java/google/registry/rdap/testdata/rdap_registrar.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_registrar.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_registrar.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_registrar_test.json b/core/src/test/java/google/registry/rdap/testdata/rdap_registrar_test.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_registrar_test.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_registrar_test.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_truncated_contacts.json b/core/src/test/java/google/registry/rdap/testdata/rdap_truncated_contacts.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_truncated_contacts.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_truncated_contacts.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json b/core/src/test/java/google/registry/rdap/testdata/rdap_truncated_hosts.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_truncated_hosts.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_truncated_hosts.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json b/core/src/test/java/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_truncated_mixed_entities.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_truncated_registrars.json b/core/src/test/java/google/registry/rdap/testdata/rdap_truncated_registrars.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_truncated_registrars.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_truncated_registrars.json
diff --git a/javatests/google/registry/rdap/testdata/rdap_unformatted_output.json b/core/src/test/java/google/registry/rdap/testdata/rdap_unformatted_output.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdap_unformatted_output.json
rename to core/src/test/java/google/registry/rdap/testdata/rdap_unformatted_output.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_admincontact.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_admincontact.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_admincontact.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_admincontact.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_domain_full.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_full.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_domain_full.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_full.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_domain_logged_out.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_logged_out.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_domain_logged_out.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_logged_out.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_domain_no_nameservers.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_no_nameservers.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_domain_no_nameservers.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_no_nameservers.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_domain_summary.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_summary.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_domain_summary.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_domain_summary.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_error.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_error.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_error.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_error.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_host_both.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_both.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_host_both.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_host_both.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_host_both_summary.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_both_summary.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_host_both_summary.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_host_both_summary.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_host_ipv4.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_ipv4.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_host_ipv4.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_host_ipv4.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_host_ipv6.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_ipv6.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_host_ipv6.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_host_ipv6.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_host_no_addresses.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_no_addresses.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_host_no_addresses.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_host_no_addresses.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_host_not_linked.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_not_linked.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_host_not_linked.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_host_not_linked.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_host_pending_transfer.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_host_pending_transfer.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_host_pending_transfer.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_host_pending_transfer.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_notice_alternate_link.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_notice_alternate_link.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_notice_alternate_link.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_notice_alternate_link.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_notice_self_link.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_notice_self_link.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_notice_self_link.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_notice_self_link.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_registrant.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_registrant.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_registrant_logged_out.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_logged_out.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_registrant_logged_out.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_logged_out.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_registrant_nobase.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_nobase.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_registrant_nobase.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_nobase.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_registrant_summary.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_summary.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_registrant_summary.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_summary.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_registrant_summary_logged_out.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_summary_logged_out.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_registrant_summary_logged_out.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_registrant_summary_logged_out.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_registrar.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrar.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_registrar.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_registrar.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_registrar_summary.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_registrar_summary.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_registrar_summary.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_registrar_summary.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_rolelesscontact.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_rolelesscontact.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_rolelesscontact.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_rolelesscontact.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_techcontact.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_techcontact.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_techcontact.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_techcontact.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_toplevel.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_toplevel.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_toplevel.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_toplevel.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_toplevel_domain.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_toplevel_domain.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_toplevel_domain.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_toplevel_domain.json
diff --git a/javatests/google/registry/rdap/testdata/rdapjson_unlinkedcontact.json b/core/src/test/java/google/registry/rdap/testdata/rdapjson_unlinkedcontact.json
similarity index 100%
rename from javatests/google/registry/rdap/testdata/rdapjson_unlinkedcontact.json
rename to core/src/test/java/google/registry/rdap/testdata/rdapjson_unlinkedcontact.json
diff --git a/javatests/google/registry/rde/BUILD b/core/src/test/java/google/registry/rde/BUILD
similarity index 100%
rename from javatests/google/registry/rde/BUILD
rename to core/src/test/java/google/registry/rde/BUILD
diff --git a/javatests/google/registry/rde/BouncyCastleTest.java b/core/src/test/java/google/registry/rde/BouncyCastleTest.java
similarity index 100%
rename from javatests/google/registry/rde/BouncyCastleTest.java
rename to core/src/test/java/google/registry/rde/BouncyCastleTest.java
diff --git a/javatests/google/registry/rde/BrdaCopyActionTest.java b/core/src/test/java/google/registry/rde/BrdaCopyActionTest.java
similarity index 100%
rename from javatests/google/registry/rde/BrdaCopyActionTest.java
rename to core/src/test/java/google/registry/rde/BrdaCopyActionTest.java
diff --git a/javatests/google/registry/rde/ContactResourceToXjcConverterTest.java b/core/src/test/java/google/registry/rde/ContactResourceToXjcConverterTest.java
similarity index 100%
rename from javatests/google/registry/rde/ContactResourceToXjcConverterTest.java
rename to core/src/test/java/google/registry/rde/ContactResourceToXjcConverterTest.java
diff --git a/javatests/google/registry/rde/DomainBaseToXjcConverterTest.java b/core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java
similarity index 100%
rename from javatests/google/registry/rde/DomainBaseToXjcConverterTest.java
rename to core/src/test/java/google/registry/rde/DomainBaseToXjcConverterTest.java
diff --git a/javatests/google/registry/rde/EscrowTaskRunnerTest.java b/core/src/test/java/google/registry/rde/EscrowTaskRunnerTest.java
similarity index 100%
rename from javatests/google/registry/rde/EscrowTaskRunnerTest.java
rename to core/src/test/java/google/registry/rde/EscrowTaskRunnerTest.java
diff --git a/javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java b/core/src/test/java/google/registry/rde/GhostrydeGpgIntegrationTest.java
similarity index 100%
rename from javatests/google/registry/rde/GhostrydeGpgIntegrationTest.java
rename to core/src/test/java/google/registry/rde/GhostrydeGpgIntegrationTest.java
diff --git a/javatests/google/registry/rde/GhostrydeTest.java b/core/src/test/java/google/registry/rde/GhostrydeTest.java
similarity index 100%
rename from javatests/google/registry/rde/GhostrydeTest.java
rename to core/src/test/java/google/registry/rde/GhostrydeTest.java
diff --git a/javatests/google/registry/rde/HostResourceToXjcConverterTest.java b/core/src/test/java/google/registry/rde/HostResourceToXjcConverterTest.java
similarity index 100%
rename from javatests/google/registry/rde/HostResourceToXjcConverterTest.java
rename to core/src/test/java/google/registry/rde/HostResourceToXjcConverterTest.java
diff --git a/javatests/google/registry/rde/PendingDepositCheckerTest.java b/core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java
similarity index 100%
rename from javatests/google/registry/rde/PendingDepositCheckerTest.java
rename to core/src/test/java/google/registry/rde/PendingDepositCheckerTest.java
diff --git a/javatests/google/registry/rde/RdeFixtures.java b/core/src/test/java/google/registry/rde/RdeFixtures.java
similarity index 100%
rename from javatests/google/registry/rde/RdeFixtures.java
rename to core/src/test/java/google/registry/rde/RdeFixtures.java
diff --git a/javatests/google/registry/rde/RdeMarshallerTest.java b/core/src/test/java/google/registry/rde/RdeMarshallerTest.java
similarity index 100%
rename from javatests/google/registry/rde/RdeMarshallerTest.java
rename to core/src/test/java/google/registry/rde/RdeMarshallerTest.java
diff --git a/javatests/google/registry/rde/RdeReportActionTest.java b/core/src/test/java/google/registry/rde/RdeReportActionTest.java
similarity index 100%
rename from javatests/google/registry/rde/RdeReportActionTest.java
rename to core/src/test/java/google/registry/rde/RdeReportActionTest.java
diff --git a/javatests/google/registry/rde/RdeStagingActionTest.java b/core/src/test/java/google/registry/rde/RdeStagingActionTest.java
similarity index 100%
rename from javatests/google/registry/rde/RdeStagingActionTest.java
rename to core/src/test/java/google/registry/rde/RdeStagingActionTest.java
diff --git a/javatests/google/registry/rde/RdeTestData.java b/core/src/test/java/google/registry/rde/RdeTestData.java
similarity index 100%
rename from javatests/google/registry/rde/RdeTestData.java
rename to core/src/test/java/google/registry/rde/RdeTestData.java
diff --git a/javatests/google/registry/rde/RdeTestSuite.java b/core/src/test/java/google/registry/rde/RdeTestSuite.java
similarity index 100%
rename from javatests/google/registry/rde/RdeTestSuite.java
rename to core/src/test/java/google/registry/rde/RdeTestSuite.java
diff --git a/javatests/google/registry/rde/RdeUploadActionTest.java b/core/src/test/java/google/registry/rde/RdeUploadActionTest.java
similarity index 100%
rename from javatests/google/registry/rde/RdeUploadActionTest.java
rename to core/src/test/java/google/registry/rde/RdeUploadActionTest.java
diff --git a/javatests/google/registry/rde/RegistrarToXjcConverterTest.java b/core/src/test/java/google/registry/rde/RegistrarToXjcConverterTest.java
similarity index 100%
rename from javatests/google/registry/rde/RegistrarToXjcConverterTest.java
rename to core/src/test/java/google/registry/rde/RegistrarToXjcConverterTest.java
diff --git a/javatests/google/registry/rde/RydeCompressionTest.java b/core/src/test/java/google/registry/rde/RydeCompressionTest.java
similarity index 100%
rename from javatests/google/registry/rde/RydeCompressionTest.java
rename to core/src/test/java/google/registry/rde/RydeCompressionTest.java
diff --git a/javatests/google/registry/rde/RydeEncryptionTest.java b/core/src/test/java/google/registry/rde/RydeEncryptionTest.java
similarity index 100%
rename from javatests/google/registry/rde/RydeEncryptionTest.java
rename to core/src/test/java/google/registry/rde/RydeEncryptionTest.java
diff --git a/javatests/google/registry/rde/RydeFileEncodingTest.java b/core/src/test/java/google/registry/rde/RydeFileEncodingTest.java
similarity index 100%
rename from javatests/google/registry/rde/RydeFileEncodingTest.java
rename to core/src/test/java/google/registry/rde/RydeFileEncodingTest.java
diff --git a/javatests/google/registry/rde/RydeGpgIntegrationTest.java b/core/src/test/java/google/registry/rde/RydeGpgIntegrationTest.java
similarity index 100%
rename from javatests/google/registry/rde/RydeGpgIntegrationTest.java
rename to core/src/test/java/google/registry/rde/RydeGpgIntegrationTest.java
diff --git a/javatests/google/registry/rde/RydeTarTest.java b/core/src/test/java/google/registry/rde/RydeTarTest.java
similarity index 100%
rename from javatests/google/registry/rde/RydeTarTest.java
rename to core/src/test/java/google/registry/rde/RydeTarTest.java
diff --git a/javatests/google/registry/rde/testdata/deposit_full.xml b/core/src/test/java/google/registry/rde/testdata/deposit_full.xml
similarity index 100%
rename from javatests/google/registry/rde/testdata/deposit_full.xml
rename to core/src/test/java/google/registry/rde/testdata/deposit_full.xml
diff --git a/javatests/google/registry/rde/testdata/deposit_full_badref.xml b/core/src/test/java/google/registry/rde/testdata/deposit_full_badref.xml
similarity index 100%
rename from javatests/google/registry/rde/testdata/deposit_full_badref.xml
rename to core/src/test/java/google/registry/rde/testdata/deposit_full_badref.xml
diff --git a/javatests/google/registry/rde/testdata/iirdea_bad.xml b/core/src/test/java/google/registry/rde/testdata/iirdea_bad.xml
similarity index 100%
rename from javatests/google/registry/rde/testdata/iirdea_bad.xml
rename to core/src/test/java/google/registry/rde/testdata/iirdea_bad.xml
diff --git a/javatests/google/registry/rde/testdata/iirdea_good.xml b/core/src/test/java/google/registry/rde/testdata/iirdea_good.xml
similarity index 100%
rename from javatests/google/registry/rde/testdata/iirdea_good.xml
rename to core/src/test/java/google/registry/rde/testdata/iirdea_good.xml
diff --git a/javatests/google/registry/rde/testdata/pgp-private-keyring-escrow.asc b/core/src/test/java/google/registry/rde/testdata/pgp-private-keyring-escrow.asc
similarity index 100%
rename from javatests/google/registry/rde/testdata/pgp-private-keyring-escrow.asc
rename to core/src/test/java/google/registry/rde/testdata/pgp-private-keyring-escrow.asc
diff --git a/javatests/google/registry/rde/testdata/pgp-private-keyring-registry.asc b/core/src/test/java/google/registry/rde/testdata/pgp-private-keyring-registry.asc
similarity index 100%
rename from javatests/google/registry/rde/testdata/pgp-private-keyring-registry.asc
rename to core/src/test/java/google/registry/rde/testdata/pgp-private-keyring-registry.asc
diff --git a/javatests/google/registry/rde/testdata/pgp-public-keyring.asc b/core/src/test/java/google/registry/rde/testdata/pgp-public-keyring.asc
similarity index 100%
rename from javatests/google/registry/rde/testdata/pgp-public-keyring.asc
rename to core/src/test/java/google/registry/rde/testdata/pgp-public-keyring.asc
diff --git a/javatests/google/registry/rde/testdata/registry-unittest.id_rsa b/core/src/test/java/google/registry/rde/testdata/registry-unittest.id_rsa
similarity index 100%
rename from javatests/google/registry/rde/testdata/registry-unittest.id_rsa
rename to core/src/test/java/google/registry/rde/testdata/registry-unittest.id_rsa
diff --git a/javatests/google/registry/rde/testdata/registry-unittest.id_rsa.pub b/core/src/test/java/google/registry/rde/testdata/registry-unittest.id_rsa.pub
similarity index 100%
rename from javatests/google/registry/rde/testdata/registry-unittest.id_rsa.pub
rename to core/src/test/java/google/registry/rde/testdata/registry-unittest.id_rsa.pub
diff --git a/javatests/google/registry/rde/testdata/report.xml b/core/src/test/java/google/registry/rde/testdata/report.xml
similarity index 100%
rename from javatests/google/registry/rde/testdata/report.xml
rename to core/src/test/java/google/registry/rde/testdata/report.xml
diff --git a/javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml b/core/src/test/java/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml
similarity index 100%
rename from javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml
rename to core/src/test/java/google/registry/rde/testdata/testMapReduce_withDomain_producesExpectedXml.xml
diff --git a/javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml b/core/src/test/java/google/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml
similarity index 100%
rename from javatests/google/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml
rename to core/src/test/java/google/registry/rde/testdata/testMapReduce_withDomain_producesReportXml.xml
diff --git a/javatests/google/registry/reporting/BUILD b/core/src/test/java/google/registry/reporting/BUILD
similarity index 100%
rename from javatests/google/registry/reporting/BUILD
rename to core/src/test/java/google/registry/reporting/BUILD
diff --git a/javatests/google/registry/reporting/ReportingModuleTest.java b/core/src/test/java/google/registry/reporting/ReportingModuleTest.java
similarity index 100%
rename from javatests/google/registry/reporting/ReportingModuleTest.java
rename to core/src/test/java/google/registry/reporting/ReportingModuleTest.java
diff --git a/javatests/google/registry/reporting/billing/BUILD b/core/src/test/java/google/registry/reporting/billing/BUILD
similarity index 100%
rename from javatests/google/registry/reporting/billing/BUILD
rename to core/src/test/java/google/registry/reporting/billing/BUILD
diff --git a/javatests/google/registry/reporting/billing/BillingEmailUtilsTest.java b/core/src/test/java/google/registry/reporting/billing/BillingEmailUtilsTest.java
similarity index 100%
rename from javatests/google/registry/reporting/billing/BillingEmailUtilsTest.java
rename to core/src/test/java/google/registry/reporting/billing/BillingEmailUtilsTest.java
diff --git a/javatests/google/registry/reporting/billing/CopyDetailReportsActionTest.java b/core/src/test/java/google/registry/reporting/billing/CopyDetailReportsActionTest.java
similarity index 100%
rename from javatests/google/registry/reporting/billing/CopyDetailReportsActionTest.java
rename to core/src/test/java/google/registry/reporting/billing/CopyDetailReportsActionTest.java
diff --git a/javatests/google/registry/reporting/billing/GenerateInvoicesActionTest.java b/core/src/test/java/google/registry/reporting/billing/GenerateInvoicesActionTest.java
similarity index 100%
rename from javatests/google/registry/reporting/billing/GenerateInvoicesActionTest.java
rename to core/src/test/java/google/registry/reporting/billing/GenerateInvoicesActionTest.java
diff --git a/javatests/google/registry/reporting/billing/PublishInvoicesActionTest.java b/core/src/test/java/google/registry/reporting/billing/PublishInvoicesActionTest.java
similarity index 100%
rename from javatests/google/registry/reporting/billing/PublishInvoicesActionTest.java
rename to core/src/test/java/google/registry/reporting/billing/PublishInvoicesActionTest.java
diff --git a/javatests/google/registry/reporting/icann/ActivityReportingQueryBuilderTest.java b/core/src/test/java/google/registry/reporting/icann/ActivityReportingQueryBuilderTest.java
similarity index 100%
rename from javatests/google/registry/reporting/icann/ActivityReportingQueryBuilderTest.java
rename to core/src/test/java/google/registry/reporting/icann/ActivityReportingQueryBuilderTest.java
diff --git a/javatests/google/registry/reporting/icann/BUILD b/core/src/test/java/google/registry/reporting/icann/BUILD
similarity index 100%
rename from javatests/google/registry/reporting/icann/BUILD
rename to core/src/test/java/google/registry/reporting/icann/BUILD
diff --git a/javatests/google/registry/reporting/icann/IcannHttpReporterTest.java b/core/src/test/java/google/registry/reporting/icann/IcannHttpReporterTest.java
similarity index 100%
rename from javatests/google/registry/reporting/icann/IcannHttpReporterTest.java
rename to core/src/test/java/google/registry/reporting/icann/IcannHttpReporterTest.java
diff --git a/javatests/google/registry/reporting/icann/IcannReportingModuleTest.java b/core/src/test/java/google/registry/reporting/icann/IcannReportingModuleTest.java
similarity index 100%
rename from javatests/google/registry/reporting/icann/IcannReportingModuleTest.java
rename to core/src/test/java/google/registry/reporting/icann/IcannReportingModuleTest.java
diff --git a/javatests/google/registry/reporting/icann/IcannReportingStagerTest.java b/core/src/test/java/google/registry/reporting/icann/IcannReportingStagerTest.java
similarity index 100%
rename from javatests/google/registry/reporting/icann/IcannReportingStagerTest.java
rename to core/src/test/java/google/registry/reporting/icann/IcannReportingStagerTest.java
diff --git a/javatests/google/registry/reporting/icann/IcannReportingStagingActionTest.java b/core/src/test/java/google/registry/reporting/icann/IcannReportingStagingActionTest.java
similarity index 100%
rename from javatests/google/registry/reporting/icann/IcannReportingStagingActionTest.java
rename to core/src/test/java/google/registry/reporting/icann/IcannReportingStagingActionTest.java
diff --git a/javatests/google/registry/reporting/icann/IcannReportingUploadActionTest.java b/core/src/test/java/google/registry/reporting/icann/IcannReportingUploadActionTest.java
similarity index 100%
rename from javatests/google/registry/reporting/icann/IcannReportingUploadActionTest.java
rename to core/src/test/java/google/registry/reporting/icann/IcannReportingUploadActionTest.java
diff --git a/javatests/google/registry/reporting/icann/ReportingTestData.java b/core/src/test/java/google/registry/reporting/icann/ReportingTestData.java
similarity index 100%
rename from javatests/google/registry/reporting/icann/ReportingTestData.java
rename to core/src/test/java/google/registry/reporting/icann/ReportingTestData.java
diff --git a/javatests/google/registry/reporting/icann/TransactionsReportingQueryBuilderTest.java b/core/src/test/java/google/registry/reporting/icann/TransactionsReportingQueryBuilderTest.java
similarity index 100%
rename from javatests/google/registry/reporting/icann/TransactionsReportingQueryBuilderTest.java
rename to core/src/test/java/google/registry/reporting/icann/TransactionsReportingQueryBuilderTest.java
diff --git a/javatests/google/registry/reporting/icann/testdata/activity_report_aggregation_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/activity_report_aggregation_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/activity_report_aggregation_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/activity_report_aggregation_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/attempted_adds_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/attempted_adds_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/attempted_adds_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/attempted_adds_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/dns_counts_internal_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/dns_counts_internal_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/dns_counts_internal_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/dns_counts_internal_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/dns_counts_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/dns_counts_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/dns_counts_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/dns_counts_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/epp_metrics_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/epp_metrics_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/epp_metrics_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/epp_metrics_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/iirdea_bad.xml b/core/src/test/java/google/registry/reporting/icann/testdata/iirdea_bad.xml
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/iirdea_bad.xml
rename to core/src/test/java/google/registry/reporting/icann/testdata/iirdea_bad.xml
diff --git a/javatests/google/registry/reporting/icann/testdata/iirdea_good.xml b/core/src/test/java/google/registry/reporting/icann/testdata/iirdea_good.xml
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/iirdea_good.xml
rename to core/src/test/java/google/registry/reporting/icann/testdata/iirdea_good.xml
diff --git a/javatests/google/registry/reporting/icann/testdata/monthly_logs_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/monthly_logs_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/monthly_logs_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/monthly_logs_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/registrar_iana_id_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/registrar_iana_id_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/registrar_iana_id_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/registrar_iana_id_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/registrar_operating_status_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/registrar_operating_status_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/registrar_operating_status_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/registrar_operating_status_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/total_domains_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/total_domains_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/total_domains_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/total_domains_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/total_nameservers_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/total_nameservers_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/total_nameservers_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/total_nameservers_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/transaction_counts_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/transaction_counts_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/transaction_counts_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/transaction_counts_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/transaction_transfer_losing_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/transaction_transfer_losing_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/transaction_transfer_losing_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/transaction_transfer_losing_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/transactions_report_aggregation_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/transactions_report_aggregation_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/transactions_report_aggregation_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/transactions_report_aggregation_test.sql
diff --git a/javatests/google/registry/reporting/icann/testdata/whois_counts_test.sql b/core/src/test/java/google/registry/reporting/icann/testdata/whois_counts_test.sql
similarity index 100%
rename from javatests/google/registry/reporting/icann/testdata/whois_counts_test.sql
rename to core/src/test/java/google/registry/reporting/icann/testdata/whois_counts_test.sql
diff --git a/javatests/google/registry/reporting/spec11/BUILD b/core/src/test/java/google/registry/reporting/spec11/BUILD
similarity index 100%
rename from javatests/google/registry/reporting/spec11/BUILD
rename to core/src/test/java/google/registry/reporting/spec11/BUILD
diff --git a/javatests/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java b/core/src/test/java/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java
similarity index 100%
rename from javatests/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java
rename to core/src/test/java/google/registry/reporting/spec11/GenerateSpec11ReportActionTest.java
diff --git a/javatests/google/registry/reporting/spec11/PublishSpec11ReportActionTest.java b/core/src/test/java/google/registry/reporting/spec11/PublishSpec11ReportActionTest.java
similarity index 100%
rename from javatests/google/registry/reporting/spec11/PublishSpec11ReportActionTest.java
rename to core/src/test/java/google/registry/reporting/spec11/PublishSpec11ReportActionTest.java
diff --git a/javatests/google/registry/reporting/spec11/Spec11EmailUtilsTest.java b/core/src/test/java/google/registry/reporting/spec11/Spec11EmailUtilsTest.java
similarity index 100%
rename from javatests/google/registry/reporting/spec11/Spec11EmailUtilsTest.java
rename to core/src/test/java/google/registry/reporting/spec11/Spec11EmailUtilsTest.java
diff --git a/javatests/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParserTest.java b/core/src/test/java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParserTest.java
similarity index 100%
rename from javatests/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParserTest.java
rename to core/src/test/java/google/registry/reporting/spec11/Spec11RegistrarThreatMatchesParserTest.java
diff --git a/javatests/google/registry/reporting/spec11/testdata/spec11_fake_report b/core/src/test/java/google/registry/reporting/spec11/testdata/spec11_fake_report
similarity index 100%
rename from javatests/google/registry/reporting/spec11/testdata/spec11_fake_report
rename to core/src/test/java/google/registry/reporting/spec11/testdata/spec11_fake_report
diff --git a/javatests/google/registry/reporting/spec11/testdata/spec11_fake_report_previous_day b/core/src/test/java/google/registry/reporting/spec11/testdata/spec11_fake_report_previous_day
similarity index 100%
rename from javatests/google/registry/reporting/spec11/testdata/spec11_fake_report_previous_day
rename to core/src/test/java/google/registry/reporting/spec11/testdata/spec11_fake_report_previous_day
diff --git a/javatests/google/registry/request/BUILD b/core/src/test/java/google/registry/request/BUILD
similarity index 100%
rename from javatests/google/registry/request/BUILD
rename to core/src/test/java/google/registry/request/BUILD
diff --git a/javatests/google/registry/request/JsonResponseTest.java b/core/src/test/java/google/registry/request/JsonResponseTest.java
similarity index 100%
rename from javatests/google/registry/request/JsonResponseTest.java
rename to core/src/test/java/google/registry/request/JsonResponseTest.java
diff --git a/javatests/google/registry/request/RequestHandlerTest.java b/core/src/test/java/google/registry/request/RequestHandlerTest.java
similarity index 100%
rename from javatests/google/registry/request/RequestHandlerTest.java
rename to core/src/test/java/google/registry/request/RequestHandlerTest.java
diff --git a/javatests/google/registry/request/RequestModuleTest.java b/core/src/test/java/google/registry/request/RequestModuleTest.java
similarity index 100%
rename from javatests/google/registry/request/RequestModuleTest.java
rename to core/src/test/java/google/registry/request/RequestModuleTest.java
diff --git a/javatests/google/registry/request/RequestParametersTest.java b/core/src/test/java/google/registry/request/RequestParametersTest.java
similarity index 100%
rename from javatests/google/registry/request/RequestParametersTest.java
rename to core/src/test/java/google/registry/request/RequestParametersTest.java
diff --git a/javatests/google/registry/request/ResponseImplTest.java b/core/src/test/java/google/registry/request/ResponseImplTest.java
similarity index 100%
rename from javatests/google/registry/request/ResponseImplTest.java
rename to core/src/test/java/google/registry/request/ResponseImplTest.java
diff --git a/javatests/google/registry/request/RouterTest.java b/core/src/test/java/google/registry/request/RouterTest.java
similarity index 100%
rename from javatests/google/registry/request/RouterTest.java
rename to core/src/test/java/google/registry/request/RouterTest.java
diff --git a/javatests/google/registry/request/auth/AuthTest.java b/core/src/test/java/google/registry/request/auth/AuthTest.java
similarity index 100%
rename from javatests/google/registry/request/auth/AuthTest.java
rename to core/src/test/java/google/registry/request/auth/AuthTest.java
diff --git a/javatests/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java b/core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java
similarity index 100%
rename from javatests/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java
rename to core/src/test/java/google/registry/request/auth/AuthenticatedRegistrarAccessorTest.java
diff --git a/javatests/google/registry/request/auth/BUILD b/core/src/test/java/google/registry/request/auth/BUILD
similarity index 100%
rename from javatests/google/registry/request/auth/BUILD
rename to core/src/test/java/google/registry/request/auth/BUILD
diff --git a/javatests/google/registry/request/auth/LegacyAuthenticationMechanismTest.java b/core/src/test/java/google/registry/request/auth/LegacyAuthenticationMechanismTest.java
similarity index 100%
rename from javatests/google/registry/request/auth/LegacyAuthenticationMechanismTest.java
rename to core/src/test/java/google/registry/request/auth/LegacyAuthenticationMechanismTest.java
diff --git a/javatests/google/registry/request/auth/RequestAuthenticatorTest.java b/core/src/test/java/google/registry/request/auth/RequestAuthenticatorTest.java
similarity index 100%
rename from javatests/google/registry/request/auth/RequestAuthenticatorTest.java
rename to core/src/test/java/google/registry/request/auth/RequestAuthenticatorTest.java
diff --git a/javatests/google/registry/request/lock/BUILD b/core/src/test/java/google/registry/request/lock/BUILD
similarity index 100%
rename from javatests/google/registry/request/lock/BUILD
rename to core/src/test/java/google/registry/request/lock/BUILD
diff --git a/javatests/google/registry/request/lock/LockHandlerImplTest.java b/core/src/test/java/google/registry/request/lock/LockHandlerImplTest.java
similarity index 100%
rename from javatests/google/registry/request/lock/LockHandlerImplTest.java
rename to core/src/test/java/google/registry/request/lock/LockHandlerImplTest.java
diff --git a/javatests/google/registry/security/BUILD b/core/src/test/java/google/registry/security/BUILD
similarity index 100%
rename from javatests/google/registry/security/BUILD
rename to core/src/test/java/google/registry/security/BUILD
diff --git a/javatests/google/registry/security/JsonHttpTest.java b/core/src/test/java/google/registry/security/JsonHttpTest.java
similarity index 100%
rename from javatests/google/registry/security/JsonHttpTest.java
rename to core/src/test/java/google/registry/security/JsonHttpTest.java
diff --git a/javatests/google/registry/security/JsonHttpTestUtils.java b/core/src/test/java/google/registry/security/JsonHttpTestUtils.java
similarity index 100%
rename from javatests/google/registry/security/JsonHttpTestUtils.java
rename to core/src/test/java/google/registry/security/JsonHttpTestUtils.java
diff --git a/javatests/google/registry/security/XsrfTokenManagerTest.java b/core/src/test/java/google/registry/security/XsrfTokenManagerTest.java
similarity index 100%
rename from javatests/google/registry/security/XsrfTokenManagerTest.java
rename to core/src/test/java/google/registry/security/XsrfTokenManagerTest.java
diff --git a/javatests/google/registry/server/BUILD b/core/src/test/java/google/registry/server/BUILD
similarity index 100%
rename from javatests/google/registry/server/BUILD
rename to core/src/test/java/google/registry/server/BUILD
diff --git a/javatests/google/registry/server/Fixture.java b/core/src/test/java/google/registry/server/Fixture.java
similarity index 100%
rename from javatests/google/registry/server/Fixture.java
rename to core/src/test/java/google/registry/server/Fixture.java
diff --git a/javatests/google/registry/server/HealthzServlet.java b/core/src/test/java/google/registry/server/HealthzServlet.java
similarity index 100%
rename from javatests/google/registry/server/HealthzServlet.java
rename to core/src/test/java/google/registry/server/HealthzServlet.java
diff --git a/javatests/google/registry/server/RegistryTestServer.java b/core/src/test/java/google/registry/server/RegistryTestServer.java
similarity index 92%
rename from javatests/google/registry/server/RegistryTestServer.java
rename to core/src/test/java/google/registry/server/RegistryTestServer.java
index 8f7dd90b6..1ae9715f9 100644
--- a/javatests/google/registry/server/RegistryTestServer.java
+++ b/core/src/test/java/google/registry/server/RegistryTestServer.java
@@ -37,12 +37,14 @@ public final class RegistryTestServer {
 
   public static final ImmutableMap<String, Path> RUNFILES =
       new ImmutableMap.Builder<String, Path>()
-          .put("/index.html", PROJECT_ROOT.resolve("java/google/registry/ui/html/index.html"))
-          .put("/error.html", PROJECT_ROOT.resolve("java/google/registry/ui/html/error.html"))
+          .put("/index.html",
+              PROJECT_ROOT.resolve("core/src/main/java/google/registry/ui/html/index.html"))
+          .put("/error.html",
+              PROJECT_ROOT.resolve("core/src/main/java/google/registry/ui/html/error.html"))
           .put("/assets/js/*", RESOURCES_DIR.resolve("google/registry/ui"))
           .put("/assets/css/*", RESOURCES_DIR.resolve("google/registry/ui/css"))
           .put("/assets/sources/*", PROJECT_ROOT)
-          .put("/assets/*", PROJECT_ROOT.resolve("java/google/registry/ui/assets"))
+          .put("/assets/*", PROJECT_ROOT.resolve("core/src/main/java/google/registry/ui/assets"))
           .build();
 
   private static final ImmutableList<Route> ROUTES =
diff --git a/javatests/google/registry/server/RegistryTestServerMain.java b/core/src/test/java/google/registry/server/RegistryTestServerMain.java
similarity index 100%
rename from javatests/google/registry/server/RegistryTestServerMain.java
rename to core/src/test/java/google/registry/server/RegistryTestServerMain.java
diff --git a/javatests/google/registry/server/Route.java b/core/src/test/java/google/registry/server/Route.java
similarity index 100%
rename from javatests/google/registry/server/Route.java
rename to core/src/test/java/google/registry/server/Route.java
diff --git a/javatests/google/registry/server/ServletWrapperDelegatorServlet.java b/core/src/test/java/google/registry/server/ServletWrapperDelegatorServlet.java
similarity index 100%
rename from javatests/google/registry/server/ServletWrapperDelegatorServlet.java
rename to core/src/test/java/google/registry/server/ServletWrapperDelegatorServlet.java
diff --git a/javatests/google/registry/server/StaticResourceServlet.java b/core/src/test/java/google/registry/server/StaticResourceServlet.java
similarity index 100%
rename from javatests/google/registry/server/StaticResourceServlet.java
rename to core/src/test/java/google/registry/server/StaticResourceServlet.java
diff --git a/javatests/google/registry/server/TestServer.java b/core/src/test/java/google/registry/server/TestServer.java
similarity index 100%
rename from javatests/google/registry/server/TestServer.java
rename to core/src/test/java/google/registry/server/TestServer.java
diff --git a/javatests/google/registry/storage/drive/BUILD b/core/src/test/java/google/registry/storage/drive/BUILD
similarity index 100%
rename from javatests/google/registry/storage/drive/BUILD
rename to core/src/test/java/google/registry/storage/drive/BUILD
diff --git a/javatests/google/registry/storage/drive/DriveConnectionTest.java b/core/src/test/java/google/registry/storage/drive/DriveConnectionTest.java
similarity index 100%
rename from javatests/google/registry/storage/drive/DriveConnectionTest.java
rename to core/src/test/java/google/registry/storage/drive/DriveConnectionTest.java
diff --git a/javatests/google/registry/testing/AbstractEppResourceSubject.java b/core/src/test/java/google/registry/testing/AbstractEppResourceSubject.java
similarity index 100%
rename from javatests/google/registry/testing/AbstractEppResourceSubject.java
rename to core/src/test/java/google/registry/testing/AbstractEppResourceSubject.java
diff --git a/javatests/google/registry/testing/AppEngineAdminApiHelper.java b/core/src/test/java/google/registry/testing/AppEngineAdminApiHelper.java
similarity index 100%
rename from javatests/google/registry/testing/AppEngineAdminApiHelper.java
rename to core/src/test/java/google/registry/testing/AppEngineAdminApiHelper.java
diff --git a/javatests/google/registry/testing/AppEngineRule.java b/core/src/test/java/google/registry/testing/AppEngineRule.java
similarity index 100%
rename from javatests/google/registry/testing/AppEngineRule.java
rename to core/src/test/java/google/registry/testing/AppEngineRule.java
diff --git a/javatests/google/registry/testing/AppEngineRuleTest.java b/core/src/test/java/google/registry/testing/AppEngineRuleTest.java
similarity index 100%
rename from javatests/google/registry/testing/AppEngineRuleTest.java
rename to core/src/test/java/google/registry/testing/AppEngineRuleTest.java
diff --git a/javatests/google/registry/testing/BUILD b/core/src/test/java/google/registry/testing/BUILD
similarity index 100%
rename from javatests/google/registry/testing/BUILD
rename to core/src/test/java/google/registry/testing/BUILD
diff --git a/javatests/google/registry/testing/BouncyCastleProviderRule.java b/core/src/test/java/google/registry/testing/BouncyCastleProviderRule.java
similarity index 100%
rename from javatests/google/registry/testing/BouncyCastleProviderRule.java
rename to core/src/test/java/google/registry/testing/BouncyCastleProviderRule.java
diff --git a/javatests/google/registry/testing/CertificateSamples.java b/core/src/test/java/google/registry/testing/CertificateSamples.java
similarity index 100%
rename from javatests/google/registry/testing/CertificateSamples.java
rename to core/src/test/java/google/registry/testing/CertificateSamples.java
diff --git a/javatests/google/registry/testing/ContactResourceSubject.java b/core/src/test/java/google/registry/testing/ContactResourceSubject.java
similarity index 100%
rename from javatests/google/registry/testing/ContactResourceSubject.java
rename to core/src/test/java/google/registry/testing/ContactResourceSubject.java
diff --git a/javatests/google/registry/testing/DatastoreHelper.java b/core/src/test/java/google/registry/testing/DatastoreHelper.java
similarity index 100%
rename from javatests/google/registry/testing/DatastoreHelper.java
rename to core/src/test/java/google/registry/testing/DatastoreHelper.java
diff --git a/javatests/google/registry/testing/DeterministicStringGenerator.java b/core/src/test/java/google/registry/testing/DeterministicStringGenerator.java
similarity index 100%
rename from javatests/google/registry/testing/DeterministicStringGenerator.java
rename to core/src/test/java/google/registry/testing/DeterministicStringGenerator.java
diff --git a/javatests/google/registry/testing/DomainBaseSubject.java b/core/src/test/java/google/registry/testing/DomainBaseSubject.java
similarity index 100%
rename from javatests/google/registry/testing/DomainBaseSubject.java
rename to core/src/test/java/google/registry/testing/DomainBaseSubject.java
diff --git a/javatests/google/registry/testing/EppExceptionSubject.java b/core/src/test/java/google/registry/testing/EppExceptionSubject.java
similarity index 100%
rename from javatests/google/registry/testing/EppExceptionSubject.java
rename to core/src/test/java/google/registry/testing/EppExceptionSubject.java
diff --git a/javatests/google/registry/testing/EppLoader.java b/core/src/test/java/google/registry/testing/EppLoader.java
similarity index 100%
rename from javatests/google/registry/testing/EppLoader.java
rename to core/src/test/java/google/registry/testing/EppLoader.java
diff --git a/javatests/google/registry/testing/EppMetricSubject.java b/core/src/test/java/google/registry/testing/EppMetricSubject.java
similarity index 100%
rename from javatests/google/registry/testing/EppMetricSubject.java
rename to core/src/test/java/google/registry/testing/EppMetricSubject.java
diff --git a/javatests/google/registry/testing/FailAnswer.java b/core/src/test/java/google/registry/testing/FailAnswer.java
similarity index 100%
rename from javatests/google/registry/testing/FailAnswer.java
rename to core/src/test/java/google/registry/testing/FailAnswer.java
diff --git a/javatests/google/registry/testing/FakeClock.java b/core/src/test/java/google/registry/testing/FakeClock.java
similarity index 100%
rename from javatests/google/registry/testing/FakeClock.java
rename to core/src/test/java/google/registry/testing/FakeClock.java
diff --git a/javatests/google/registry/testing/FakeHttpSession.java b/core/src/test/java/google/registry/testing/FakeHttpSession.java
similarity index 100%
rename from javatests/google/registry/testing/FakeHttpSession.java
rename to core/src/test/java/google/registry/testing/FakeHttpSession.java
diff --git a/javatests/google/registry/testing/FakeJsonResponse.java b/core/src/test/java/google/registry/testing/FakeJsonResponse.java
similarity index 100%
rename from javatests/google/registry/testing/FakeJsonResponse.java
rename to core/src/test/java/google/registry/testing/FakeJsonResponse.java
diff --git a/javatests/google/registry/testing/FakeKeyringModule.java b/core/src/test/java/google/registry/testing/FakeKeyringModule.java
similarity index 100%
rename from javatests/google/registry/testing/FakeKeyringModule.java
rename to core/src/test/java/google/registry/testing/FakeKeyringModule.java
diff --git a/javatests/google/registry/testing/FakeLockHandler.java b/core/src/test/java/google/registry/testing/FakeLockHandler.java
similarity index 100%
rename from javatests/google/registry/testing/FakeLockHandler.java
rename to core/src/test/java/google/registry/testing/FakeLockHandler.java
diff --git a/javatests/google/registry/testing/FakeOAuthService.java b/core/src/test/java/google/registry/testing/FakeOAuthService.java
similarity index 100%
rename from javatests/google/registry/testing/FakeOAuthService.java
rename to core/src/test/java/google/registry/testing/FakeOAuthService.java
diff --git a/javatests/google/registry/testing/FakeResponse.java b/core/src/test/java/google/registry/testing/FakeResponse.java
similarity index 100%
rename from javatests/google/registry/testing/FakeResponse.java
rename to core/src/test/java/google/registry/testing/FakeResponse.java
diff --git a/javatests/google/registry/testing/FakeServletInputStream.java b/core/src/test/java/google/registry/testing/FakeServletInputStream.java
similarity index 100%
rename from javatests/google/registry/testing/FakeServletInputStream.java
rename to core/src/test/java/google/registry/testing/FakeServletInputStream.java
diff --git a/javatests/google/registry/testing/FakeServletOutputStream.java b/core/src/test/java/google/registry/testing/FakeServletOutputStream.java
similarity index 100%
rename from javatests/google/registry/testing/FakeServletOutputStream.java
rename to core/src/test/java/google/registry/testing/FakeServletOutputStream.java
diff --git a/javatests/google/registry/testing/FakeSleeper.java b/core/src/test/java/google/registry/testing/FakeSleeper.java
similarity index 100%
rename from javatests/google/registry/testing/FakeSleeper.java
rename to core/src/test/java/google/registry/testing/FakeSleeper.java
diff --git a/javatests/google/registry/testing/FakeURLFetchService.java b/core/src/test/java/google/registry/testing/FakeURLFetchService.java
similarity index 100%
rename from javatests/google/registry/testing/FakeURLFetchService.java
rename to core/src/test/java/google/registry/testing/FakeURLFetchService.java
diff --git a/javatests/google/registry/testing/FakeUserService.java b/core/src/test/java/google/registry/testing/FakeUserService.java
similarity index 100%
rename from javatests/google/registry/testing/FakeUserService.java
rename to core/src/test/java/google/registry/testing/FakeUserService.java
diff --git a/javatests/google/registry/testing/ForwardingURLFetchService.java b/core/src/test/java/google/registry/testing/ForwardingURLFetchService.java
similarity index 100%
rename from javatests/google/registry/testing/ForwardingURLFetchService.java
rename to core/src/test/java/google/registry/testing/ForwardingURLFetchService.java
diff --git a/javatests/google/registry/testing/FullFieldsTestEntityHelper.java b/core/src/test/java/google/registry/testing/FullFieldsTestEntityHelper.java
similarity index 100%
rename from javatests/google/registry/testing/FullFieldsTestEntityHelper.java
rename to core/src/test/java/google/registry/testing/FullFieldsTestEntityHelper.java
diff --git a/javatests/google/registry/testing/GcsTestingUtils.java b/core/src/test/java/google/registry/testing/GcsTestingUtils.java
similarity index 100%
rename from javatests/google/registry/testing/GcsTestingUtils.java
rename to core/src/test/java/google/registry/testing/GcsTestingUtils.java
diff --git a/javatests/google/registry/testing/GenericEppResourceSubject.java b/core/src/test/java/google/registry/testing/GenericEppResourceSubject.java
similarity index 100%
rename from javatests/google/registry/testing/GenericEppResourceSubject.java
rename to core/src/test/java/google/registry/testing/GenericEppResourceSubject.java
diff --git a/javatests/google/registry/testing/GoldenFileTestHelper.java b/core/src/test/java/google/registry/testing/GoldenFileTestHelper.java
similarity index 100%
rename from javatests/google/registry/testing/GoldenFileTestHelper.java
rename to core/src/test/java/google/registry/testing/GoldenFileTestHelper.java
diff --git a/javatests/google/registry/testing/GpgSystemCommandRule.java b/core/src/test/java/google/registry/testing/GpgSystemCommandRule.java
similarity index 100%
rename from javatests/google/registry/testing/GpgSystemCommandRule.java
rename to core/src/test/java/google/registry/testing/GpgSystemCommandRule.java
diff --git a/javatests/google/registry/testing/HistoryEntrySubject.java b/core/src/test/java/google/registry/testing/HistoryEntrySubject.java
similarity index 100%
rename from javatests/google/registry/testing/HistoryEntrySubject.java
rename to core/src/test/java/google/registry/testing/HistoryEntrySubject.java
diff --git a/javatests/google/registry/testing/HostResourceSubject.java b/core/src/test/java/google/registry/testing/HostResourceSubject.java
similarity index 100%
rename from javatests/google/registry/testing/HostResourceSubject.java
rename to core/src/test/java/google/registry/testing/HostResourceSubject.java
diff --git a/javatests/google/registry/testing/InjectRule.java b/core/src/test/java/google/registry/testing/InjectRule.java
similarity index 100%
rename from javatests/google/registry/testing/InjectRule.java
rename to core/src/test/java/google/registry/testing/InjectRule.java
diff --git a/javatests/google/registry/testing/Lazies.java b/core/src/test/java/google/registry/testing/Lazies.java
similarity index 100%
rename from javatests/google/registry/testing/Lazies.java
rename to core/src/test/java/google/registry/testing/Lazies.java
diff --git a/javatests/google/registry/testing/LogsSubject.java b/core/src/test/java/google/registry/testing/LogsSubject.java
similarity index 100%
rename from javatests/google/registry/testing/LogsSubject.java
rename to core/src/test/java/google/registry/testing/LogsSubject.java
diff --git a/javatests/google/registry/testing/ReflectiveFieldExtractor.java b/core/src/test/java/google/registry/testing/ReflectiveFieldExtractor.java
similarity index 100%
rename from javatests/google/registry/testing/ReflectiveFieldExtractor.java
rename to core/src/test/java/google/registry/testing/ReflectiveFieldExtractor.java
diff --git a/javatests/google/registry/testing/ShardableTestCase.java b/core/src/test/java/google/registry/testing/ShardableTestCase.java
similarity index 100%
rename from javatests/google/registry/testing/ShardableTestCase.java
rename to core/src/test/java/google/registry/testing/ShardableTestCase.java
diff --git a/javatests/google/registry/testing/SlurpAnswer.java b/core/src/test/java/google/registry/testing/SlurpAnswer.java
similarity index 100%
rename from javatests/google/registry/testing/SlurpAnswer.java
rename to core/src/test/java/google/registry/testing/SlurpAnswer.java
diff --git a/javatests/google/registry/testing/SystemInfo.java b/core/src/test/java/google/registry/testing/SystemInfo.java
similarity index 100%
rename from javatests/google/registry/testing/SystemInfo.java
rename to core/src/test/java/google/registry/testing/SystemInfo.java
diff --git a/javatests/google/registry/testing/SystemPropertyRule.java b/core/src/test/java/google/registry/testing/SystemPropertyRule.java
similarity index 100%
rename from javatests/google/registry/testing/SystemPropertyRule.java
rename to core/src/test/java/google/registry/testing/SystemPropertyRule.java
diff --git a/javatests/google/registry/testing/TaskQueueHelper.java b/core/src/test/java/google/registry/testing/TaskQueueHelper.java
similarity index 100%
rename from javatests/google/registry/testing/TaskQueueHelper.java
rename to core/src/test/java/google/registry/testing/TaskQueueHelper.java
diff --git a/javatests/google/registry/testing/TestCacheRule.java b/core/src/test/java/google/registry/testing/TestCacheRule.java
similarity index 100%
rename from javatests/google/registry/testing/TestCacheRule.java
rename to core/src/test/java/google/registry/testing/TestCacheRule.java
diff --git a/javatests/google/registry/testing/TestDataHelper.java b/core/src/test/java/google/registry/testing/TestDataHelper.java
similarity index 100%
rename from javatests/google/registry/testing/TestDataHelper.java
rename to core/src/test/java/google/registry/testing/TestDataHelper.java
diff --git a/javatests/google/registry/testing/TestLogHandlerUtils.java b/core/src/test/java/google/registry/testing/TestLogHandlerUtils.java
similarity index 100%
rename from javatests/google/registry/testing/TestLogHandlerUtils.java
rename to core/src/test/java/google/registry/testing/TestLogHandlerUtils.java
diff --git a/javatests/google/registry/testing/TestObject.java b/core/src/test/java/google/registry/testing/TestObject.java
similarity index 100%
rename from javatests/google/registry/testing/TestObject.java
rename to core/src/test/java/google/registry/testing/TestObject.java
diff --git a/javatests/google/registry/testing/TruthChainer.java b/core/src/test/java/google/registry/testing/TruthChainer.java
similarity index 100%
rename from javatests/google/registry/testing/TruthChainer.java
rename to core/src/test/java/google/registry/testing/TruthChainer.java
diff --git a/javatests/google/registry/testing/UriParameters.java b/core/src/test/java/google/registry/testing/UriParameters.java
similarity index 100%
rename from javatests/google/registry/testing/UriParameters.java
rename to core/src/test/java/google/registry/testing/UriParameters.java
diff --git a/javatests/google/registry/testing/UserInfo.java b/core/src/test/java/google/registry/testing/UserInfo.java
similarity index 100%
rename from javatests/google/registry/testing/UserInfo.java
rename to core/src/test/java/google/registry/testing/UserInfo.java
diff --git a/javatests/google/registry/testing/default_premium_list_testdata.csv b/core/src/test/java/google/registry/testing/default_premium_list_testdata.csv
similarity index 100%
rename from javatests/google/registry/testing/default_premium_list_testdata.csv
rename to core/src/test/java/google/registry/testing/default_premium_list_testdata.csv
diff --git a/javatests/google/registry/testing/logging.properties b/core/src/test/java/google/registry/testing/logging.properties
similarity index 100%
rename from javatests/google/registry/testing/logging.properties
rename to core/src/test/java/google/registry/testing/logging.properties
diff --git a/javatests/google/registry/testing/mapreduce/BUILD b/core/src/test/java/google/registry/testing/mapreduce/BUILD
similarity index 100%
rename from javatests/google/registry/testing/mapreduce/BUILD
rename to core/src/test/java/google/registry/testing/mapreduce/BUILD
diff --git a/javatests/google/registry/testing/mapreduce/MapreduceTestCase.java b/core/src/test/java/google/registry/testing/mapreduce/MapreduceTestCase.java
similarity index 100%
rename from javatests/google/registry/testing/mapreduce/MapreduceTestCase.java
rename to core/src/test/java/google/registry/testing/mapreduce/MapreduceTestCase.java
diff --git a/javatests/google/registry/testing/package-info.java b/core/src/test/java/google/registry/testing/package-info.java
similarity index 100%
rename from javatests/google/registry/testing/package-info.java
rename to core/src/test/java/google/registry/testing/package-info.java
diff --git a/javatests/google/registry/testing/sftp/BUILD b/core/src/test/java/google/registry/testing/sftp/BUILD
similarity index 100%
rename from javatests/google/registry/testing/sftp/BUILD
rename to core/src/test/java/google/registry/testing/sftp/BUILD
diff --git a/javatests/google/registry/testing/sftp/SftpServerRule.java b/core/src/test/java/google/registry/testing/sftp/SftpServerRule.java
similarity index 100%
rename from javatests/google/registry/testing/sftp/SftpServerRule.java
rename to core/src/test/java/google/registry/testing/sftp/SftpServerRule.java
diff --git a/javatests/google/registry/testing/sftp/TestSftpServer.java b/core/src/test/java/google/registry/testing/sftp/TestSftpServer.java
similarity index 100%
rename from javatests/google/registry/testing/sftp/TestSftpServer.java
rename to core/src/test/java/google/registry/testing/sftp/TestSftpServer.java
diff --git a/javatests/google/registry/testing/testdata/pgp-private-keyring-registry.asc b/core/src/test/java/google/registry/testing/testdata/pgp-private-keyring-registry.asc
similarity index 100%
rename from javatests/google/registry/testing/testdata/pgp-private-keyring-registry.asc
rename to core/src/test/java/google/registry/testing/testdata/pgp-private-keyring-registry.asc
diff --git a/javatests/google/registry/testing/testdata/pgp-public-keyring.asc b/core/src/test/java/google/registry/testing/testdata/pgp-public-keyring.asc
similarity index 100%
rename from javatests/google/registry/testing/testdata/pgp-public-keyring.asc
rename to core/src/test/java/google/registry/testing/testdata/pgp-public-keyring.asc
diff --git a/javatests/google/registry/testing/testdata/registry-unittest.id_rsa b/core/src/test/java/google/registry/testing/testdata/registry-unittest.id_rsa
similarity index 100%
rename from javatests/google/registry/testing/testdata/registry-unittest.id_rsa
rename to core/src/test/java/google/registry/testing/testdata/registry-unittest.id_rsa
diff --git a/javatests/google/registry/testing/testdata/registry-unittest.id_rsa.pub b/core/src/test/java/google/registry/testing/testdata/registry-unittest.id_rsa.pub
similarity index 100%
rename from javatests/google/registry/testing/testdata/registry-unittest.id_rsa.pub
rename to core/src/test/java/google/registry/testing/testdata/registry-unittest.id_rsa.pub
diff --git a/javatests/google/registry/tldconfig/idn/BUILD b/core/src/test/java/google/registry/tldconfig/idn/BUILD
similarity index 100%
rename from javatests/google/registry/tldconfig/idn/BUILD
rename to core/src/test/java/google/registry/tldconfig/idn/BUILD
diff --git a/javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java b/core/src/test/java/google/registry/tldconfig/idn/IdnLabelValidatorTest.java
similarity index 100%
rename from javatests/google/registry/tldconfig/idn/IdnLabelValidatorTest.java
rename to core/src/test/java/google/registry/tldconfig/idn/IdnLabelValidatorTest.java
diff --git a/javatests/google/registry/tldconfig/idn/IdnTableTest.java b/core/src/test/java/google/registry/tldconfig/idn/IdnTableTest.java
similarity index 100%
rename from javatests/google/registry/tldconfig/idn/IdnTableTest.java
rename to core/src/test/java/google/registry/tldconfig/idn/IdnTableTest.java
diff --git a/javatests/google/registry/tmch/BUILD b/core/src/test/java/google/registry/tmch/BUILD
similarity index 100%
rename from javatests/google/registry/tmch/BUILD
rename to core/src/test/java/google/registry/tmch/BUILD
diff --git a/javatests/google/registry/tmch/LordnLogTest.java b/core/src/test/java/google/registry/tmch/LordnLogTest.java
similarity index 100%
rename from javatests/google/registry/tmch/LordnLogTest.java
rename to core/src/test/java/google/registry/tmch/LordnLogTest.java
diff --git a/javatests/google/registry/tmch/LordnTaskUtilsTest.java b/core/src/test/java/google/registry/tmch/LordnTaskUtilsTest.java
similarity index 100%
rename from javatests/google/registry/tmch/LordnTaskUtilsTest.java
rename to core/src/test/java/google/registry/tmch/LordnTaskUtilsTest.java
diff --git a/javatests/google/registry/tmch/NordnUploadActionTest.java b/core/src/test/java/google/registry/tmch/NordnUploadActionTest.java
similarity index 100%
rename from javatests/google/registry/tmch/NordnUploadActionTest.java
rename to core/src/test/java/google/registry/tmch/NordnUploadActionTest.java
diff --git a/javatests/google/registry/tmch/NordnVerifyActionTest.java b/core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java
similarity index 100%
rename from javatests/google/registry/tmch/NordnVerifyActionTest.java
rename to core/src/test/java/google/registry/tmch/NordnVerifyActionTest.java
diff --git a/javatests/google/registry/tmch/SmdrlCsvParserTest.java b/core/src/test/java/google/registry/tmch/SmdrlCsvParserTest.java
similarity index 100%
rename from javatests/google/registry/tmch/SmdrlCsvParserTest.java
rename to core/src/test/java/google/registry/tmch/SmdrlCsvParserTest.java
diff --git a/javatests/google/registry/tmch/TmchActionTestCase.java b/core/src/test/java/google/registry/tmch/TmchActionTestCase.java
similarity index 100%
rename from javatests/google/registry/tmch/TmchActionTestCase.java
rename to core/src/test/java/google/registry/tmch/TmchActionTestCase.java
diff --git a/javatests/google/registry/tmch/TmchCertificateAuthorityTest.java b/core/src/test/java/google/registry/tmch/TmchCertificateAuthorityTest.java
similarity index 100%
rename from javatests/google/registry/tmch/TmchCertificateAuthorityTest.java
rename to core/src/test/java/google/registry/tmch/TmchCertificateAuthorityTest.java
diff --git a/javatests/google/registry/tmch/TmchCrlActionTest.java b/core/src/test/java/google/registry/tmch/TmchCrlActionTest.java
similarity index 100%
rename from javatests/google/registry/tmch/TmchCrlActionTest.java
rename to core/src/test/java/google/registry/tmch/TmchCrlActionTest.java
diff --git a/javatests/google/registry/tmch/TmchDnlActionTest.java b/core/src/test/java/google/registry/tmch/TmchDnlActionTest.java
similarity index 100%
rename from javatests/google/registry/tmch/TmchDnlActionTest.java
rename to core/src/test/java/google/registry/tmch/TmchDnlActionTest.java
diff --git a/javatests/google/registry/tmch/TmchSmdrlActionTest.java b/core/src/test/java/google/registry/tmch/TmchSmdrlActionTest.java
similarity index 100%
rename from javatests/google/registry/tmch/TmchSmdrlActionTest.java
rename to core/src/test/java/google/registry/tmch/TmchSmdrlActionTest.java
diff --git a/javatests/google/registry/tmch/TmchTestData.java b/core/src/test/java/google/registry/tmch/TmchTestData.java
similarity index 100%
rename from javatests/google/registry/tmch/TmchTestData.java
rename to core/src/test/java/google/registry/tmch/TmchTestData.java
diff --git a/javatests/google/registry/tmch/TmchTestDataExpirationTest.java b/core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java
similarity index 100%
rename from javatests/google/registry/tmch/TmchTestDataExpirationTest.java
rename to core/src/test/java/google/registry/tmch/TmchTestDataExpirationTest.java
diff --git a/javatests/google/registry/tmch/TmchTestSuite.java b/core/src/test/java/google/registry/tmch/TmchTestSuite.java
similarity index 100%
rename from javatests/google/registry/tmch/TmchTestSuite.java
rename to core/src/test/java/google/registry/tmch/TmchTestSuite.java
diff --git a/javatests/google/registry/tmch/TmchXmlSignatureTest.java b/core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java
similarity index 100%
rename from javatests/google/registry/tmch/TmchXmlSignatureTest.java
rename to core/src/test/java/google/registry/tmch/TmchXmlSignatureTest.java
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Agent-Arab-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Arab-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Agent-Arab-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Arab-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Chinese-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Agent-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Agent-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Agent-French-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-French-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Agent-French-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-French-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Agent-Russian-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Holder-Arab-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Arab-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Holder-Arab-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Arab-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Chinese-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Holder-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Holder-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Holder-French-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-French-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Holder-French-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-French-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Court-Holder-Russian-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Agent-Arab-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Arab-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Agent-Arab-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Arab-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Chinese-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-French-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Agent-Russian-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Holder-Arab-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Arab-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Holder-Arab-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Arab-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Chinese-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-French-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/Trademark-Holder-Russian-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Arab-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Arab-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Arab-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Arab-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Chinese-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-French-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Agent-Russian-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Arab-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Arab-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Arab-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Arab-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Chinese-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-French-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd b/core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/active/TreatyStatute-Holder-Russian-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/dnl-latest.csv b/core/src/test/java/google/registry/tmch/testdata/dnl-latest.csv
similarity index 100%
rename from javatests/google/registry/tmch/testdata/dnl-latest.csv
rename to core/src/test/java/google/registry/tmch/testdata/dnl-latest.csv
diff --git a/javatests/google/registry/tmch/testdata/dnl-latest.sig b/core/src/test/java/google/registry/tmch/testdata/dnl-latest.sig
similarity index 100%
rename from javatests/google/registry/tmch/testdata/dnl-latest.sig
rename to core/src/test/java/google/registry/tmch/testdata/dnl-latest.sig
diff --git a/javatests/google/registry/tmch/testdata/icann-tmch-pilot-old.crl b/core/src/test/java/google/registry/tmch/testdata/icann-tmch-pilot-old.crl
similarity index 100%
rename from javatests/google/registry/tmch/testdata/icann-tmch-pilot-old.crl
rename to core/src/test/java/google/registry/tmch/testdata/icann-tmch-pilot-old.crl
diff --git a/javatests/google/registry/tmch/testdata/icann-tmch-test-good.crt b/core/src/test/java/google/registry/tmch/testdata/icann-tmch-test-good.crt
similarity index 100%
rename from javatests/google/registry/tmch/testdata/icann-tmch-test-good.crt
rename to core/src/test/java/google/registry/tmch/testdata/icann-tmch-test-good.crt
diff --git a/javatests/google/registry/tmch/testdata/icann-tmch-test-revoked.crt b/core/src/test/java/google/registry/tmch/testdata/icann-tmch-test-revoked.crt
similarity index 100%
rename from javatests/google/registry/tmch/testdata/icann-tmch-test-revoked.crt
rename to core/src/test/java/google/registry/tmch/testdata/icann-tmch-test-revoked.crt
diff --git a/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd b/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Court-Agent-French-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd b/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-Trademark-Agent-Russian-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-Chinese-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/invalid/InvalidSignature-TreatyStatute-Agent-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/pubkey b/core/src/test/java/google/registry/tmch/testdata/pubkey
similarity index 100%
rename from javatests/google/registry/tmch/testdata/pubkey
rename to core/src/test/java/google/registry/tmch/testdata/pubkey
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Arab-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Arab-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Arab-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Arab-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Chinese-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-English-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-French-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Agent-Russian-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Arab-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Arab-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Arab-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Arab-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Chinese-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-English-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-French-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Court-Holder-Russian-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arab-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arab-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arab-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Arab-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Chinese-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-English-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-French-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Agent-Russian-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arab-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arab-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arab-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Arab-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Chinese-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-English-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-French-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/Trademark-Holder-Russian-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Arab-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Chinese-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-English-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-French-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Agent-Russian-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Arab-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Chinese-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-English-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-French-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/smd/TreatyStatute-Holder-Russian-Revoked.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Court-Agent-French-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Arab-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Chinese-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-French-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-Trademark-Agent-Russian-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-Chinese-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd b/core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd
similarity index 100%
rename from javatests/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd
rename to core/src/test/java/google/registry/tmch/testdata/revoked/tmv/TMVRevoked-TreatyStatute-Agent-English-Active.smd
diff --git a/javatests/google/registry/tmch/testdata/smdrl-latest.csv b/core/src/test/java/google/registry/tmch/testdata/smdrl-latest.csv
similarity index 100%
rename from javatests/google/registry/tmch/testdata/smdrl-latest.csv
rename to core/src/test/java/google/registry/tmch/testdata/smdrl-latest.csv
diff --git a/javatests/google/registry/tmch/testdata/smdrl-latest.sig b/core/src/test/java/google/registry/tmch/testdata/smdrl-latest.sig
similarity index 100%
rename from javatests/google/registry/tmch/testdata/smdrl-latest.sig
rename to core/src/test/java/google/registry/tmch/testdata/smdrl-latest.sig
diff --git a/javatests/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv b/core/src/test/java/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv
similarity index 100%
rename from javatests/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv
rename to core/src/test/java/google/registry/tmch/testdata/tmch_test_smd_revocation_list.csv
diff --git a/javatests/google/registry/tools/AckPollMessagesCommandTest.java b/core/src/test/java/google/registry/tools/AckPollMessagesCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/AckPollMessagesCommandTest.java
rename to core/src/test/java/google/registry/tools/AckPollMessagesCommandTest.java
diff --git a/javatests/google/registry/tools/AppEngineConnectionTest.java b/core/src/test/java/google/registry/tools/AppEngineConnectionTest.java
similarity index 100%
rename from javatests/google/registry/tools/AppEngineConnectionTest.java
rename to core/src/test/java/google/registry/tools/AppEngineConnectionTest.java
diff --git a/javatests/google/registry/tools/AuthModuleTest.java b/core/src/test/java/google/registry/tools/AuthModuleTest.java
similarity index 100%
rename from javatests/google/registry/tools/AuthModuleTest.java
rename to core/src/test/java/google/registry/tools/AuthModuleTest.java
diff --git a/javatests/google/registry/tools/BUILD b/core/src/test/java/google/registry/tools/BUILD
similarity index 100%
rename from javatests/google/registry/tools/BUILD
rename to core/src/test/java/google/registry/tools/BUILD
diff --git a/javatests/google/registry/tools/CheckDomainClaimsCommandTest.java b/core/src/test/java/google/registry/tools/CheckDomainClaimsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CheckDomainClaimsCommandTest.java
rename to core/src/test/java/google/registry/tools/CheckDomainClaimsCommandTest.java
diff --git a/javatests/google/registry/tools/CheckDomainCommandTest.java b/core/src/test/java/google/registry/tools/CheckDomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CheckDomainCommandTest.java
rename to core/src/test/java/google/registry/tools/CheckDomainCommandTest.java
diff --git a/javatests/google/registry/tools/CommandTestCase.java b/core/src/test/java/google/registry/tools/CommandTestCase.java
similarity index 100%
rename from javatests/google/registry/tools/CommandTestCase.java
rename to core/src/test/java/google/registry/tools/CommandTestCase.java
diff --git a/javatests/google/registry/tools/ComparableEntityTest.java b/core/src/test/java/google/registry/tools/ComparableEntityTest.java
similarity index 100%
rename from javatests/google/registry/tools/ComparableEntityTest.java
rename to core/src/test/java/google/registry/tools/ComparableEntityTest.java
diff --git a/javatests/google/registry/tools/CompareDbBackupsTest.java b/core/src/test/java/google/registry/tools/CompareDbBackupsTest.java
similarity index 100%
rename from javatests/google/registry/tools/CompareDbBackupsTest.java
rename to core/src/test/java/google/registry/tools/CompareDbBackupsTest.java
diff --git a/javatests/google/registry/tools/CountDomainsCommandTest.java b/core/src/test/java/google/registry/tools/CountDomainsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CountDomainsCommandTest.java
rename to core/src/test/java/google/registry/tools/CountDomainsCommandTest.java
diff --git a/javatests/google/registry/tools/CreateAnchorTenantCommandTest.java b/core/src/test/java/google/registry/tools/CreateAnchorTenantCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreateAnchorTenantCommandTest.java
rename to core/src/test/java/google/registry/tools/CreateAnchorTenantCommandTest.java
diff --git a/javatests/google/registry/tools/CreateCdnsTldTest.java b/core/src/test/java/google/registry/tools/CreateCdnsTldTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreateCdnsTldTest.java
rename to core/src/test/java/google/registry/tools/CreateCdnsTldTest.java
diff --git a/javatests/google/registry/tools/CreateContactCommandTest.java b/core/src/test/java/google/registry/tools/CreateContactCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreateContactCommandTest.java
rename to core/src/test/java/google/registry/tools/CreateContactCommandTest.java
diff --git a/javatests/google/registry/tools/CreateDomainCommandTest.java b/core/src/test/java/google/registry/tools/CreateDomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreateDomainCommandTest.java
rename to core/src/test/java/google/registry/tools/CreateDomainCommandTest.java
diff --git a/javatests/google/registry/tools/CreateHostCommandTest.java b/core/src/test/java/google/registry/tools/CreateHostCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreateHostCommandTest.java
rename to core/src/test/java/google/registry/tools/CreateHostCommandTest.java
diff --git a/javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java b/core/src/test/java/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java
similarity index 100%
rename from javatests/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java
rename to core/src/test/java/google/registry/tools/CreateOrUpdatePremiumListCommandTestCase.java
diff --git a/javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java b/core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java
similarity index 100%
rename from javatests/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java
rename to core/src/test/java/google/registry/tools/CreateOrUpdateReservedListCommandTestCase.java
diff --git a/javatests/google/registry/tools/CreatePremiumListCommandTest.java b/core/src/test/java/google/registry/tools/CreatePremiumListCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreatePremiumListCommandTest.java
rename to core/src/test/java/google/registry/tools/CreatePremiumListCommandTest.java
diff --git a/javatests/google/registry/tools/CreateRegistrarCommandTest.java b/core/src/test/java/google/registry/tools/CreateRegistrarCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreateRegistrarCommandTest.java
rename to core/src/test/java/google/registry/tools/CreateRegistrarCommandTest.java
diff --git a/javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java b/core/src/test/java/google/registry/tools/CreateRegistrarGroupsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreateRegistrarGroupsCommandTest.java
rename to core/src/test/java/google/registry/tools/CreateRegistrarGroupsCommandTest.java
diff --git a/javatests/google/registry/tools/CreateReservedListCommandTest.java b/core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreateReservedListCommandTest.java
rename to core/src/test/java/google/registry/tools/CreateReservedListCommandTest.java
diff --git a/javatests/google/registry/tools/CreateTldCommandTest.java b/core/src/test/java/google/registry/tools/CreateTldCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CreateTldCommandTest.java
rename to core/src/test/java/google/registry/tools/CreateTldCommandTest.java
diff --git a/javatests/google/registry/tools/CurlCommandTest.java b/core/src/test/java/google/registry/tools/CurlCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/CurlCommandTest.java
rename to core/src/test/java/google/registry/tools/CurlCommandTest.java
diff --git a/javatests/google/registry/tools/DeleteAllocationTokensCommandTest.java b/core/src/test/java/google/registry/tools/DeleteAllocationTokensCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/DeleteAllocationTokensCommandTest.java
rename to core/src/test/java/google/registry/tools/DeleteAllocationTokensCommandTest.java
diff --git a/javatests/google/registry/tools/DeleteDomainCommandTest.java b/core/src/test/java/google/registry/tools/DeleteDomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/DeleteDomainCommandTest.java
rename to core/src/test/java/google/registry/tools/DeleteDomainCommandTest.java
diff --git a/javatests/google/registry/tools/DeleteHostCommandTest.java b/core/src/test/java/google/registry/tools/DeleteHostCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/DeleteHostCommandTest.java
rename to core/src/test/java/google/registry/tools/DeleteHostCommandTest.java
diff --git a/javatests/google/registry/tools/DeletePremiumListCommandTest.java b/core/src/test/java/google/registry/tools/DeletePremiumListCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/DeletePremiumListCommandTest.java
rename to core/src/test/java/google/registry/tools/DeletePremiumListCommandTest.java
diff --git a/javatests/google/registry/tools/DeleteReservedListCommandTest.java b/core/src/test/java/google/registry/tools/DeleteReservedListCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/DeleteReservedListCommandTest.java
rename to core/src/test/java/google/registry/tools/DeleteReservedListCommandTest.java
diff --git a/javatests/google/registry/tools/DeleteTldCommandTest.java b/core/src/test/java/google/registry/tools/DeleteTldCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/DeleteTldCommandTest.java
rename to core/src/test/java/google/registry/tools/DeleteTldCommandTest.java
diff --git a/javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java b/core/src/test/java/google/registry/tools/EncryptEscrowDepositCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/EncryptEscrowDepositCommandTest.java
rename to core/src/test/java/google/registry/tools/EncryptEscrowDepositCommandTest.java
diff --git a/javatests/google/registry/tools/EppLifecycleToolsTest.java b/core/src/test/java/google/registry/tools/EppLifecycleToolsTest.java
similarity index 100%
rename from javatests/google/registry/tools/EppLifecycleToolsTest.java
rename to core/src/test/java/google/registry/tools/EppLifecycleToolsTest.java
diff --git a/javatests/google/registry/tools/EppToolCommandTest.java b/core/src/test/java/google/registry/tools/EppToolCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/EppToolCommandTest.java
rename to core/src/test/java/google/registry/tools/EppToolCommandTest.java
diff --git a/javatests/google/registry/tools/EppToolCommandTestCase.java b/core/src/test/java/google/registry/tools/EppToolCommandTestCase.java
similarity index 100%
rename from javatests/google/registry/tools/EppToolCommandTestCase.java
rename to core/src/test/java/google/registry/tools/EppToolCommandTestCase.java
diff --git a/javatests/google/registry/tools/EppToolVerifier.java b/core/src/test/java/google/registry/tools/EppToolVerifier.java
similarity index 100%
rename from javatests/google/registry/tools/EppToolVerifier.java
rename to core/src/test/java/google/registry/tools/EppToolVerifier.java
diff --git a/javatests/google/registry/tools/ExecuteEppCommandTest.java b/core/src/test/java/google/registry/tools/ExecuteEppCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ExecuteEppCommandTest.java
rename to core/src/test/java/google/registry/tools/ExecuteEppCommandTest.java
diff --git a/javatests/google/registry/tools/GenerateAllocationTokensCommandTest.java b/core/src/test/java/google/registry/tools/GenerateAllocationTokensCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GenerateAllocationTokensCommandTest.java
rename to core/src/test/java/google/registry/tools/GenerateAllocationTokensCommandTest.java
diff --git a/javatests/google/registry/tools/GenerateDnsReportCommandTest.java b/core/src/test/java/google/registry/tools/GenerateDnsReportCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GenerateDnsReportCommandTest.java
rename to core/src/test/java/google/registry/tools/GenerateDnsReportCommandTest.java
diff --git a/javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java b/core/src/test/java/google/registry/tools/GenerateEscrowDepositCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GenerateEscrowDepositCommandTest.java
rename to core/src/test/java/google/registry/tools/GenerateEscrowDepositCommandTest.java
diff --git a/javatests/google/registry/tools/GetAllocationTokenCommandTest.java b/core/src/test/java/google/registry/tools/GetAllocationTokenCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetAllocationTokenCommandTest.java
rename to core/src/test/java/google/registry/tools/GetAllocationTokenCommandTest.java
diff --git a/javatests/google/registry/tools/GetClaimsListCommandTest.java b/core/src/test/java/google/registry/tools/GetClaimsListCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetClaimsListCommandTest.java
rename to core/src/test/java/google/registry/tools/GetClaimsListCommandTest.java
diff --git a/javatests/google/registry/tools/GetContactCommandTest.java b/core/src/test/java/google/registry/tools/GetContactCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetContactCommandTest.java
rename to core/src/test/java/google/registry/tools/GetContactCommandTest.java
diff --git a/javatests/google/registry/tools/GetDomainCommandTest.java b/core/src/test/java/google/registry/tools/GetDomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetDomainCommandTest.java
rename to core/src/test/java/google/registry/tools/GetDomainCommandTest.java
diff --git a/javatests/google/registry/tools/GetHistoryEntriesCommandTest.java b/core/src/test/java/google/registry/tools/GetHistoryEntriesCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetHistoryEntriesCommandTest.java
rename to core/src/test/java/google/registry/tools/GetHistoryEntriesCommandTest.java
diff --git a/javatests/google/registry/tools/GetHostCommandTest.java b/core/src/test/java/google/registry/tools/GetHostCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetHostCommandTest.java
rename to core/src/test/java/google/registry/tools/GetHostCommandTest.java
diff --git a/javatests/google/registry/tools/GetOperationStatusCommandTest.java b/core/src/test/java/google/registry/tools/GetOperationStatusCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetOperationStatusCommandTest.java
rename to core/src/test/java/google/registry/tools/GetOperationStatusCommandTest.java
diff --git a/javatests/google/registry/tools/GetRegistrarCommandTest.java b/core/src/test/java/google/registry/tools/GetRegistrarCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetRegistrarCommandTest.java
rename to core/src/test/java/google/registry/tools/GetRegistrarCommandTest.java
diff --git a/javatests/google/registry/tools/GetResourceByKeyCommandTest.java b/core/src/test/java/google/registry/tools/GetResourceByKeyCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetResourceByKeyCommandTest.java
rename to core/src/test/java/google/registry/tools/GetResourceByKeyCommandTest.java
diff --git a/javatests/google/registry/tools/GetSchemaTreeCommandTest.java b/core/src/test/java/google/registry/tools/GetSchemaTreeCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetSchemaTreeCommandTest.java
rename to core/src/test/java/google/registry/tools/GetSchemaTreeCommandTest.java
diff --git a/javatests/google/registry/tools/GetTldCommandTest.java b/core/src/test/java/google/registry/tools/GetTldCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GetTldCommandTest.java
rename to core/src/test/java/google/registry/tools/GetTldCommandTest.java
diff --git a/javatests/google/registry/tools/GhostrydeCommandTest.java b/core/src/test/java/google/registry/tools/GhostrydeCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/GhostrydeCommandTest.java
rename to core/src/test/java/google/registry/tools/GhostrydeCommandTest.java
diff --git a/javatests/google/registry/tools/GtechToolTest.java b/core/src/test/java/google/registry/tools/GtechToolTest.java
similarity index 100%
rename from javatests/google/registry/tools/GtechToolTest.java
rename to core/src/test/java/google/registry/tools/GtechToolTest.java
diff --git a/javatests/google/registry/tools/ImportDatastoreCommandTest.java b/core/src/test/java/google/registry/tools/ImportDatastoreCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ImportDatastoreCommandTest.java
rename to core/src/test/java/google/registry/tools/ImportDatastoreCommandTest.java
diff --git a/javatests/google/registry/tools/LevelDbFileBuilder.java b/core/src/test/java/google/registry/tools/LevelDbFileBuilder.java
similarity index 100%
rename from javatests/google/registry/tools/LevelDbFileBuilder.java
rename to core/src/test/java/google/registry/tools/LevelDbFileBuilder.java
diff --git a/javatests/google/registry/tools/LevelDbFileBuilderTest.java b/core/src/test/java/google/registry/tools/LevelDbFileBuilderTest.java
similarity index 100%
rename from javatests/google/registry/tools/LevelDbFileBuilderTest.java
rename to core/src/test/java/google/registry/tools/LevelDbFileBuilderTest.java
diff --git a/javatests/google/registry/tools/LevelDbLogReaderTest.java b/core/src/test/java/google/registry/tools/LevelDbLogReaderTest.java
similarity index 100%
rename from javatests/google/registry/tools/LevelDbLogReaderTest.java
rename to core/src/test/java/google/registry/tools/LevelDbLogReaderTest.java
diff --git a/javatests/google/registry/tools/LevelDbUtil.java b/core/src/test/java/google/registry/tools/LevelDbUtil.java
similarity index 100%
rename from javatests/google/registry/tools/LevelDbUtil.java
rename to core/src/test/java/google/registry/tools/LevelDbUtil.java
diff --git a/javatests/google/registry/tools/ListCursorsCommandTest.java b/core/src/test/java/google/registry/tools/ListCursorsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ListCursorsCommandTest.java
rename to core/src/test/java/google/registry/tools/ListCursorsCommandTest.java
diff --git a/javatests/google/registry/tools/ListDatastoreOperationsCommandTest.java b/core/src/test/java/google/registry/tools/ListDatastoreOperationsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ListDatastoreOperationsCommandTest.java
rename to core/src/test/java/google/registry/tools/ListDatastoreOperationsCommandTest.java
diff --git a/javatests/google/registry/tools/ListDomainsCommandTest.java b/core/src/test/java/google/registry/tools/ListDomainsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ListDomainsCommandTest.java
rename to core/src/test/java/google/registry/tools/ListDomainsCommandTest.java
diff --git a/javatests/google/registry/tools/ListHostsCommandTest.java b/core/src/test/java/google/registry/tools/ListHostsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ListHostsCommandTest.java
rename to core/src/test/java/google/registry/tools/ListHostsCommandTest.java
diff --git a/javatests/google/registry/tools/ListObjectsCommandTestCase.java b/core/src/test/java/google/registry/tools/ListObjectsCommandTestCase.java
similarity index 100%
rename from javatests/google/registry/tools/ListObjectsCommandTestCase.java
rename to core/src/test/java/google/registry/tools/ListObjectsCommandTestCase.java
diff --git a/javatests/google/registry/tools/ListPremiumListsCommandTest.java b/core/src/test/java/google/registry/tools/ListPremiumListsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ListPremiumListsCommandTest.java
rename to core/src/test/java/google/registry/tools/ListPremiumListsCommandTest.java
diff --git a/javatests/google/registry/tools/ListRegistrarsCommandTest.java b/core/src/test/java/google/registry/tools/ListRegistrarsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ListRegistrarsCommandTest.java
rename to core/src/test/java/google/registry/tools/ListRegistrarsCommandTest.java
diff --git a/javatests/google/registry/tools/ListReservedListsCommandTest.java b/core/src/test/java/google/registry/tools/ListReservedListsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ListReservedListsCommandTest.java
rename to core/src/test/java/google/registry/tools/ListReservedListsCommandTest.java
diff --git a/javatests/google/registry/tools/ListTldsCommandTest.java b/core/src/test/java/google/registry/tools/ListTldsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ListTldsCommandTest.java
rename to core/src/test/java/google/registry/tools/ListTldsCommandTest.java
diff --git a/javatests/google/registry/tools/LoadTestCommandTest.java b/core/src/test/java/google/registry/tools/LoadTestCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/LoadTestCommandTest.java
rename to core/src/test/java/google/registry/tools/LoadTestCommandTest.java
diff --git a/javatests/google/registry/tools/LockDomainCommandTest.java b/core/src/test/java/google/registry/tools/LockDomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/LockDomainCommandTest.java
rename to core/src/test/java/google/registry/tools/LockDomainCommandTest.java
diff --git a/javatests/google/registry/tools/MutatingCommandTest.java b/core/src/test/java/google/registry/tools/MutatingCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/MutatingCommandTest.java
rename to core/src/test/java/google/registry/tools/MutatingCommandTest.java
diff --git a/javatests/google/registry/tools/MutatingEppToolCommandTest.java b/core/src/test/java/google/registry/tools/MutatingEppToolCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/MutatingEppToolCommandTest.java
rename to core/src/test/java/google/registry/tools/MutatingEppToolCommandTest.java
diff --git a/javatests/google/registry/tools/NonMutatingEppToolCommandTest.java b/core/src/test/java/google/registry/tools/NonMutatingEppToolCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/NonMutatingEppToolCommandTest.java
rename to core/src/test/java/google/registry/tools/NonMutatingEppToolCommandTest.java
diff --git a/javatests/google/registry/tools/RecordAccumulatorTest.java b/core/src/test/java/google/registry/tools/RecordAccumulatorTest.java
similarity index 100%
rename from javatests/google/registry/tools/RecordAccumulatorTest.java
rename to core/src/test/java/google/registry/tools/RecordAccumulatorTest.java
diff --git a/javatests/google/registry/tools/RegistrarContactCommandTest.java b/core/src/test/java/google/registry/tools/RegistrarContactCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/RegistrarContactCommandTest.java
rename to core/src/test/java/google/registry/tools/RegistrarContactCommandTest.java
diff --git a/javatests/google/registry/tools/RegistryToolEnvironmentTest.java b/core/src/test/java/google/registry/tools/RegistryToolEnvironmentTest.java
similarity index 100%
rename from javatests/google/registry/tools/RegistryToolEnvironmentTest.java
rename to core/src/test/java/google/registry/tools/RegistryToolEnvironmentTest.java
diff --git a/javatests/google/registry/tools/RegistryToolTest.java b/core/src/test/java/google/registry/tools/RegistryToolTest.java
similarity index 100%
rename from javatests/google/registry/tools/RegistryToolTest.java
rename to core/src/test/java/google/registry/tools/RegistryToolTest.java
diff --git a/javatests/google/registry/tools/RenewDomainCommandTest.java b/core/src/test/java/google/registry/tools/RenewDomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/RenewDomainCommandTest.java
rename to core/src/test/java/google/registry/tools/RenewDomainCommandTest.java
diff --git a/javatests/google/registry/tools/RequestFactoryModuleTest.java b/core/src/test/java/google/registry/tools/RequestFactoryModuleTest.java
similarity index 100%
rename from javatests/google/registry/tools/RequestFactoryModuleTest.java
rename to core/src/test/java/google/registry/tools/RequestFactoryModuleTest.java
diff --git a/javatests/google/registry/tools/ResaveEntitiesCommandTest.java b/core/src/test/java/google/registry/tools/ResaveEntitiesCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ResaveEntitiesCommandTest.java
rename to core/src/test/java/google/registry/tools/ResaveEntitiesCommandTest.java
diff --git a/javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java b/core/src/test/java/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java
rename to core/src/test/java/google/registry/tools/ResaveEnvironmentEntitiesCommandTest.java
diff --git a/javatests/google/registry/tools/ResaveEppResourcesCommandTest.java b/core/src/test/java/google/registry/tools/ResaveEppResourcesCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ResaveEppResourcesCommandTest.java
rename to core/src/test/java/google/registry/tools/ResaveEppResourcesCommandTest.java
diff --git a/javatests/google/registry/tools/SetNumInstancesCommandTest.java b/core/src/test/java/google/registry/tools/SetNumInstancesCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/SetNumInstancesCommandTest.java
rename to core/src/test/java/google/registry/tools/SetNumInstancesCommandTest.java
diff --git a/javatests/google/registry/tools/SetupOteCommandTest.java b/core/src/test/java/google/registry/tools/SetupOteCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/SetupOteCommandTest.java
rename to core/src/test/java/google/registry/tools/SetupOteCommandTest.java
diff --git a/javatests/google/registry/tools/ShellCommandTest.java b/core/src/test/java/google/registry/tools/ShellCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ShellCommandTest.java
rename to core/src/test/java/google/registry/tools/ShellCommandTest.java
diff --git a/javatests/google/registry/tools/UniformRapidSuspensionCommandTest.java b/core/src/test/java/google/registry/tools/UniformRapidSuspensionCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UniformRapidSuspensionCommandTest.java
rename to core/src/test/java/google/registry/tools/UniformRapidSuspensionCommandTest.java
diff --git a/javatests/google/registry/tools/UnlockDomainCommandTest.java b/core/src/test/java/google/registry/tools/UnlockDomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UnlockDomainCommandTest.java
rename to core/src/test/java/google/registry/tools/UnlockDomainCommandTest.java
diff --git a/javatests/google/registry/tools/UnrenewDomainCommandTest.java b/core/src/test/java/google/registry/tools/UnrenewDomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UnrenewDomainCommandTest.java
rename to core/src/test/java/google/registry/tools/UnrenewDomainCommandTest.java
diff --git a/javatests/google/registry/tools/UpdateAllocationTokensCommandTest.java b/core/src/test/java/google/registry/tools/UpdateAllocationTokensCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UpdateAllocationTokensCommandTest.java
rename to core/src/test/java/google/registry/tools/UpdateAllocationTokensCommandTest.java
diff --git a/javatests/google/registry/tools/UpdateCursorsCommandTest.java b/core/src/test/java/google/registry/tools/UpdateCursorsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UpdateCursorsCommandTest.java
rename to core/src/test/java/google/registry/tools/UpdateCursorsCommandTest.java
diff --git a/javatests/google/registry/tools/UpdateDomainCommandTest.java b/core/src/test/java/google/registry/tools/UpdateDomainCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UpdateDomainCommandTest.java
rename to core/src/test/java/google/registry/tools/UpdateDomainCommandTest.java
diff --git a/javatests/google/registry/tools/UpdatePremiumListCommandTest.java b/core/src/test/java/google/registry/tools/UpdatePremiumListCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UpdatePremiumListCommandTest.java
rename to core/src/test/java/google/registry/tools/UpdatePremiumListCommandTest.java
diff --git a/javatests/google/registry/tools/UpdateRegistrarCommandTest.java b/core/src/test/java/google/registry/tools/UpdateRegistrarCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UpdateRegistrarCommandTest.java
rename to core/src/test/java/google/registry/tools/UpdateRegistrarCommandTest.java
diff --git a/javatests/google/registry/tools/UpdateReservedListCommandTest.java b/core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UpdateReservedListCommandTest.java
rename to core/src/test/java/google/registry/tools/UpdateReservedListCommandTest.java
diff --git a/javatests/google/registry/tools/UpdateServerLocksCommandTest.java b/core/src/test/java/google/registry/tools/UpdateServerLocksCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UpdateServerLocksCommandTest.java
rename to core/src/test/java/google/registry/tools/UpdateServerLocksCommandTest.java
diff --git a/javatests/google/registry/tools/UpdateTldCommandTest.java b/core/src/test/java/google/registry/tools/UpdateTldCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UpdateTldCommandTest.java
rename to core/src/test/java/google/registry/tools/UpdateTldCommandTest.java
diff --git a/javatests/google/registry/tools/UploadClaimsListCommandTest.java b/core/src/test/java/google/registry/tools/UploadClaimsListCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/UploadClaimsListCommandTest.java
rename to core/src/test/java/google/registry/tools/UploadClaimsListCommandTest.java
diff --git a/javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java b/core/src/test/java/google/registry/tools/ValidateEscrowDepositCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ValidateEscrowDepositCommandTest.java
rename to core/src/test/java/google/registry/tools/ValidateEscrowDepositCommandTest.java
diff --git a/javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java b/core/src/test/java/google/registry/tools/ValidateLoginCredentialsCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/ValidateLoginCredentialsCommandTest.java
rename to core/src/test/java/google/registry/tools/ValidateLoginCredentialsCommandTest.java
diff --git a/javatests/google/registry/tools/VerifyOteCommandTest.java b/core/src/test/java/google/registry/tools/VerifyOteCommandTest.java
similarity index 100%
rename from javatests/google/registry/tools/VerifyOteCommandTest.java
rename to core/src/test/java/google/registry/tools/VerifyOteCommandTest.java
diff --git a/javatests/google/registry/tools/params/BUILD b/core/src/test/java/google/registry/tools/params/BUILD
similarity index 100%
rename from javatests/google/registry/tools/params/BUILD
rename to core/src/test/java/google/registry/tools/params/BUILD
diff --git a/javatests/google/registry/tools/params/DateParameterTest.java b/core/src/test/java/google/registry/tools/params/DateParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/DateParameterTest.java
rename to core/src/test/java/google/registry/tools/params/DateParameterTest.java
diff --git a/javatests/google/registry/tools/params/DateTimeParameterTest.java b/core/src/test/java/google/registry/tools/params/DateTimeParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/DateTimeParameterTest.java
rename to core/src/test/java/google/registry/tools/params/DateTimeParameterTest.java
diff --git a/javatests/google/registry/tools/params/DurationParameterTest.java b/core/src/test/java/google/registry/tools/params/DurationParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/DurationParameterTest.java
rename to core/src/test/java/google/registry/tools/params/DurationParameterTest.java
diff --git a/javatests/google/registry/tools/params/EnumParameterTest.java b/core/src/test/java/google/registry/tools/params/EnumParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/EnumParameterTest.java
rename to core/src/test/java/google/registry/tools/params/EnumParameterTest.java
diff --git a/javatests/google/registry/tools/params/HostAndPortParameterTest.java b/core/src/test/java/google/registry/tools/params/HostAndPortParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/HostAndPortParameterTest.java
rename to core/src/test/java/google/registry/tools/params/HostAndPortParameterTest.java
diff --git a/javatests/google/registry/tools/params/IntervalParameterTest.java b/core/src/test/java/google/registry/tools/params/IntervalParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/IntervalParameterTest.java
rename to core/src/test/java/google/registry/tools/params/IntervalParameterTest.java
diff --git a/javatests/google/registry/tools/params/KeyValueMapParameterTest.java b/core/src/test/java/google/registry/tools/params/KeyValueMapParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/KeyValueMapParameterTest.java
rename to core/src/test/java/google/registry/tools/params/KeyValueMapParameterTest.java
diff --git a/javatests/google/registry/tools/params/MoneyParameterTest.java b/core/src/test/java/google/registry/tools/params/MoneyParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/MoneyParameterTest.java
rename to core/src/test/java/google/registry/tools/params/MoneyParameterTest.java
diff --git a/javatests/google/registry/tools/params/NameserversParameterTest.java b/core/src/test/java/google/registry/tools/params/NameserversParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/NameserversParameterTest.java
rename to core/src/test/java/google/registry/tools/params/NameserversParameterTest.java
diff --git a/javatests/google/registry/tools/params/PathParameterTest.java b/core/src/test/java/google/registry/tools/params/PathParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/PathParameterTest.java
rename to core/src/test/java/google/registry/tools/params/PathParameterTest.java
diff --git a/javatests/google/registry/tools/params/PhoneNumberParameterTest.java b/core/src/test/java/google/registry/tools/params/PhoneNumberParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/PhoneNumberParameterTest.java
rename to core/src/test/java/google/registry/tools/params/PhoneNumberParameterTest.java
diff --git a/javatests/google/registry/tools/params/YearMonthParameterTest.java b/core/src/test/java/google/registry/tools/params/YearMonthParameterTest.java
similarity index 100%
rename from javatests/google/registry/tools/params/YearMonthParameterTest.java
rename to core/src/test/java/google/registry/tools/params/YearMonthParameterTest.java
diff --git a/javatests/google/registry/tools/server/BUILD b/core/src/test/java/google/registry/tools/server/BUILD
similarity index 100%
rename from javatests/google/registry/tools/server/BUILD
rename to core/src/test/java/google/registry/tools/server/BUILD
diff --git a/javatests/google/registry/tools/server/CreateGroupsActionTest.java b/core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/CreateGroupsActionTest.java
rename to core/src/test/java/google/registry/tools/server/CreateGroupsActionTest.java
diff --git a/javatests/google/registry/tools/server/CreatePremiumListActionTest.java b/core/src/test/java/google/registry/tools/server/CreatePremiumListActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/CreatePremiumListActionTest.java
rename to core/src/test/java/google/registry/tools/server/CreatePremiumListActionTest.java
diff --git a/javatests/google/registry/tools/server/DeleteEntityActionTest.java b/core/src/test/java/google/registry/tools/server/DeleteEntityActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/DeleteEntityActionTest.java
rename to core/src/test/java/google/registry/tools/server/DeleteEntityActionTest.java
diff --git a/javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java b/core/src/test/java/google/registry/tools/server/GenerateZoneFilesActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/GenerateZoneFilesActionTest.java
rename to core/src/test/java/google/registry/tools/server/GenerateZoneFilesActionTest.java
diff --git a/javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java b/core/src/test/java/google/registry/tools/server/KillAllCommitLogsActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/KillAllCommitLogsActionTest.java
rename to core/src/test/java/google/registry/tools/server/KillAllCommitLogsActionTest.java
diff --git a/javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java b/core/src/test/java/google/registry/tools/server/KillAllEppResourcesActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/KillAllEppResourcesActionTest.java
rename to core/src/test/java/google/registry/tools/server/KillAllEppResourcesActionTest.java
diff --git a/javatests/google/registry/tools/server/ListActionTestCase.java b/core/src/test/java/google/registry/tools/server/ListActionTestCase.java
similarity index 100%
rename from javatests/google/registry/tools/server/ListActionTestCase.java
rename to core/src/test/java/google/registry/tools/server/ListActionTestCase.java
diff --git a/javatests/google/registry/tools/server/ListDomainsActionTest.java b/core/src/test/java/google/registry/tools/server/ListDomainsActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/ListDomainsActionTest.java
rename to core/src/test/java/google/registry/tools/server/ListDomainsActionTest.java
diff --git a/javatests/google/registry/tools/server/ListHostsActionTest.java b/core/src/test/java/google/registry/tools/server/ListHostsActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/ListHostsActionTest.java
rename to core/src/test/java/google/registry/tools/server/ListHostsActionTest.java
diff --git a/javatests/google/registry/tools/server/ListPremiumListsActionTest.java b/core/src/test/java/google/registry/tools/server/ListPremiumListsActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/ListPremiumListsActionTest.java
rename to core/src/test/java/google/registry/tools/server/ListPremiumListsActionTest.java
diff --git a/javatests/google/registry/tools/server/ListRegistrarsActionTest.java b/core/src/test/java/google/registry/tools/server/ListRegistrarsActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/ListRegistrarsActionTest.java
rename to core/src/test/java/google/registry/tools/server/ListRegistrarsActionTest.java
diff --git a/javatests/google/registry/tools/server/ListReservedListsActionTest.java b/core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/ListReservedListsActionTest.java
rename to core/src/test/java/google/registry/tools/server/ListReservedListsActionTest.java
diff --git a/javatests/google/registry/tools/server/ListTldsActionTest.java b/core/src/test/java/google/registry/tools/server/ListTldsActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/ListTldsActionTest.java
rename to core/src/test/java/google/registry/tools/server/ListTldsActionTest.java
diff --git a/javatests/google/registry/tools/server/RefreshDnsForAllDomainsActionTest.java b/core/src/test/java/google/registry/tools/server/RefreshDnsForAllDomainsActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/RefreshDnsForAllDomainsActionTest.java
rename to core/src/test/java/google/registry/tools/server/RefreshDnsForAllDomainsActionTest.java
diff --git a/javatests/google/registry/tools/server/ResaveAllHistoryEntriesActionTest.java b/core/src/test/java/google/registry/tools/server/ResaveAllHistoryEntriesActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/ResaveAllHistoryEntriesActionTest.java
rename to core/src/test/java/google/registry/tools/server/ResaveAllHistoryEntriesActionTest.java
diff --git a/javatests/google/registry/tools/server/ToolsTestData.java b/core/src/test/java/google/registry/tools/server/ToolsTestData.java
similarity index 100%
rename from javatests/google/registry/tools/server/ToolsTestData.java
rename to core/src/test/java/google/registry/tools/server/ToolsTestData.java
diff --git a/javatests/google/registry/tools/server/UpdatePremiumListActionTest.java b/core/src/test/java/google/registry/tools/server/UpdatePremiumListActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/UpdatePremiumListActionTest.java
rename to core/src/test/java/google/registry/tools/server/UpdatePremiumListActionTest.java
diff --git a/javatests/google/registry/tools/server/VerifyOteActionTest.java b/core/src/test/java/google/registry/tools/server/VerifyOteActionTest.java
similarity index 100%
rename from javatests/google/registry/tools/server/VerifyOteActionTest.java
rename to core/src/test/java/google/registry/tools/server/VerifyOteActionTest.java
diff --git a/javatests/google/registry/tools/server/testdata/contact_create.xml b/core/src/test/java/google/registry/tools/server/testdata/contact_create.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/contact_create.xml
rename to core/src/test/java/google/registry/tools/server/testdata/contact_create.xml
diff --git a/javatests/google/registry/tools/server/testdata/contact_create_complete.xml b/core/src/test/java/google/registry/tools/server/testdata/contact_create_complete.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/contact_create_complete.xml
rename to core/src/test/java/google/registry/tools/server/testdata/contact_create_complete.xml
diff --git a/javatests/google/registry/tools/server/testdata/contact_create_minimal.xml b/core/src/test/java/google/registry/tools/server/testdata/contact_create_minimal.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/contact_create_minimal.xml
rename to core/src/test/java/google/registry/tools/server/testdata/contact_create_minimal.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_check.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_check.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_check.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_check.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_check_claims.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_check_claims.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_check_claims.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_check_claims.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_check_claims_multiple.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_check_claims_multiple.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_check_claims_multiple.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_check_claims_multiple.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_check_claims_second_tld.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_check_claims_second_tld.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_check_claims_second_tld.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_check_claims_second_tld.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_check_fee.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_check_fee.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_check_fee.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_check_fee.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_check_fee_multiple.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_check_fee_multiple.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_check_fee_multiple.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_check_fee_multiple.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_check_fee_second_tld.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_check_fee_second_tld.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_check_fee_second_tld.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_check_fee_second_tld.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_premium.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_premium.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_premium.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_premium.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_standard.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_standard.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_standard.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_fee_standard.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_multiple_word_reason.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_multiple_word_reason.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_multiple_word_reason.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_multiple_word_reason.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_no_reason.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_no_reason.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_no_reason.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_no_reason.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_password.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_password.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_anchor_tenant_password.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_anchor_tenant_password.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_complete.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_complete.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_complete.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_complete.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_minimal.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_minimal.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_minimal.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_minimal.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_minimal_abc.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_minimal_abc.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_minimal_abc.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_minimal_abc.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_palladium.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_palladium.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_palladium.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_palladium.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_create_parajiumu_3yrs.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_create_parajiumu_3yrs.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_create_parajiumu_3yrs.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_create_parajiumu_3yrs.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_delete.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_delete.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_delete.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_delete.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_delete_by_registrar.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_delete_by_registrar.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_delete_by_registrar.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_delete_by_registrar.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_delete_immediately.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_delete_immediately.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_delete_immediately.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_delete_immediately.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_delete_multiple_word_reason.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_delete_multiple_word_reason.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_delete_multiple_word_reason.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_delete_multiple_word_reason.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_lock.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_lock.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_lock.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_lock.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_lock_partial_statuses.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_lock_partial_statuses.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_lock_partial_statuses.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_lock_partial_statuses.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_renew.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_renew.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_renew.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_renew.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_unlock.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_unlock.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_unlock.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_unlock.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_unlock_partial_statuses.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_unlock_partial_statuses.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_unlock_partial_statuses.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_unlock_partial_statuses.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_add.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_add.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_add.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_add.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_add_two_hosts_remove_one.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_add_two_hosts_remove_one.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_add_two_hosts_remove_one.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_add_two_hosts_remove_one.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_change.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_change.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_change.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_change.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_clear_ds_records.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_clear_ds_records.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_clear_ds_records.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_clear_ds_records.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_complete.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_complete.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_complete.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_complete.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_complete_abc.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_complete_abc.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_complete_abc.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_complete_abc.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_remove.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_remove.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_remove.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_remove.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_set_contacts.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_set_contacts.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_set_contacts.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_set_contacts.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_set_ds_records.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_set_ds_records.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_set_ds_records.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_set_ds_records.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_set_nameservers.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_set_nameservers.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_set_nameservers.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_set_nameservers.xml
diff --git a/javatests/google/registry/tools/server/testdata/domain_update_set_statuses.xml b/core/src/test/java/google/registry/tools/server/testdata/domain_update_set_statuses.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/domain_update_set_statuses.xml
rename to core/src/test/java/google/registry/tools/server/testdata/domain_update_set_statuses.xml
diff --git a/javatests/google/registry/tools/server/testdata/host_create_complete.xml b/core/src/test/java/google/registry/tools/server/testdata/host_create_complete.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/host_create_complete.xml
rename to core/src/test/java/google/registry/tools/server/testdata/host_create_complete.xml
diff --git a/javatests/google/registry/tools/server/testdata/host_create_minimal.xml b/core/src/test/java/google/registry/tools/server/testdata/host_create_minimal.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/host_create_minimal.xml
rename to core/src/test/java/google/registry/tools/server/testdata/host_create_minimal.xml
diff --git a/javatests/google/registry/tools/server/testdata/host_delete.xml b/core/src/test/java/google/registry/tools/server/testdata/host_delete.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/host_delete.xml
rename to core/src/test/java/google/registry/tools/server/testdata/host_delete.xml
diff --git a/javatests/google/registry/tools/server/testdata/host_delete_by_registrar.xml b/core/src/test/java/google/registry/tools/server/testdata/host_delete_by_registrar.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/host_delete_by_registrar.xml
rename to core/src/test/java/google/registry/tools/server/testdata/host_delete_by_registrar.xml
diff --git a/javatests/google/registry/tools/server/testdata/host_delete_multiple_word_reason.xml b/core/src/test/java/google/registry/tools/server/testdata/host_delete_multiple_word_reason.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/host_delete_multiple_word_reason.xml
rename to core/src/test/java/google/registry/tools/server/testdata/host_delete_multiple_word_reason.xml
diff --git a/javatests/google/registry/tools/server/testdata/tld.zone b/core/src/test/java/google/registry/tools/server/testdata/tld.zone
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/tld.zone
rename to core/src/test/java/google/registry/tools/server/testdata/tld.zone
diff --git a/javatests/google/registry/tools/server/testdata/uniform_rapid_suspension.xml b/core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/uniform_rapid_suspension.xml
rename to core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension.xml
diff --git a/javatests/google/registry/tools/server/testdata/uniform_rapid_suspension_existing_host.xml b/core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_existing_host.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/uniform_rapid_suspension_existing_host.xml
rename to core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_existing_host.xml
diff --git a/javatests/google/registry/tools/server/testdata/uniform_rapid_suspension_undo.xml b/core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_undo.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/uniform_rapid_suspension_undo.xml
rename to core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_undo.xml
diff --git a/javatests/google/registry/tools/server/testdata/uniform_rapid_suspension_undo_preserve.xml b/core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_undo_preserve.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/uniform_rapid_suspension_undo_preserve.xml
rename to core/src/test/java/google/registry/tools/server/testdata/uniform_rapid_suspension_undo_preserve.xml
diff --git a/javatests/google/registry/tools/server/testdata/update_server_locks_apply_all.xml b/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_apply_all.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/update_server_locks_apply_all.xml
rename to core/src/test/java/google/registry/tools/server/testdata/update_server_locks_apply_all.xml
diff --git a/javatests/google/registry/tools/server/testdata/update_server_locks_apply_one.xml b/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_apply_one.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/update_server_locks_apply_one.xml
rename to core/src/test/java/google/registry/tools/server/testdata/update_server_locks_apply_one.xml
diff --git a/javatests/google/registry/tools/server/testdata/update_server_locks_multiple_word_reason.xml b/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_multiple_word_reason.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/update_server_locks_multiple_word_reason.xml
rename to core/src/test/java/google/registry/tools/server/testdata/update_server_locks_multiple_word_reason.xml
diff --git a/javatests/google/registry/tools/server/testdata/update_server_locks_remove_all.xml b/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_remove_all.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/update_server_locks_remove_all.xml
rename to core/src/test/java/google/registry/tools/server/testdata/update_server_locks_remove_all.xml
diff --git a/javatests/google/registry/tools/server/testdata/update_server_locks_remove_one.xml b/core/src/test/java/google/registry/tools/server/testdata/update_server_locks_remove_one.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/update_server_locks_remove_one.xml
rename to core/src/test/java/google/registry/tools/server/testdata/update_server_locks_remove_one.xml
diff --git a/javatests/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml b/core/src/test/java/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
similarity index 100%
rename from javatests/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
rename to core/src/test/java/google/registry/tools/server/testdata/xn--q9jyb4c_2010-10-17_full_S1_R0.xml
diff --git a/javatests/google/registry/tools/testdata/example_invalid_premium_terms.csv b/core/src/test/java/google/registry/tools/testdata/example_invalid_premium_terms.csv
similarity index 100%
rename from javatests/google/registry/tools/testdata/example_invalid_premium_terms.csv
rename to core/src/test/java/google/registry/tools/testdata/example_invalid_premium_terms.csv
diff --git a/javatests/google/registry/tools/testdata/example_premium_terms.csv b/core/src/test/java/google/registry/tools/testdata/example_premium_terms.csv
similarity index 100%
rename from javatests/google/registry/tools/testdata/example_premium_terms.csv
rename to core/src/test/java/google/registry/tools/testdata/example_premium_terms.csv
diff --git a/javatests/google/registry/tools/testdata/example_reserved_terms.csv b/core/src/test/java/google/registry/tools/testdata/example_reserved_terms.csv
similarity index 100%
rename from javatests/google/registry/tools/testdata/example_reserved_terms.csv
rename to core/src/test/java/google/registry/tools/testdata/example_reserved_terms.csv
diff --git a/javatests/google/registry/ui/forms/BUILD b/core/src/test/java/google/registry/ui/forms/BUILD
similarity index 100%
rename from javatests/google/registry/ui/forms/BUILD
rename to core/src/test/java/google/registry/ui/forms/BUILD
diff --git a/javatests/google/registry/ui/forms/FormFieldExceptionTest.java b/core/src/test/java/google/registry/ui/forms/FormFieldExceptionTest.java
similarity index 100%
rename from javatests/google/registry/ui/forms/FormFieldExceptionTest.java
rename to core/src/test/java/google/registry/ui/forms/FormFieldExceptionTest.java
diff --git a/javatests/google/registry/ui/forms/FormFieldTest.java b/core/src/test/java/google/registry/ui/forms/FormFieldTest.java
similarity index 100%
rename from javatests/google/registry/ui/forms/FormFieldTest.java
rename to core/src/test/java/google/registry/ui/forms/FormFieldTest.java
diff --git a/javatests/google/registry/ui/forms/FormFieldsTest.java b/core/src/test/java/google/registry/ui/forms/FormFieldsTest.java
similarity index 100%
rename from javatests/google/registry/ui/forms/FormFieldsTest.java
rename to core/src/test/java/google/registry/ui/forms/FormFieldsTest.java
diff --git a/javatests/google/registry/ui/js/BUILD b/core/src/test/java/google/registry/ui/js/BUILD
similarity index 100%
rename from javatests/google/registry/ui/js/BUILD
rename to core/src/test/java/google/registry/ui/js/BUILD
diff --git a/javatests/google/registry/ui/js/component_test.js b/core/src/test/java/google/registry/ui/js/component_test.js
similarity index 100%
rename from javatests/google/registry/ui/js/component_test.js
rename to core/src/test/java/google/registry/ui/js/component_test.js
diff --git a/javatests/google/registry/ui/js/registrar/BUILD b/core/src/test/java/google/registry/ui/js/registrar/BUILD
similarity index 100%
rename from javatests/google/registry/ui/js/registrar/BUILD
rename to core/src/test/java/google/registry/ui/js/registrar/BUILD
diff --git a/javatests/google/registry/ui/js/registrar/console_test.js b/core/src/test/java/google/registry/ui/js/registrar/console_test.js
similarity index 100%
rename from javatests/google/registry/ui/js/registrar/console_test.js
rename to core/src/test/java/google/registry/ui/js/registrar/console_test.js
diff --git a/javatests/google/registry/ui/js/registrar/console_test_util.js b/core/src/test/java/google/registry/ui/js/registrar/console_test_util.js
similarity index 100%
rename from javatests/google/registry/ui/js/registrar/console_test_util.js
rename to core/src/test/java/google/registry/ui/js/registrar/console_test_util.js
diff --git a/javatests/google/registry/ui/js/registrar/contact_settings_test.js b/core/src/test/java/google/registry/ui/js/registrar/contact_settings_test.js
similarity index 100%
rename from javatests/google/registry/ui/js/registrar/contact_settings_test.js
rename to core/src/test/java/google/registry/ui/js/registrar/contact_settings_test.js
diff --git a/javatests/google/registry/ui/js/registrar/security_settings_test.js b/core/src/test/java/google/registry/ui/js/registrar/security_settings_test.js
similarity index 100%
rename from javatests/google/registry/ui/js/registrar/security_settings_test.js
rename to core/src/test/java/google/registry/ui/js/registrar/security_settings_test.js
diff --git a/javatests/google/registry/ui/js/registrar/whois_settings_test.js b/core/src/test/java/google/registry/ui/js/registrar/whois_settings_test.js
similarity index 100%
rename from javatests/google/registry/ui/js/registrar/whois_settings_test.js
rename to core/src/test/java/google/registry/ui/js/registrar/whois_settings_test.js
diff --git a/javatests/google/registry/ui/js/testing.js b/core/src/test/java/google/registry/ui/js/testing.js
similarity index 100%
rename from javatests/google/registry/ui/js/testing.js
rename to core/src/test/java/google/registry/ui/js/testing.js
diff --git a/javatests/google/registry/ui/server/BUILD b/core/src/test/java/google/registry/ui/server/BUILD
similarity index 100%
rename from javatests/google/registry/ui/server/BUILD
rename to core/src/test/java/google/registry/ui/server/BUILD
diff --git a/javatests/google/registry/ui/server/RegistrarFormFieldsTest.java b/core/src/test/java/google/registry/ui/server/RegistrarFormFieldsTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/RegistrarFormFieldsTest.java
rename to core/src/test/java/google/registry/ui/server/RegistrarFormFieldsTest.java
diff --git a/javatests/google/registry/ui/server/SendEmailUtilsTest.java b/core/src/test/java/google/registry/ui/server/SendEmailUtilsTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/SendEmailUtilsTest.java
rename to core/src/test/java/google/registry/ui/server/SendEmailUtilsTest.java
diff --git a/javatests/google/registry/ui/server/registrar/BUILD b/core/src/test/java/google/registry/ui/server/registrar/BUILD
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/BUILD
rename to core/src/test/java/google/registry/ui/server/registrar/BUILD
diff --git a/javatests/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java
rename to core/src/test/java/google/registry/ui/server/registrar/ConsoleOteSetupActionTest.java
diff --git a/javatests/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java
rename to core/src/test/java/google/registry/ui/server/registrar/ConsoleRegistrarCreatorActionTest.java
diff --git a/javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/ConsoleUiActionTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/ConsoleUiActionTest.java
rename to core/src/test/java/google/registry/ui/server/registrar/ConsoleUiActionTest.java
diff --git a/javatests/google/registry/ui/server/registrar/ContactSettingsTest.java b/core/src/test/java/google/registry/ui/server/registrar/ContactSettingsTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/ContactSettingsTest.java
rename to core/src/test/java/google/registry/ui/server/registrar/ContactSettingsTest.java
diff --git a/javatests/google/registry/ui/server/registrar/OteStatusActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/OteStatusActionTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/OteStatusActionTest.java
rename to core/src/test/java/google/registry/ui/server/registrar/OteStatusActionTest.java
diff --git a/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java
rename to core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTest.java
diff --git a/javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java b/core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java
rename to core/src/test/java/google/registry/ui/server/registrar/RegistrarSettingsActionTestCase.java
diff --git a/javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java b/core/src/test/java/google/registry/ui/server/registrar/SecuritySettingsTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/SecuritySettingsTest.java
rename to core/src/test/java/google/registry/ui/server/registrar/SecuritySettingsTest.java
diff --git a/javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java b/core/src/test/java/google/registry/ui/server/registrar/WhoisSettingsTest.java
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/WhoisSettingsTest.java
rename to core/src/test/java/google/registry/ui/server/registrar/WhoisSettingsTest.java
diff --git a/javatests/google/registry/ui/server/registrar/testdata/update_registrar.json b/core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar.json
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/testdata/update_registrar.json
rename to core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar.json
diff --git a/javatests/google/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json b/core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json
rename to core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar_duplicate_contacts.json
diff --git a/javatests/google/registry/ui/server/registrar/testdata/update_registrar_email.txt b/core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar_email.txt
similarity index 100%
rename from javatests/google/registry/ui/server/registrar/testdata/update_registrar_email.txt
rename to core/src/test/java/google/registry/ui/server/registrar/testdata/update_registrar_email.txt
diff --git a/javatests/google/registry/webdriver/ActualScreenshot.java b/core/src/test/java/google/registry/webdriver/ActualScreenshot.java
similarity index 100%
rename from javatests/google/registry/webdriver/ActualScreenshot.java
rename to core/src/test/java/google/registry/webdriver/ActualScreenshot.java
diff --git a/javatests/google/registry/webdriver/DockerWebDriverRule.java b/core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java
similarity index 100%
rename from javatests/google/registry/webdriver/DockerWebDriverRule.java
rename to core/src/test/java/google/registry/webdriver/DockerWebDriverRule.java
diff --git a/javatests/google/registry/webdriver/GoldenImageFinder.java b/core/src/test/java/google/registry/webdriver/GoldenImageFinder.java
similarity index 100%
rename from javatests/google/registry/webdriver/GoldenImageFinder.java
rename to core/src/test/java/google/registry/webdriver/GoldenImageFinder.java
diff --git a/javatests/google/registry/webdriver/OteSetupConsoleScreenshotTest.java b/core/src/test/java/google/registry/webdriver/OteSetupConsoleScreenshotTest.java
similarity index 100%
rename from javatests/google/registry/webdriver/OteSetupConsoleScreenshotTest.java
rename to core/src/test/java/google/registry/webdriver/OteSetupConsoleScreenshotTest.java
diff --git a/javatests/google/registry/webdriver/README.md b/core/src/test/java/google/registry/webdriver/README.md
similarity index 100%
rename from javatests/google/registry/webdriver/README.md
rename to core/src/test/java/google/registry/webdriver/README.md
diff --git a/javatests/google/registry/webdriver/RegistrarConsoleScreenshotTest.java b/core/src/test/java/google/registry/webdriver/RegistrarConsoleScreenshotTest.java
similarity index 100%
rename from javatests/google/registry/webdriver/RegistrarConsoleScreenshotTest.java
rename to core/src/test/java/google/registry/webdriver/RegistrarConsoleScreenshotTest.java
diff --git a/javatests/google/registry/webdriver/RegistrarConsoleWebTest.java b/core/src/test/java/google/registry/webdriver/RegistrarConsoleWebTest.java
similarity index 100%
rename from javatests/google/registry/webdriver/RegistrarConsoleWebTest.java
rename to core/src/test/java/google/registry/webdriver/RegistrarConsoleWebTest.java
diff --git a/javatests/google/registry/webdriver/RegistrarCreateConsoleScreenshotTest.java b/core/src/test/java/google/registry/webdriver/RegistrarCreateConsoleScreenshotTest.java
similarity index 100%
rename from javatests/google/registry/webdriver/RegistrarCreateConsoleScreenshotTest.java
rename to core/src/test/java/google/registry/webdriver/RegistrarCreateConsoleScreenshotTest.java
diff --git a/javatests/google/registry/webdriver/RepeatableRunner.java b/core/src/test/java/google/registry/webdriver/RepeatableRunner.java
similarity index 100%
rename from javatests/google/registry/webdriver/RepeatableRunner.java
rename to core/src/test/java/google/registry/webdriver/RepeatableRunner.java
diff --git a/javatests/google/registry/webdriver/ScreenDiffer.java b/core/src/test/java/google/registry/webdriver/ScreenDiffer.java
similarity index 100%
rename from javatests/google/registry/webdriver/ScreenDiffer.java
rename to core/src/test/java/google/registry/webdriver/ScreenDiffer.java
diff --git a/javatests/google/registry/webdriver/TestServerRule.java b/core/src/test/java/google/registry/webdriver/TestServerRule.java
similarity index 100%
rename from javatests/google/registry/webdriver/TestServerRule.java
rename to core/src/test/java/google/registry/webdriver/TestServerRule.java
diff --git a/javatests/google/registry/webdriver/WebDriverPlusScreenDifferRule.java b/core/src/test/java/google/registry/webdriver/WebDriverPlusScreenDifferRule.java
similarity index 100%
rename from javatests/google/registry/webdriver/WebDriverPlusScreenDifferRule.java
rename to core/src/test/java/google/registry/webdriver/WebDriverPlusScreenDifferRule.java
diff --git a/javatests/google/registry/webdriver/WebDriverScreenDiffer.java b/core/src/test/java/google/registry/webdriver/WebDriverScreenDiffer.java
similarity index 100%
rename from javatests/google/registry/webdriver/WebDriverScreenDiffer.java
rename to core/src/test/java/google/registry/webdriver/WebDriverScreenDiffer.java
diff --git a/javatests/google/registry/webdriver/WebDriverTestCase.java b/core/src/test/java/google/registry/webdriver/WebDriverTestCase.java
similarity index 100%
rename from javatests/google/registry/webdriver/WebDriverTestCase.java
rename to core/src/test/java/google/registry/webdriver/WebDriverTestCase.java
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_fails_badEmail_oteResultFailed.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_fails_badEmail_oteResultFailed.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_fails_badEmail_oteResultFailed.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_fails_badEmail_oteResultFailed.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_formEmpty.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_formEmpty.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_formEmpty.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_formEmpty.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_formFilled.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_formFilled.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_formFilled.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_formFilled.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_oteResult.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_oteResult.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_oteResult.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_admin_succeeds_oteResult.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_owner_fails_unauthorized.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_owner_fails_unauthorized.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_owner_fails_unauthorized.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/OteSetupConsoleScreenshotTest_get_owner_fails_unauthorized.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_contactUs_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_contactUs_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_contactUs_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_contactUs_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_completed_before_click.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_completed_before_click.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_completed_before_click.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_completed_before_click.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_completed_result.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_completed_result.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_completed_result.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_completed_result.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_noButtonWhenReal_result.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_noButtonWhenReal_result.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_noButtonWhenReal_result.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_noButtonWhenReal_result.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_notCompleted_result.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_notCompleted_result.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_notCompleted_result.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_getOteStatus_notCompleted_result.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_indexPage_smallScrolledDown_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_indexPage_smallScrolledDown_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_indexPage_smallScrolledDown_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_indexPage_smallScrolledDown_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_adminAndOwner_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_adminAndOwner_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_adminAndOwner_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_adminAndOwner_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_admin_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_admin_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_admin_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_admin_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_owner_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_owner_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_owner_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_owner_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_registrarDisabled_view.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_registrarDisabled_view.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_registrarDisabled_view.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_index_registrarDisabled_view.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenAdmin_edit.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenAdmin_edit.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenAdmin_edit.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenAdmin_edit.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenAdmin_view.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenAdmin_view.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenAdmin_view.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenAdmin_view.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenNotAdmin_showsHome_view.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenNotAdmin_showsHome_view.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenNotAdmin_showsHome_view.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsAdmin_whenNotAdmin_showsHome_view.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactEdit_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactEdit_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactEdit_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactEdit_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactItem_asAdmin_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactItem_asAdmin_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactItem_asAdmin_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactItem_asAdmin_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactItem_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactItem_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactItem_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContactItem_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContact_asAdmin_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContact_asAdmin_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContact_asAdmin_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContact_asAdmin_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContact_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContact_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContact_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsContact_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithCerts_edit.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithCerts_edit.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithCerts_edit.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithCerts_edit.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithCerts_view.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithCerts_view.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithCerts_view.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithCerts_view.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithHashOnly_edit.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithHashOnly_edit.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithHashOnly_edit.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithHashOnly_edit.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithHashOnly_view.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithHashOnly_view.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithHashOnly_view.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurityWithHashOnly_view.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_asAdmin_view.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_asAdmin_view.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_asAdmin_view.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_asAdmin_view.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_edit.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_edit.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_edit.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_edit.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_view.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_view.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_view.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsSecurity_view.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEditError_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEditError_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEditError_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEditError_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEdit_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEdit_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEdit_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhoisEdit_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhois_page.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhois_page.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhois_page.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarConsoleScreenshotTest_settingsWhois_page.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_fails_badEmail_createResultFailed.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_fails_badEmail_createResultFailed.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_fails_badEmail_createResultFailed.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_fails_badEmail_createResultFailed.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_createResult.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_createResult.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_createResult.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_createResult.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_formEmpty.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_formEmpty.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_formEmpty.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_formEmpty.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_formFilled.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_formFilled.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_formFilled.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_admin_succeeds_formFilled.png
diff --git a/javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_owner_fails_unauthorized.png b/core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_owner_fails_unauthorized.png
similarity index 100%
rename from javatests/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_owner_fails_unauthorized.png
rename to core/src/test/java/google/registry/webdriver/goldens/chrome-linux/RegistrarCreateConsoleScreenshotTest_get_owner_fails_unauthorized.png
diff --git a/javatests/google/registry/whois/BUILD b/core/src/test/java/google/registry/whois/BUILD
similarity index 100%
rename from javatests/google/registry/whois/BUILD
rename to core/src/test/java/google/registry/whois/BUILD
diff --git a/javatests/google/registry/whois/DomainWhoisResponseTest.java b/core/src/test/java/google/registry/whois/DomainWhoisResponseTest.java
similarity index 100%
rename from javatests/google/registry/whois/DomainWhoisResponseTest.java
rename to core/src/test/java/google/registry/whois/DomainWhoisResponseTest.java
diff --git a/javatests/google/registry/whois/NameserverWhoisResponseTest.java b/core/src/test/java/google/registry/whois/NameserverWhoisResponseTest.java
similarity index 100%
rename from javatests/google/registry/whois/NameserverWhoisResponseTest.java
rename to core/src/test/java/google/registry/whois/NameserverWhoisResponseTest.java
diff --git a/javatests/google/registry/whois/RegistrarWhoisResponseTest.java b/core/src/test/java/google/registry/whois/RegistrarWhoisResponseTest.java
similarity index 100%
rename from javatests/google/registry/whois/RegistrarWhoisResponseTest.java
rename to core/src/test/java/google/registry/whois/RegistrarWhoisResponseTest.java
diff --git a/javatests/google/registry/whois/WhoisActionTest.java b/core/src/test/java/google/registry/whois/WhoisActionTest.java
similarity index 100%
rename from javatests/google/registry/whois/WhoisActionTest.java
rename to core/src/test/java/google/registry/whois/WhoisActionTest.java
diff --git a/javatests/google/registry/whois/WhoisHttpActionTest.java b/core/src/test/java/google/registry/whois/WhoisHttpActionTest.java
similarity index 100%
rename from javatests/google/registry/whois/WhoisHttpActionTest.java
rename to core/src/test/java/google/registry/whois/WhoisHttpActionTest.java
diff --git a/javatests/google/registry/whois/WhoisInjectionTest.java b/core/src/test/java/google/registry/whois/WhoisInjectionTest.java
similarity index 100%
rename from javatests/google/registry/whois/WhoisInjectionTest.java
rename to core/src/test/java/google/registry/whois/WhoisInjectionTest.java
diff --git a/javatests/google/registry/whois/WhoisReaderTest.java b/core/src/test/java/google/registry/whois/WhoisReaderTest.java
similarity index 100%
rename from javatests/google/registry/whois/WhoisReaderTest.java
rename to core/src/test/java/google/registry/whois/WhoisReaderTest.java
diff --git a/javatests/google/registry/whois/WhoisTestComponent.java b/core/src/test/java/google/registry/whois/WhoisTestComponent.java
similarity index 100%
rename from javatests/google/registry/whois/WhoisTestComponent.java
rename to core/src/test/java/google/registry/whois/WhoisTestComponent.java
diff --git a/javatests/google/registry/whois/WhoisTestData.java b/core/src/test/java/google/registry/whois/WhoisTestData.java
similarity index 100%
rename from javatests/google/registry/whois/WhoisTestData.java
rename to core/src/test/java/google/registry/whois/WhoisTestData.java
diff --git a/javatests/google/registry/whois/testdata/whois_action_domain.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_domain.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_domain.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_domain.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_domain_not_found.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_domain_not_found.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_domain_not_found.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_domain_not_found.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_idn_punycode.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_idn_punycode.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_idn_punycode.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_idn_punycode.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_idn_utf8.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_idn_utf8.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_idn_utf8.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_idn_utf8.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_ip_not_found.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_ip_not_found.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_ip_not_found.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_ip_not_found.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_malformed_path.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_malformed_path.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_malformed_path.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_malformed_path.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_nameserver.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_nameserver.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_nameserver.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_nameserver.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_nameserver_not_found.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_nameserver_not_found.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_nameserver_not_found.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_nameserver_not_found.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_no_command.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_no_command.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_no_command.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_no_command.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_registrar.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_registrar.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_registrar.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_registrar.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_registrar_not_found.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_registrar_not_found.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_registrar_not_found.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_registrar_not_found.txt
diff --git a/javatests/google/registry/whois/testdata/whois_action_transferred_domain.txt b/core/src/test/java/google/registry/whois/testdata/whois_action_transferred_domain.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_action_transferred_domain.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_action_transferred_domain.txt
diff --git a/javatests/google/registry/whois/testdata/whois_domain.txt b/core/src/test/java/google/registry/whois/testdata/whois_domain.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_domain.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_domain.txt
diff --git a/javatests/google/registry/whois/testdata/whois_domain_full_output.txt b/core/src/test/java/google/registry/whois/testdata/whois_domain_full_output.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_domain_full_output.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_domain_full_output.txt
diff --git a/javatests/google/registry/whois/testdata/whois_domain_registrar_abuse_info_missing.txt b/core/src/test/java/google/registry/whois/testdata/whois_domain_registrar_abuse_info_missing.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_domain_registrar_abuse_info_missing.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_domain_registrar_abuse_info_missing.txt
diff --git a/javatests/google/registry/whois/testdata/whois_multiple_nameservers.txt b/core/src/test/java/google/registry/whois/testdata/whois_multiple_nameservers.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_multiple_nameservers.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_multiple_nameservers.txt
diff --git a/javatests/google/registry/whois/testdata/whois_nameserver.txt b/core/src/test/java/google/registry/whois/testdata/whois_nameserver.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_nameserver.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_nameserver.txt
diff --git a/javatests/google/registry/whois/testdata/whois_registrar.txt b/core/src/test/java/google/registry/whois/testdata/whois_registrar.txt
similarity index 100%
rename from javatests/google/registry/whois/testdata/whois_registrar.txt
rename to core/src/test/java/google/registry/whois/testdata/whois_registrar.txt
diff --git a/javatests/google/registry/xjc/BUILD b/core/src/test/java/google/registry/xjc/BUILD
similarity index 100%
rename from javatests/google/registry/xjc/BUILD
rename to core/src/test/java/google/registry/xjc/BUILD
diff --git a/javatests/google/registry/xjc/JaxbFragmentTest.java b/core/src/test/java/google/registry/xjc/JaxbFragmentTest.java
similarity index 100%
rename from javatests/google/registry/xjc/JaxbFragmentTest.java
rename to core/src/test/java/google/registry/xjc/JaxbFragmentTest.java
diff --git a/javatests/google/registry/xjc/XjcObjectTest.java b/core/src/test/java/google/registry/xjc/XjcObjectTest.java
similarity index 100%
rename from javatests/google/registry/xjc/XjcObjectTest.java
rename to core/src/test/java/google/registry/xjc/XjcObjectTest.java
diff --git a/javatests/google/registry/xjc/XmlTestdataTest.java b/core/src/test/java/google/registry/xjc/XmlTestdataTest.java
similarity index 100%
rename from javatests/google/registry/xjc/XmlTestdataTest.java
rename to core/src/test/java/google/registry/xjc/XmlTestdataTest.java
diff --git a/javatests/google/registry/xjc/testdata/contact_check.xml b/core/src/test/java/google/registry/xjc/testdata/contact_check.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_check.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_check.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_check_response.xml b/core/src/test/java/google/registry/xjc/testdata/contact_check_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_check_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_check_response.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_create.xml b/core/src/test/java/google/registry/xjc/testdata/contact_create.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_create.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_create.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_create_response.xml b/core/src/test/java/google/registry/xjc/testdata/contact_create_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_create_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_create_response.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_create_response_offline_review.xml b/core/src/test/java/google/registry/xjc/testdata/contact_create_response_offline_review.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_create_response_offline_review.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_create_response_offline_review.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_create_response_offline_review_completed.xml b/core/src/test/java/google/registry/xjc/testdata/contact_create_response_offline_review_completed.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_create_response_offline_review_completed.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_create_response_offline_review_completed.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_delete.xml b/core/src/test/java/google/registry/xjc/testdata/contact_delete.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_delete.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_delete.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_delete_response.xml b/core/src/test/java/google/registry/xjc/testdata/contact_delete_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_delete_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_delete_response.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_info.xml b/core/src/test/java/google/registry/xjc/testdata/contact_info.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_info.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_info.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_info_response.xml b/core/src/test/java/google/registry/xjc/testdata/contact_info_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_info_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_info_response.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_transfer_query.xml b/core/src/test/java/google/registry/xjc/testdata/contact_transfer_query.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_transfer_query.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_transfer_query.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_transfer_query_response.xml b/core/src/test/java/google/registry/xjc/testdata/contact_transfer_query_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_transfer_query_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_transfer_query_response.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_transfer_request.xml b/core/src/test/java/google/registry/xjc/testdata/contact_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_transfer_request.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_transfer_request.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_transfer_request_response.xml b/core/src/test/java/google/registry/xjc/testdata/contact_transfer_request_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_transfer_request_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_transfer_request_response.xml
diff --git a/javatests/google/registry/xjc/testdata/contact_update.xml b/core/src/test/java/google/registry/xjc/testdata/contact_update.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/contact_update.xml
rename to core/src/test/java/google/registry/xjc/testdata/contact_update.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_check.xml b/core/src/test/java/google/registry/xjc/testdata/domain_check.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_check.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_check.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_check_response.xml b/core/src/test/java/google/registry/xjc/testdata/domain_check_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_check_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_check_response.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_create.xml b/core/src/test/java/google/registry/xjc/testdata/domain_create.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_create.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_create.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_create_response.xml b/core/src/test/java/google/registry/xjc/testdata/domain_create_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_create_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_create_response.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_create_response_offline_review.xml b/core/src/test/java/google/registry/xjc/testdata/domain_create_response_offline_review.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_create_response_offline_review.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_create_response_offline_review.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_create_response_offline_review_completed.xml b/core/src/test/java/google/registry/xjc/testdata/domain_create_response_offline_review_completed.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_create_response_offline_review_completed.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_create_response_offline_review_completed.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_delete.xml b/core/src/test/java/google/registry/xjc/testdata/domain_delete.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_delete.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_delete.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_info.xml b/core/src/test/java/google/registry/xjc/testdata/domain_info.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_info.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_info.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_info_response.xml b/core/src/test/java/google/registry/xjc/testdata/domain_info_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_info_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_info_response.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_info_response_addperiod.xml b/core/src/test/java/google/registry/xjc/testdata/domain_info_response_addperiod.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_info_response_addperiod.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_info_response_addperiod.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_info_response_pendingdelete.xml b/core/src/test/java/google/registry/xjc/testdata/domain_info_response_pendingdelete.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_info_response_pendingdelete.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_info_response_pendingdelete.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_info_response_pendingrestore.xml b/core/src/test/java/google/registry/xjc/testdata/domain_info_response_pendingrestore.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_info_response_pendingrestore.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_info_response_pendingrestore.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_info_response_redemptionperiod.xml b/core/src/test/java/google/registry/xjc/testdata/domain_info_response_redemptionperiod.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_info_response_redemptionperiod.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_info_response_redemptionperiod.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_info_response_unauthorized.xml b/core/src/test/java/google/registry/xjc/testdata/domain_info_response_unauthorized.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_info_response_unauthorized.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_info_response_unauthorized.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_info_with_auth.xml b/core/src/test/java/google/registry/xjc/testdata/domain_info_with_auth.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_info_with_auth.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_info_with_auth.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_renew.xml b/core/src/test/java/google/registry/xjc/testdata/domain_renew.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_renew.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_renew.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_renew_response.xml b/core/src/test/java/google/registry/xjc/testdata/domain_renew_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_renew_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_renew_response.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_transfer_query.xml b/core/src/test/java/google/registry/xjc/testdata/domain_transfer_query.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_transfer_query.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_transfer_query.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_transfer_query_response.xml b/core/src/test/java/google/registry/xjc/testdata/domain_transfer_query_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_transfer_query_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_transfer_query_response.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_transfer_request.xml b/core/src/test/java/google/registry/xjc/testdata/domain_transfer_request.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_transfer_request.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_transfer_request.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_transfer_request_response.xml b/core/src/test/java/google/registry/xjc/testdata/domain_transfer_request_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_transfer_request_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_transfer_request_response.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_update.xml b/core/src/test/java/google/registry/xjc/testdata/domain_update.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_update.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_update.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_update_restore_report.xml b/core/src/test/java/google/registry/xjc/testdata/domain_update_restore_report.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_update_restore_report.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_update_restore_report.xml
diff --git a/javatests/google/registry/xjc/testdata/domain_update_restore_request.xml b/core/src/test/java/google/registry/xjc/testdata/domain_update_restore_request.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/domain_update_restore_request.xml
rename to core/src/test/java/google/registry/xjc/testdata/domain_update_restore_request.xml
diff --git a/javatests/google/registry/xjc/testdata/generic_success_response.xml b/core/src/test/java/google/registry/xjc/testdata/generic_success_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/generic_success_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/generic_success_response.xml
diff --git a/javatests/google/registry/xjc/testdata/greeting.xml b/core/src/test/java/google/registry/xjc/testdata/greeting.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/greeting.xml
rename to core/src/test/java/google/registry/xjc/testdata/greeting.xml
diff --git a/javatests/google/registry/xjc/testdata/host_check.xml b/core/src/test/java/google/registry/xjc/testdata/host_check.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_check.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_check.xml
diff --git a/javatests/google/registry/xjc/testdata/host_check_response.xml b/core/src/test/java/google/registry/xjc/testdata/host_check_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_check_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_check_response.xml
diff --git a/javatests/google/registry/xjc/testdata/host_create.xml b/core/src/test/java/google/registry/xjc/testdata/host_create.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_create.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_create.xml
diff --git a/javatests/google/registry/xjc/testdata/host_create_response.xml b/core/src/test/java/google/registry/xjc/testdata/host_create_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_create_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_create_response.xml
diff --git a/javatests/google/registry/xjc/testdata/host_create_response_offline_review.xml b/core/src/test/java/google/registry/xjc/testdata/host_create_response_offline_review.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_create_response_offline_review.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_create_response_offline_review.xml
diff --git a/javatests/google/registry/xjc/testdata/host_create_response_offline_review_complete.xml b/core/src/test/java/google/registry/xjc/testdata/host_create_response_offline_review_complete.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_create_response_offline_review_complete.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_create_response_offline_review_complete.xml
diff --git a/javatests/google/registry/xjc/testdata/host_delete.xml b/core/src/test/java/google/registry/xjc/testdata/host_delete.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_delete.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_delete.xml
diff --git a/javatests/google/registry/xjc/testdata/host_delete_response.xml b/core/src/test/java/google/registry/xjc/testdata/host_delete_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_delete_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_delete_response.xml
diff --git a/javatests/google/registry/xjc/testdata/host_fragment.xml b/core/src/test/java/google/registry/xjc/testdata/host_fragment.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_fragment.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_fragment.xml
diff --git a/javatests/google/registry/xjc/testdata/host_info.xml b/core/src/test/java/google/registry/xjc/testdata/host_info.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_info.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_info.xml
diff --git a/javatests/google/registry/xjc/testdata/host_info_response.xml b/core/src/test/java/google/registry/xjc/testdata/host_info_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_info_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_info_response.xml
diff --git a/javatests/google/registry/xjc/testdata/host_update.xml b/core/src/test/java/google/registry/xjc/testdata/host_update.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/host_update.xml
rename to core/src/test/java/google/registry/xjc/testdata/host_update.xml
diff --git a/javatests/google/registry/xjc/testdata/invalid_greeting.xml b/core/src/test/java/google/registry/xjc/testdata/invalid_greeting.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/invalid_greeting.xml
rename to core/src/test/java/google/registry/xjc/testdata/invalid_greeting.xml
diff --git a/javatests/google/registry/xjc/testdata/login.xml b/core/src/test/java/google/registry/xjc/testdata/login.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/login.xml
rename to core/src/test/java/google/registry/xjc/testdata/login.xml
diff --git a/javatests/google/registry/xjc/testdata/logout.xml b/core/src/test/java/google/registry/xjc/testdata/logout.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/logout.xml
rename to core/src/test/java/google/registry/xjc/testdata/logout.xml
diff --git a/javatests/google/registry/xjc/testdata/logout_response.xml b/core/src/test/java/google/registry/xjc/testdata/logout_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/logout_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/logout_response.xml
diff --git a/javatests/google/registry/xjc/testdata/poll.xml b/core/src/test/java/google/registry/xjc/testdata/poll.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/poll.xml
rename to core/src/test/java/google/registry/xjc/testdata/poll.xml
diff --git a/javatests/google/registry/xjc/testdata/poll_ack.xml b/core/src/test/java/google/registry/xjc/testdata/poll_ack.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/poll_ack.xml
rename to core/src/test/java/google/registry/xjc/testdata/poll_ack.xml
diff --git a/javatests/google/registry/xjc/testdata/poll_ack_response.xml b/core/src/test/java/google/registry/xjc/testdata/poll_ack_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/poll_ack_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/poll_ack_response.xml
diff --git a/javatests/google/registry/xjc/testdata/poll_response_empty.xml b/core/src/test/java/google/registry/xjc/testdata/poll_response_empty.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/poll_response_empty.xml
rename to core/src/test/java/google/registry/xjc/testdata/poll_response_empty.xml
diff --git a/javatests/google/registry/xjc/testdata/poll_response_mixed.xml b/core/src/test/java/google/registry/xjc/testdata/poll_response_mixed.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/poll_response_mixed.xml
rename to core/src/test/java/google/registry/xjc/testdata/poll_response_mixed.xml
diff --git a/javatests/google/registry/xjc/testdata/rde_deposit_differential.xml b/core/src/test/java/google/registry/xjc/testdata/rde_deposit_differential.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/rde_deposit_differential.xml
rename to core/src/test/java/google/registry/xjc/testdata/rde_deposit_differential.xml
diff --git a/javatests/google/registry/xjc/testdata/rde_deposit_full.xml b/core/src/test/java/google/registry/xjc/testdata/rde_deposit_full.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/rde_deposit_full.xml
rename to core/src/test/java/google/registry/xjc/testdata/rde_deposit_full.xml
diff --git a/javatests/google/registry/xjc/testdata/restore_request_response.xml b/core/src/test/java/google/registry/xjc/testdata/restore_request_response.xml
similarity index 100%
rename from javatests/google/registry/xjc/testdata/restore_request_response.xml
rename to core/src/test/java/google/registry/xjc/testdata/restore_request_response.xml
diff --git a/javatests/google/registry/xml/BUILD b/core/src/test/java/google/registry/xml/BUILD
similarity index 100%
rename from javatests/google/registry/xml/BUILD
rename to core/src/test/java/google/registry/xml/BUILD
diff --git a/javatests/google/registry/xml/DateAdapterTest.java b/core/src/test/java/google/registry/xml/DateAdapterTest.java
similarity index 100%
rename from javatests/google/registry/xml/DateAdapterTest.java
rename to core/src/test/java/google/registry/xml/DateAdapterTest.java
diff --git a/javatests/google/registry/xml/TrimWhitespaceAdapterTest.java b/core/src/test/java/google/registry/xml/TrimWhitespaceAdapterTest.java
similarity index 100%
rename from javatests/google/registry/xml/TrimWhitespaceAdapterTest.java
rename to core/src/test/java/google/registry/xml/TrimWhitespaceAdapterTest.java
diff --git a/javatests/google/registry/xml/UtcDateTimeAdapterTest.java b/core/src/test/java/google/registry/xml/UtcDateTimeAdapterTest.java
similarity index 100%
rename from javatests/google/registry/xml/UtcDateTimeAdapterTest.java
rename to core/src/test/java/google/registry/xml/UtcDateTimeAdapterTest.java
diff --git a/javatests/google/registry/xml/XmlTestUtils.java b/core/src/test/java/google/registry/xml/XmlTestUtils.java
similarity index 100%
rename from javatests/google/registry/xml/XmlTestUtils.java
rename to core/src/test/java/google/registry/xml/XmlTestUtils.java
diff --git a/javatests/google/registry/xml/XmlTestUtilsTest.java b/core/src/test/java/google/registry/xml/XmlTestUtilsTest.java
similarity index 100%
rename from javatests/google/registry/xml/XmlTestUtilsTest.java
rename to core/src/test/java/google/registry/xml/XmlTestUtilsTest.java
diff --git a/javatests/google/registry/xml/testdata/simple.xml b/core/src/test/java/google/registry/xml/testdata/simple.xml
similarity index 100%
rename from javatests/google/registry/xml/testdata/simple.xml
rename to core/src/test/java/google/registry/xml/testdata/simple.xml
diff --git a/javatests/google/registry/xml/testdata/twoextensions_feeThenLaunch.xml b/core/src/test/java/google/registry/xml/testdata/twoextensions_feeThenLaunch.xml
similarity index 100%
rename from javatests/google/registry/xml/testdata/twoextensions_feeThenLaunch.xml
rename to core/src/test/java/google/registry/xml/testdata/twoextensions_feeThenLaunch.xml
diff --git a/javatests/google/registry/xml/testdata/twoextensions_feeThenLaunch2.xml b/core/src/test/java/google/registry/xml/testdata/twoextensions_feeThenLaunch2.xml
similarity index 100%
rename from javatests/google/registry/xml/testdata/twoextensions_feeThenLaunch2.xml
rename to core/src/test/java/google/registry/xml/testdata/twoextensions_feeThenLaunch2.xml
diff --git a/javatests/google/registry/xml/testdata/twoextensions_launchThenFee.xml b/core/src/test/java/google/registry/xml/testdata/twoextensions_launchThenFee.xml
similarity index 100%
rename from javatests/google/registry/xml/testdata/twoextensions_launchThenFee.xml
rename to core/src/test/java/google/registry/xml/testdata/twoextensions_launchThenFee.xml
diff --git a/gradle/dependencies.gradle b/dependencies.gradle
similarity index 100%
rename from gradle/dependencies.gradle
rename to dependencies.gradle
diff --git a/gradle/README.md b/docs/gradle.md
similarity index 83%
rename from gradle/README.md
rename to docs/gradle.md
index b9b457c56..cf5731df8 100644
--- a/gradle/README.md
+++ b/docs/gradle.md
@@ -1,30 +1,4 @@
-This folder contains experimental Gradle scripts as an alternative to Bazel for
-the open-source Nomulus project. These are work-in-progress and are expected to
-evolve in the near future.
-
-Gradle is configured to use the directory containing this file as root, but use
-the existing Nomulus source tree.
-
-All testing is done with Gradle v5.1.1.
-
-### Notable Issues
-
-Test suites (RdeTestSuite and TmchTestSuite) are ignored to avoid duplicate
-execution of tests. Neither suite performs any shared test setup routine, so it
-is easier to exclude the suite classes than individual test classes. This is the
-reason why all test tasks in the :core project contain the exclude pattern
-'"**/*TestCase.*", "**/*TestSuite.*"'
-
-Many Nomulus tests are not hermetic: they modify global state (e.g., the shared
-local instance of Datastore) but do not clean up on completion. This becomes a
-problem with Gradle. In the beginning we forced Gradle to run every test class
-in a new process, and incurred heavy overheads. Since then, we have fixed some
-tests, and manged to divide all tests into three suites that do not have
-intra-suite conflicts. We will revisit the remaining tests soon.
-
-Note that it is unclear if all conflicting tests have been identified. More may
-be exposed if test execution order changes, e.g., when new tests are added or
-execution parallelism level changes.
+# Gradle Build Documentation
 
 ## Initial Setup
 
@@ -56,3 +30,23 @@ GCP project ID.
 
 To deploy the Gradle build, you will need the Google Cloud SDK and its
 app-engine-java component.
+
+
+### Notable Issues
+
+Test suites (RdeTestSuite and TmchTestSuite) are ignored to avoid duplicate
+execution of tests. Neither suite performs any shared test setup routine, so it
+is easier to exclude the suite classes than individual test classes. This is the
+reason why all test tasks in the :core project contain the exclude pattern
+'"**/*TestCase.*", "**/*TestSuite.*"'
+
+Many Nomulus tests are not hermetic: they modify global state (e.g., the shared
+local instance of Datastore) but do not clean up on completion. This becomes a
+problem with Gradle. In the beginning we forced Gradle to run every test class
+in a new process, and incurred heavy overheads. Since then, we have fixed some
+tests, and manged to divide all tests into three suites that do not have
+intra-suite conflicts. We will revisit the remaining tests soon.
+
+Note that it is unclear if all conflicting tests have been identified. More may
+be exposed if test execution order changes, e.g., when new tests are added or
+execution parallelism level changes.
diff --git a/gradle/gradle.properties b/gradle.properties
similarity index 100%
rename from gradle/gradle.properties
rename to gradle.properties
diff --git a/gradle/gradle/dependency-locks/buildscript-classpath.lockfile b/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/gradle/dependency-locks/buildscript-classpath.lockfile
rename to gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from gradle/gradle/wrapper/gradle-wrapper.jar
rename to gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from gradle/gradle/wrapper/gradle-wrapper.properties
rename to gradle/wrapper/gradle-wrapper.properties
diff --git a/gradle/gradlew b/gradlew
similarity index 100%
rename from gradle/gradlew
rename to gradlew
diff --git a/gradle/gradlew.bat b/gradlew.bat
similarity index 100%
rename from gradle/gradlew.bat
rename to gradlew.bat
diff --git a/gradle/java_common.gradle b/java_common.gradle
similarity index 100%
rename from gradle/java_common.gradle
rename to java_common.gradle
diff --git a/javatests/google/registry/flows/testdata/hello.xml b/javatests/google/registry/flows/testdata/hello.xml
deleted file mode 100644
index 30fb4a0f7..000000000
--- a/javatests/google/registry/flows/testdata/hello.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <hello/>
-</epp>
diff --git a/gradle/node_modules/soyutils_usegoog.js b/node_modules/soyutils_usegoog.js
similarity index 100%
rename from gradle/node_modules/soyutils_usegoog.js
rename to node_modules/soyutils_usegoog.js
diff --git a/gradle/package-lock.json b/package-lock.json
similarity index 100%
rename from gradle/package-lock.json
rename to package-lock.json
diff --git a/gradle/package.json b/package.json
similarity index 100%
rename from gradle/package.json
rename to package.json
diff --git a/proxy/.gitignore b/proxy/.gitignore
new file mode 100644
index 000000000..89f9ac04a
--- /dev/null
+++ b/proxy/.gitignore
@@ -0,0 +1 @@
+out/
diff --git a/gradle/proxy/Dockerfile b/proxy/Dockerfile
similarity index 100%
rename from gradle/proxy/Dockerfile
rename to proxy/Dockerfile
diff --git a/gradle/proxy/build.gradle b/proxy/build.gradle
similarity index 95%
rename from gradle/proxy/build.gradle
rename to proxy/build.gradle
index 8ad68e9d2..4f971fa32 100644
--- a/gradle/proxy/build.gradle
+++ b/proxy/build.gradle
@@ -1,8 +1,10 @@
+apply plugin: 'java'
+
 sourceSets {
   main {
     resources {
-      exclude "${project.relativePath}/terraform/"
-      exclude "${project.relativePath}/kubernetes/"
+      exclude "${javaDir}/terraform/"
+      exclude "${javaDir}/kubernetes/"
     }
   }
 }
diff --git a/gradle/proxy/gradle/dependency-locks/annotationProcessor.lockfile b/proxy/gradle/dependency-locks/annotationProcessor.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/annotationProcessor.lockfile
rename to proxy/gradle/dependency-locks/annotationProcessor.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/buildscript-classpath.lockfile b/proxy/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/buildscript-classpath.lockfile
rename to proxy/gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/checkstyle.lockfile b/proxy/gradle/dependency-locks/checkstyle.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/checkstyle.lockfile
rename to proxy/gradle/dependency-locks/checkstyle.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/compile.lockfile b/proxy/gradle/dependency-locks/compile.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/compile.lockfile
rename to proxy/gradle/dependency-locks/compile.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/compileClasspath.lockfile b/proxy/gradle/dependency-locks/compileClasspath.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/compileClasspath.lockfile
rename to proxy/gradle/dependency-locks/compileClasspath.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/errorproneJavac.lockfile b/proxy/gradle/dependency-locks/errorproneJavac.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/errorproneJavac.lockfile
rename to proxy/gradle/dependency-locks/errorproneJavac.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/runtimeClasspath.lockfile b/proxy/gradle/dependency-locks/runtimeClasspath.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/runtimeClasspath.lockfile
rename to proxy/gradle/dependency-locks/runtimeClasspath.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/testAnnotationProcessor.lockfile b/proxy/gradle/dependency-locks/testAnnotationProcessor.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/testAnnotationProcessor.lockfile
rename to proxy/gradle/dependency-locks/testAnnotationProcessor.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/testCompile.lockfile b/proxy/gradle/dependency-locks/testCompile.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/testCompile.lockfile
rename to proxy/gradle/dependency-locks/testCompile.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/testCompileClasspath.lockfile b/proxy/gradle/dependency-locks/testCompileClasspath.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/testCompileClasspath.lockfile
rename to proxy/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/gradle/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile b/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile
similarity index 100%
rename from gradle/proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile
rename to proxy/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/java/google/registry/proxy/BUILD b/proxy/src/main/java/google/registry/proxy/BUILD
similarity index 100%
rename from java/google/registry/proxy/BUILD
rename to proxy/src/main/java/google/registry/proxy/BUILD
diff --git a/java/google/registry/proxy/CertificateModule.java b/proxy/src/main/java/google/registry/proxy/CertificateModule.java
similarity index 100%
rename from java/google/registry/proxy/CertificateModule.java
rename to proxy/src/main/java/google/registry/proxy/CertificateModule.java
diff --git a/java/google/registry/proxy/EppProtocolModule.java b/proxy/src/main/java/google/registry/proxy/EppProtocolModule.java
similarity index 100%
rename from java/google/registry/proxy/EppProtocolModule.java
rename to proxy/src/main/java/google/registry/proxy/EppProtocolModule.java
diff --git a/java/google/registry/proxy/GcpJsonFormatter.java b/proxy/src/main/java/google/registry/proxy/GcpJsonFormatter.java
similarity index 100%
rename from java/google/registry/proxy/GcpJsonFormatter.java
rename to proxy/src/main/java/google/registry/proxy/GcpJsonFormatter.java
diff --git a/java/google/registry/proxy/HealthCheckProtocolModule.java b/proxy/src/main/java/google/registry/proxy/HealthCheckProtocolModule.java
similarity index 100%
rename from java/google/registry/proxy/HealthCheckProtocolModule.java
rename to proxy/src/main/java/google/registry/proxy/HealthCheckProtocolModule.java
diff --git a/java/google/registry/proxy/HttpsRelayProtocolModule.java b/proxy/src/main/java/google/registry/proxy/HttpsRelayProtocolModule.java
similarity index 100%
rename from java/google/registry/proxy/HttpsRelayProtocolModule.java
rename to proxy/src/main/java/google/registry/proxy/HttpsRelayProtocolModule.java
diff --git a/java/google/registry/proxy/MetricsModule.java b/proxy/src/main/java/google/registry/proxy/MetricsModule.java
similarity index 100%
rename from java/google/registry/proxy/MetricsModule.java
rename to proxy/src/main/java/google/registry/proxy/MetricsModule.java
diff --git a/java/google/registry/proxy/Protocol.java b/proxy/src/main/java/google/registry/proxy/Protocol.java
similarity index 100%
rename from java/google/registry/proxy/Protocol.java
rename to proxy/src/main/java/google/registry/proxy/Protocol.java
diff --git a/java/google/registry/proxy/ProxyConfig.java b/proxy/src/main/java/google/registry/proxy/ProxyConfig.java
similarity index 100%
rename from java/google/registry/proxy/ProxyConfig.java
rename to proxy/src/main/java/google/registry/proxy/ProxyConfig.java
diff --git a/java/google/registry/proxy/ProxyModule.java b/proxy/src/main/java/google/registry/proxy/ProxyModule.java
similarity index 100%
rename from java/google/registry/proxy/ProxyModule.java
rename to proxy/src/main/java/google/registry/proxy/ProxyModule.java
diff --git a/java/google/registry/proxy/ProxyServer.java b/proxy/src/main/java/google/registry/proxy/ProxyServer.java
similarity index 100%
rename from java/google/registry/proxy/ProxyServer.java
rename to proxy/src/main/java/google/registry/proxy/ProxyServer.java
diff --git a/java/google/registry/proxy/WebWhoisProtocolsModule.java b/proxy/src/main/java/google/registry/proxy/WebWhoisProtocolsModule.java
similarity index 100%
rename from java/google/registry/proxy/WebWhoisProtocolsModule.java
rename to proxy/src/main/java/google/registry/proxy/WebWhoisProtocolsModule.java
diff --git a/java/google/registry/proxy/WhoisProtocolModule.java b/proxy/src/main/java/google/registry/proxy/WhoisProtocolModule.java
similarity index 100%
rename from java/google/registry/proxy/WhoisProtocolModule.java
rename to proxy/src/main/java/google/registry/proxy/WhoisProtocolModule.java
diff --git a/java/google/registry/proxy/config/default-config.yaml b/proxy/src/main/java/google/registry/proxy/config/default-config.yaml
similarity index 100%
rename from java/google/registry/proxy/config/default-config.yaml
rename to proxy/src/main/java/google/registry/proxy/config/default-config.yaml
diff --git a/java/google/registry/proxy/config/proxy-config-alpha.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-alpha.yaml
similarity index 100%
rename from java/google/registry/proxy/config/proxy-config-alpha.yaml
rename to proxy/src/main/java/google/registry/proxy/config/proxy-config-alpha.yaml
diff --git a/java/google/registry/proxy/config/proxy-config-crash-canary.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-crash-canary.yaml
similarity index 100%
rename from java/google/registry/proxy/config/proxy-config-crash-canary.yaml
rename to proxy/src/main/java/google/registry/proxy/config/proxy-config-crash-canary.yaml
diff --git a/java/google/registry/proxy/config/proxy-config-crash.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-crash.yaml
similarity index 100%
rename from java/google/registry/proxy/config/proxy-config-crash.yaml
rename to proxy/src/main/java/google/registry/proxy/config/proxy-config-crash.yaml
diff --git a/java/google/registry/proxy/config/proxy-config-local.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-local.yaml
similarity index 100%
rename from java/google/registry/proxy/config/proxy-config-local.yaml
rename to proxy/src/main/java/google/registry/proxy/config/proxy-config-local.yaml
diff --git a/java/google/registry/proxy/config/proxy-config-production-canary.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-production-canary.yaml
similarity index 100%
rename from java/google/registry/proxy/config/proxy-config-production-canary.yaml
rename to proxy/src/main/java/google/registry/proxy/config/proxy-config-production-canary.yaml
diff --git a/java/google/registry/proxy/config/proxy-config-production.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-production.yaml
similarity index 100%
rename from java/google/registry/proxy/config/proxy-config-production.yaml
rename to proxy/src/main/java/google/registry/proxy/config/proxy-config-production.yaml
diff --git a/java/google/registry/proxy/config/proxy-config-sandbox-canary.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-sandbox-canary.yaml
similarity index 100%
rename from java/google/registry/proxy/config/proxy-config-sandbox-canary.yaml
rename to proxy/src/main/java/google/registry/proxy/config/proxy-config-sandbox-canary.yaml
diff --git a/java/google/registry/proxy/config/proxy-config-sandbox.yaml b/proxy/src/main/java/google/registry/proxy/config/proxy-config-sandbox.yaml
similarity index 100%
rename from java/google/registry/proxy/config/proxy-config-sandbox.yaml
rename to proxy/src/main/java/google/registry/proxy/config/proxy-config-sandbox.yaml
diff --git a/java/google/registry/proxy/handler/BackendMetricsHandler.java b/proxy/src/main/java/google/registry/proxy/handler/BackendMetricsHandler.java
similarity index 100%
rename from java/google/registry/proxy/handler/BackendMetricsHandler.java
rename to proxy/src/main/java/google/registry/proxy/handler/BackendMetricsHandler.java
diff --git a/java/google/registry/proxy/handler/EppServiceHandler.java b/proxy/src/main/java/google/registry/proxy/handler/EppServiceHandler.java
similarity index 100%
rename from java/google/registry/proxy/handler/EppServiceHandler.java
rename to proxy/src/main/java/google/registry/proxy/handler/EppServiceHandler.java
diff --git a/java/google/registry/proxy/handler/HealthCheckHandler.java b/proxy/src/main/java/google/registry/proxy/handler/HealthCheckHandler.java
similarity index 100%
rename from java/google/registry/proxy/handler/HealthCheckHandler.java
rename to proxy/src/main/java/google/registry/proxy/handler/HealthCheckHandler.java
diff --git a/java/google/registry/proxy/handler/HttpsRelayServiceHandler.java b/proxy/src/main/java/google/registry/proxy/handler/HttpsRelayServiceHandler.java
similarity index 100%
rename from java/google/registry/proxy/handler/HttpsRelayServiceHandler.java
rename to proxy/src/main/java/google/registry/proxy/handler/HttpsRelayServiceHandler.java
diff --git a/java/google/registry/proxy/handler/ProxyProtocolHandler.java b/proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java
similarity index 100%
rename from java/google/registry/proxy/handler/ProxyProtocolHandler.java
rename to proxy/src/main/java/google/registry/proxy/handler/ProxyProtocolHandler.java
diff --git a/java/google/registry/proxy/handler/QuotaHandler.java b/proxy/src/main/java/google/registry/proxy/handler/QuotaHandler.java
similarity index 100%
rename from java/google/registry/proxy/handler/QuotaHandler.java
rename to proxy/src/main/java/google/registry/proxy/handler/QuotaHandler.java
diff --git a/java/google/registry/proxy/handler/RelayHandler.java b/proxy/src/main/java/google/registry/proxy/handler/RelayHandler.java
similarity index 100%
rename from java/google/registry/proxy/handler/RelayHandler.java
rename to proxy/src/main/java/google/registry/proxy/handler/RelayHandler.java
diff --git a/java/google/registry/proxy/handler/SslClientInitializer.java b/proxy/src/main/java/google/registry/proxy/handler/SslClientInitializer.java
similarity index 100%
rename from java/google/registry/proxy/handler/SslClientInitializer.java
rename to proxy/src/main/java/google/registry/proxy/handler/SslClientInitializer.java
diff --git a/java/google/registry/proxy/handler/SslServerInitializer.java b/proxy/src/main/java/google/registry/proxy/handler/SslServerInitializer.java
similarity index 100%
rename from java/google/registry/proxy/handler/SslServerInitializer.java
rename to proxy/src/main/java/google/registry/proxy/handler/SslServerInitializer.java
diff --git a/java/google/registry/proxy/handler/WebWhoisRedirectHandler.java b/proxy/src/main/java/google/registry/proxy/handler/WebWhoisRedirectHandler.java
similarity index 100%
rename from java/google/registry/proxy/handler/WebWhoisRedirectHandler.java
rename to proxy/src/main/java/google/registry/proxy/handler/WebWhoisRedirectHandler.java
diff --git a/java/google/registry/proxy/handler/WhoisServiceHandler.java b/proxy/src/main/java/google/registry/proxy/handler/WhoisServiceHandler.java
similarity index 100%
rename from java/google/registry/proxy/handler/WhoisServiceHandler.java
rename to proxy/src/main/java/google/registry/proxy/handler/WhoisServiceHandler.java
diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml b/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml
similarity index 100%
rename from java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml
rename to proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-alpha.yaml
diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml b/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml
similarity index 100%
rename from java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml
rename to proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-crash-canary.yaml
diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml b/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml
similarity index 100%
rename from java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml
rename to proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-crash.yaml
diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml b/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml
similarity index 100%
rename from java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml
rename to proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-production-canary.yaml
diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml b/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml
similarity index 100%
rename from java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml
rename to proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-production.yaml
diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml b/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml
similarity index 100%
rename from java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml
rename to proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox-canary.yaml
diff --git a/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml b/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml
similarity index 100%
rename from java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml
rename to proxy/src/main/java/google/registry/proxy/kubernetes/proxy-deployment-sandbox.yaml
diff --git a/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml b/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml
similarity index 100%
rename from java/google/registry/proxy/kubernetes/proxy-service-canary.yaml
rename to proxy/src/main/java/google/registry/proxy/kubernetes/proxy-service-canary.yaml
diff --git a/java/google/registry/proxy/kubernetes/proxy-service.yaml b/proxy/src/main/java/google/registry/proxy/kubernetes/proxy-service.yaml
similarity index 100%
rename from java/google/registry/proxy/kubernetes/proxy-service.yaml
rename to proxy/src/main/java/google/registry/proxy/kubernetes/proxy-service.yaml
diff --git a/java/google/registry/proxy/metric/BackendMetrics.java b/proxy/src/main/java/google/registry/proxy/metric/BackendMetrics.java
similarity index 100%
rename from java/google/registry/proxy/metric/BackendMetrics.java
rename to proxy/src/main/java/google/registry/proxy/metric/BackendMetrics.java
diff --git a/java/google/registry/proxy/metric/FrontendMetrics.java b/proxy/src/main/java/google/registry/proxy/metric/FrontendMetrics.java
similarity index 100%
rename from java/google/registry/proxy/metric/FrontendMetrics.java
rename to proxy/src/main/java/google/registry/proxy/metric/FrontendMetrics.java
diff --git a/java/google/registry/proxy/metric/MetricParameters.java b/proxy/src/main/java/google/registry/proxy/metric/MetricParameters.java
similarity index 100%
rename from java/google/registry/proxy/metric/MetricParameters.java
rename to proxy/src/main/java/google/registry/proxy/metric/MetricParameters.java
diff --git a/java/google/registry/proxy/quota/QuotaConfig.java b/proxy/src/main/java/google/registry/proxy/quota/QuotaConfig.java
similarity index 100%
rename from java/google/registry/proxy/quota/QuotaConfig.java
rename to proxy/src/main/java/google/registry/proxy/quota/QuotaConfig.java
diff --git a/java/google/registry/proxy/quota/QuotaManager.java b/proxy/src/main/java/google/registry/proxy/quota/QuotaManager.java
similarity index 100%
rename from java/google/registry/proxy/quota/QuotaManager.java
rename to proxy/src/main/java/google/registry/proxy/quota/QuotaManager.java
diff --git a/java/google/registry/proxy/quota/TokenStore.java b/proxy/src/main/java/google/registry/proxy/quota/TokenStore.java
similarity index 100%
rename from java/google/registry/proxy/quota/TokenStore.java
rename to proxy/src/main/java/google/registry/proxy/quota/TokenStore.java
diff --git a/java/google/registry/proxy/terraform/example_config.tf b/proxy/src/main/java/google/registry/proxy/terraform/example_config.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/example_config.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/example_config.tf
diff --git a/java/google/registry/proxy/terraform/modules/common.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/common.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/common.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/common.tf
diff --git a/java/google/registry/proxy/terraform/modules/gcs.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/gcs.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/gcs.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/gcs.tf
diff --git a/java/google/registry/proxy/terraform/modules/gke.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/gke.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/gke.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/gke.tf
diff --git a/java/google/registry/proxy/terraform/modules/gke/cluster.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/gke/cluster.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/gke/cluster.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/gke/cluster.tf
diff --git a/java/google/registry/proxy/terraform/modules/gke/output.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/gke/output.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/gke/output.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/gke/output.tf
diff --git a/java/google/registry/proxy/terraform/modules/gke/variables.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/gke/variables.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/gke/variables.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/gke/variables.tf
diff --git a/java/google/registry/proxy/terraform/modules/iam.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/iam.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/iam.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/iam.tf
diff --git a/java/google/registry/proxy/terraform/modules/kms.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/kms.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/kms.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/kms.tf
diff --git a/java/google/registry/proxy/terraform/modules/networking.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/networking.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/networking.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/networking.tf
diff --git a/java/google/registry/proxy/terraform/modules/networking/dns.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/networking/dns.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/networking/dns.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/networking/dns.tf
diff --git a/java/google/registry/proxy/terraform/modules/networking/loadbalancer.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/networking/loadbalancer.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/networking/loadbalancer.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/networking/loadbalancer.tf
diff --git a/java/google/registry/proxy/terraform/modules/networking/output.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/networking/output.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/networking/output.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/networking/output.tf
diff --git a/java/google/registry/proxy/terraform/modules/networking/variables.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/networking/variables.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/networking/variables.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/networking/variables.tf
diff --git a/java/google/registry/proxy/terraform/modules/output.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/output.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/output.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/output.tf
diff --git a/java/google/registry/proxy/terraform/modules/variables.tf b/proxy/src/main/java/google/registry/proxy/terraform/modules/variables.tf
similarity index 100%
rename from java/google/registry/proxy/terraform/modules/variables.tf
rename to proxy/src/main/java/google/registry/proxy/terraform/modules/variables.tf
diff --git a/java/google/registry/proxy/terraform/update_named_ports.sh b/proxy/src/main/java/google/registry/proxy/terraform/update_named_ports.sh
similarity index 100%
rename from java/google/registry/proxy/terraform/update_named_ports.sh
rename to proxy/src/main/java/google/registry/proxy/terraform/update_named_ports.sh
diff --git a/javatests/google/registry/proxy/BUILD b/proxy/src/test/java/google/registry/proxy/BUILD
similarity index 100%
rename from javatests/google/registry/proxy/BUILD
rename to proxy/src/test/java/google/registry/proxy/BUILD
diff --git a/javatests/google/registry/proxy/CertificateModuleTest.java b/proxy/src/test/java/google/registry/proxy/CertificateModuleTest.java
similarity index 100%
rename from javatests/google/registry/proxy/CertificateModuleTest.java
rename to proxy/src/test/java/google/registry/proxy/CertificateModuleTest.java
diff --git a/javatests/google/registry/proxy/EppProtocolModuleTest.java b/proxy/src/test/java/google/registry/proxy/EppProtocolModuleTest.java
similarity index 100%
rename from javatests/google/registry/proxy/EppProtocolModuleTest.java
rename to proxy/src/test/java/google/registry/proxy/EppProtocolModuleTest.java
diff --git a/javatests/google/registry/proxy/GcpJsonFormatterTest.java b/proxy/src/test/java/google/registry/proxy/GcpJsonFormatterTest.java
similarity index 100%
rename from javatests/google/registry/proxy/GcpJsonFormatterTest.java
rename to proxy/src/test/java/google/registry/proxy/GcpJsonFormatterTest.java
diff --git a/javatests/google/registry/proxy/HealthCheckProtocolModuleTest.java b/proxy/src/test/java/google/registry/proxy/HealthCheckProtocolModuleTest.java
similarity index 100%
rename from javatests/google/registry/proxy/HealthCheckProtocolModuleTest.java
rename to proxy/src/test/java/google/registry/proxy/HealthCheckProtocolModuleTest.java
diff --git a/javatests/google/registry/proxy/HttpsRelayProtocolModuleTest.java b/proxy/src/test/java/google/registry/proxy/HttpsRelayProtocolModuleTest.java
similarity index 100%
rename from javatests/google/registry/proxy/HttpsRelayProtocolModuleTest.java
rename to proxy/src/test/java/google/registry/proxy/HttpsRelayProtocolModuleTest.java
diff --git a/javatests/google/registry/proxy/ProtocolModuleTest.java b/proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java
similarity index 100%
rename from javatests/google/registry/proxy/ProtocolModuleTest.java
rename to proxy/src/test/java/google/registry/proxy/ProtocolModuleTest.java
diff --git a/javatests/google/registry/proxy/ProxyModuleTest.java b/proxy/src/test/java/google/registry/proxy/ProxyModuleTest.java
similarity index 100%
rename from javatests/google/registry/proxy/ProxyModuleTest.java
rename to proxy/src/test/java/google/registry/proxy/ProxyModuleTest.java
diff --git a/javatests/google/registry/proxy/TestUtils.java b/proxy/src/test/java/google/registry/proxy/TestUtils.java
similarity index 100%
rename from javatests/google/registry/proxy/TestUtils.java
rename to proxy/src/test/java/google/registry/proxy/TestUtils.java
diff --git a/javatests/google/registry/proxy/WebWhoisProtocolsModuleTest.java b/proxy/src/test/java/google/registry/proxy/WebWhoisProtocolsModuleTest.java
similarity index 100%
rename from javatests/google/registry/proxy/WebWhoisProtocolsModuleTest.java
rename to proxy/src/test/java/google/registry/proxy/WebWhoisProtocolsModuleTest.java
diff --git a/javatests/google/registry/proxy/WhoisProtocolModuleTest.java b/proxy/src/test/java/google/registry/proxy/WhoisProtocolModuleTest.java
similarity index 100%
rename from javatests/google/registry/proxy/WhoisProtocolModuleTest.java
rename to proxy/src/test/java/google/registry/proxy/WhoisProtocolModuleTest.java
diff --git a/javatests/google/registry/proxy/handler/BackendMetricsHandlerTest.java b/proxy/src/test/java/google/registry/proxy/handler/BackendMetricsHandlerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/BackendMetricsHandlerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/BackendMetricsHandlerTest.java
diff --git a/javatests/google/registry/proxy/handler/EppQuotaHandlerTest.java b/proxy/src/test/java/google/registry/proxy/handler/EppQuotaHandlerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/EppQuotaHandlerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/EppQuotaHandlerTest.java
diff --git a/javatests/google/registry/proxy/handler/EppServiceHandlerTest.java b/proxy/src/test/java/google/registry/proxy/handler/EppServiceHandlerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/EppServiceHandlerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/EppServiceHandlerTest.java
diff --git a/javatests/google/registry/proxy/handler/HealthCheckHandlerTest.java b/proxy/src/test/java/google/registry/proxy/handler/HealthCheckHandlerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/HealthCheckHandlerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/HealthCheckHandlerTest.java
diff --git a/javatests/google/registry/proxy/handler/NettyRule.java b/proxy/src/test/java/google/registry/proxy/handler/NettyRule.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/NettyRule.java
rename to proxy/src/test/java/google/registry/proxy/handler/NettyRule.java
diff --git a/javatests/google/registry/proxy/handler/ProxyProtocolHandlerTest.java b/proxy/src/test/java/google/registry/proxy/handler/ProxyProtocolHandlerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/ProxyProtocolHandlerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/ProxyProtocolHandlerTest.java
diff --git a/javatests/google/registry/proxy/handler/RelayHandlerTest.java b/proxy/src/test/java/google/registry/proxy/handler/RelayHandlerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/RelayHandlerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/RelayHandlerTest.java
diff --git a/javatests/google/registry/proxy/handler/SslClientInitializerTest.java b/proxy/src/test/java/google/registry/proxy/handler/SslClientInitializerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/SslClientInitializerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/SslClientInitializerTest.java
diff --git a/javatests/google/registry/proxy/handler/SslInitializerTestUtils.java b/proxy/src/test/java/google/registry/proxy/handler/SslInitializerTestUtils.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/SslInitializerTestUtils.java
rename to proxy/src/test/java/google/registry/proxy/handler/SslInitializerTestUtils.java
diff --git a/javatests/google/registry/proxy/handler/SslServerInitializerTest.java b/proxy/src/test/java/google/registry/proxy/handler/SslServerInitializerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/SslServerInitializerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/SslServerInitializerTest.java
diff --git a/javatests/google/registry/proxy/handler/WebWhoisRedirectHandlerTest.java b/proxy/src/test/java/google/registry/proxy/handler/WebWhoisRedirectHandlerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/WebWhoisRedirectHandlerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/WebWhoisRedirectHandlerTest.java
diff --git a/javatests/google/registry/proxy/handler/WhoisQuotaHandlerTest.java b/proxy/src/test/java/google/registry/proxy/handler/WhoisQuotaHandlerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/WhoisQuotaHandlerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/WhoisQuotaHandlerTest.java
diff --git a/javatests/google/registry/proxy/handler/WhoisServiceHandlerTest.java b/proxy/src/test/java/google/registry/proxy/handler/WhoisServiceHandlerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/handler/WhoisServiceHandlerTest.java
rename to proxy/src/test/java/google/registry/proxy/handler/WhoisServiceHandlerTest.java
diff --git a/javatests/google/registry/proxy/metric/BackendMetricsTest.java b/proxy/src/test/java/google/registry/proxy/metric/BackendMetricsTest.java
similarity index 100%
rename from javatests/google/registry/proxy/metric/BackendMetricsTest.java
rename to proxy/src/test/java/google/registry/proxy/metric/BackendMetricsTest.java
diff --git a/javatests/google/registry/proxy/metric/FrontendMetricsTest.java b/proxy/src/test/java/google/registry/proxy/metric/FrontendMetricsTest.java
similarity index 100%
rename from javatests/google/registry/proxy/metric/FrontendMetricsTest.java
rename to proxy/src/test/java/google/registry/proxy/metric/FrontendMetricsTest.java
diff --git a/javatests/google/registry/proxy/metric/MetricParametersTest.java b/proxy/src/test/java/google/registry/proxy/metric/MetricParametersTest.java
similarity index 100%
rename from javatests/google/registry/proxy/metric/MetricParametersTest.java
rename to proxy/src/test/java/google/registry/proxy/metric/MetricParametersTest.java
diff --git a/javatests/google/registry/proxy/quota/QuotaConfigTest.java b/proxy/src/test/java/google/registry/proxy/quota/QuotaConfigTest.java
similarity index 100%
rename from javatests/google/registry/proxy/quota/QuotaConfigTest.java
rename to proxy/src/test/java/google/registry/proxy/quota/QuotaConfigTest.java
diff --git a/javatests/google/registry/proxy/quota/QuotaManagerTest.java b/proxy/src/test/java/google/registry/proxy/quota/QuotaManagerTest.java
similarity index 100%
rename from javatests/google/registry/proxy/quota/QuotaManagerTest.java
rename to proxy/src/test/java/google/registry/proxy/quota/QuotaManagerTest.java
diff --git a/javatests/google/registry/proxy/quota/TokenStoreTest.java b/proxy/src/test/java/google/registry/proxy/quota/TokenStoreTest.java
similarity index 100%
rename from javatests/google/registry/proxy/quota/TokenStoreTest.java
rename to proxy/src/test/java/google/registry/proxy/quota/TokenStoreTest.java
diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_default.yaml b/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_default.yaml
similarity index 100%
rename from javatests/google/registry/proxy/quota/testdata/quota_config_default.yaml
rename to proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_default.yaml
diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml b/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml
similarity index 100%
rename from javatests/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml
rename to proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_duplicate.yaml
diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml b/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml
similarity index 100%
rename from javatests/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml
rename to proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_no_refresh_no_refill.yaml
diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_regular.yaml b/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_regular.yaml
similarity index 100%
rename from javatests/google/registry/proxy/quota/testdata/quota_config_regular.yaml
rename to proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_regular.yaml
diff --git a/javatests/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml b/proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml
similarity index 100%
rename from javatests/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml
rename to proxy/src/test/java/google/registry/proxy/quota/testdata/quota_config_unlimited_tokens.yaml
diff --git a/javatests/google/registry/flows/session/testdata/hello.xml b/proxy/src/test/java/google/registry/proxy/resources/hello.xml
similarity index 100%
rename from javatests/google/registry/flows/session/testdata/hello.xml
rename to proxy/src/test/java/google/registry/proxy/resources/hello.xml
diff --git a/javatests/google/registry/proxy/testdata/login.xml b/proxy/src/test/java/google/registry/proxy/testdata/login.xml
similarity index 100%
rename from javatests/google/registry/proxy/testdata/login.xml
rename to proxy/src/test/java/google/registry/proxy/testdata/login.xml
diff --git a/javatests/google/registry/proxy/testdata/login_response.xml b/proxy/src/test/java/google/registry/proxy/testdata/login_response.xml
similarity index 100%
rename from javatests/google/registry/proxy/testdata/login_response.xml
rename to proxy/src/test/java/google/registry/proxy/testdata/login_response.xml
diff --git a/javatests/google/registry/proxy/testdata/logout.xml b/proxy/src/test/java/google/registry/proxy/testdata/logout.xml
similarity index 100%
rename from javatests/google/registry/proxy/testdata/logout.xml
rename to proxy/src/test/java/google/registry/proxy/testdata/logout.xml
diff --git a/javatests/google/registry/proxy/testdata/logout_response.xml b/proxy/src/test/java/google/registry/proxy/testdata/logout_response.xml
similarity index 100%
rename from javatests/google/registry/proxy/testdata/logout_response.xml
rename to proxy/src/test/java/google/registry/proxy/testdata/logout_response.xml
diff --git a/release/build_nomulus_for_env.sh b/release/build_nomulus_for_env.sh
index 528be4c6b..ec3e6503e 100755
--- a/release/build_nomulus_for_env.sh
+++ b/release/build_nomulus_for_env.sh
@@ -31,29 +31,25 @@ if [ "${environment}" == tool ]
 then
   mkdir -p "${dest}"
 
-  cd gradle
   ./gradlew clean :core:nomulus \
     -PmavenUrl=https://"${gcs_prefix}"/maven \
     -PpluginsUrl=https://"${gcs_prefix}"/plugins
-  cd -
 
-  mv gradle/core/build/libs/nomulus.jar "${dest}"
+  mv core/build/libs/nomulus.jar "${dest}"
 else
   dest="${dest}/$1"
   mkdir -p "${dest}"
 
-  cd gradle
   ./gradlew clean stage -Penvironment="${environment}" \
     -PmavenUrl=https://"${gcs_prefix}"/maven \
     -PpluginsUrl=https://"${gcs_prefix}"/plugins
-  cd -
 
   for service in default pubapi backend tools
   do
-    mv gradle/services/"${service}"/build/staged-app "${dest}/${service}"
+    mv services/"${service}"/build/staged-app "${dest}/${service}"
   done
 
-  mv gradle/core/build/resources/main/google/registry/env/common/META-INF \
+  mv core/build/resources/main/google/registry/env/common/META-INF \
     "${dest}/META-INF"
 
   cd "${dest}"
diff --git a/release/cloudbuild-nomulus.yaml b/release/cloudbuild-nomulus.yaml
index 5f5ea6269..7cef08d6c 100644
--- a/release/cloudbuild-nomulus.yaml
+++ b/release/cloudbuild-nomulus.yaml
@@ -27,7 +27,6 @@ steps:
 # Run tests
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'
   args: ['./gradlew', 'test', '-PskipDockerIncompatibleTests=true']
-  dir: 'gradle'
 # Build the tool binary.
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'
   args: ['release/build_nomulus_for_env.sh', 'tool', 'output']
diff --git a/release/cloudbuild-proxy.yaml b/release/cloudbuild-proxy.yaml
index a792fee65..59c04bf2c 100644
--- a/release/cloudbuild-proxy.yaml
+++ b/release/cloudbuild-proxy.yaml
@@ -26,11 +26,10 @@ steps:
   - ':proxy:deployJar'
   - '-PmavenUrl=https://storage.googleapis.com/domain-registry-maven-repository/maven'
   - '-PpluginsUrl=https://storage.googleapis.com/domain-registry-maven-repository/plugins'
-  dir: 'gradle'
 # Build the docker image.
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'
   args: ['docker', 'build', '--tag', 'gcr.io/${PROJECT_ID}/proxy:${TAG_NAME}', '.']
-  dir: 'gradle/proxy'
+  dir: 'proxy'
 # Push the image. We can't let Cloud Build's default processing do that for us
 # because we need to push the image before we can sign it in the following
 # step.
diff --git a/release/cloudbuild-release.yaml b/release/cloudbuild-release.yaml
index 258f1f22d..419e1253a 100644
--- a/release/cloudbuild-release.yaml
+++ b/release/cloudbuild-release.yaml
@@ -64,7 +64,7 @@ steps:
       --format='get(digest)' --filter='tags = ${TAG_NAME}')
     base_digest=$(gcloud container images list-tags gcr.io/${PROJECT_ID}/base \
       --format='get(digest)' --filter='tags = ${TAG_NAME}')
-    sed -i s%distroless/java%${PROJECT_ID}/base@$base_digest% gradle/proxy/Dockerfile
+    sed -i s%distroless/java%${PROJECT_ID}/base@$base_digest% proxy/Dockerfile
     sed -i s/builder:latest/builder@$builder_digest/g release/cloudbuild-proxy.yaml
     sed -i s/builder:latest/builder@$builder_digest/g release/cloudbuild-nomulus.yaml
     sed -i s/GCP_PROJECT/${PROJECT_ID}/ java/google/registry/proxy/kubernetes/proxy-*.yaml
@@ -75,7 +75,7 @@ steps:
   args:
   - -c
   - |
-    gradle_url=$(grep distributionUrl gradle/gradle/wrapper/gradle-wrapper.properties \
+    gradle_url=$(grep distributionUrl gradle/wrapper/gradle-wrapper.properties \
       | awk -F = '{print $2}' | sed 's/\\//g')
     gradle_bin=$(basename $gradle_url)
     gcs_loc="domain-registry-maven-repository/gradle"
@@ -94,7 +94,7 @@ steps:
     fi
     rm ${gradle_bin}
     sed -i s%services.gradle.org/distributions%storage.googleapis.com/${gcs_loc}% \
-      gradle/gradle/wrapper/gradle-wrapper.properties
+      gradle/wrapper/gradle-wrapper.properties
 # Check out the release repo.
 - name: 'gcr.io/cloud-builders/gcloud'
   args: ['source', 'repos', 'clone', 'nomulus-release']
diff --git a/gradle/services/backend/README.txt b/services/backend/README.txt
similarity index 100%
rename from gradle/services/backend/README.txt
rename to services/backend/README.txt
diff --git a/gradle/services/backend/gradle/dependency-locks/buildscript-classpath.lockfile b/services/backend/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/services/backend/gradle/dependency-locks/buildscript-classpath.lockfile
rename to services/backend/gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/services/backend/gradle/dependency-locks/providedRuntime.lockfile b/services/backend/gradle/dependency-locks/providedRuntime.lockfile
similarity index 100%
rename from gradle/services/backend/gradle/dependency-locks/providedRuntime.lockfile
rename to services/backend/gradle/dependency-locks/providedRuntime.lockfile
diff --git a/gradle/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile b/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile
similarity index 100%
rename from gradle/services/backend/gradle/dependency-locks/runtimeClasspath.lockfile
rename to services/backend/gradle/dependency-locks/runtimeClasspath.lockfile
diff --git a/gradle/services/default/README.txt b/services/default/README.txt
similarity index 100%
rename from gradle/services/default/README.txt
rename to services/default/README.txt
diff --git a/gradle/services/default/gradle/dependency-locks/buildscript-classpath.lockfile b/services/default/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/services/default/gradle/dependency-locks/buildscript-classpath.lockfile
rename to services/default/gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/services/default/gradle/dependency-locks/providedRuntime.lockfile b/services/default/gradle/dependency-locks/providedRuntime.lockfile
similarity index 100%
rename from gradle/services/default/gradle/dependency-locks/providedRuntime.lockfile
rename to services/default/gradle/dependency-locks/providedRuntime.lockfile
diff --git a/gradle/services/default/gradle/dependency-locks/runtimeClasspath.lockfile b/services/default/gradle/dependency-locks/runtimeClasspath.lockfile
similarity index 100%
rename from gradle/services/default/gradle/dependency-locks/runtimeClasspath.lockfile
rename to services/default/gradle/dependency-locks/runtimeClasspath.lockfile
diff --git a/gradle/services/pubapi/README.txt b/services/pubapi/README.txt
similarity index 100%
rename from gradle/services/pubapi/README.txt
rename to services/pubapi/README.txt
diff --git a/gradle/services/pubapi/gradle/dependency-locks/buildscript-classpath.lockfile b/services/pubapi/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/services/pubapi/gradle/dependency-locks/buildscript-classpath.lockfile
rename to services/pubapi/gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/services/pubapi/gradle/dependency-locks/providedRuntime.lockfile b/services/pubapi/gradle/dependency-locks/providedRuntime.lockfile
similarity index 100%
rename from gradle/services/pubapi/gradle/dependency-locks/providedRuntime.lockfile
rename to services/pubapi/gradle/dependency-locks/providedRuntime.lockfile
diff --git a/gradle/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile b/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile
similarity index 100%
rename from gradle/services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile
rename to services/pubapi/gradle/dependency-locks/runtimeClasspath.lockfile
diff --git a/gradle/services/tools/README.txt b/services/tools/README.txt
similarity index 100%
rename from gradle/services/tools/README.txt
rename to services/tools/README.txt
diff --git a/gradle/services/tools/gradle/dependency-locks/buildscript-classpath.lockfile b/services/tools/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/services/tools/gradle/dependency-locks/buildscript-classpath.lockfile
rename to services/tools/gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/services/tools/gradle/dependency-locks/providedRuntime.lockfile b/services/tools/gradle/dependency-locks/providedRuntime.lockfile
similarity index 100%
rename from gradle/services/tools/gradle/dependency-locks/providedRuntime.lockfile
rename to services/tools/gradle/dependency-locks/providedRuntime.lockfile
diff --git a/gradle/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile b/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile
similarity index 100%
rename from gradle/services/tools/gradle/dependency-locks/runtimeClasspath.lockfile
rename to services/tools/gradle/dependency-locks/runtimeClasspath.lockfile
diff --git a/gradle/settings.gradle b/settings.gradle
similarity index 100%
rename from gradle/settings.gradle
rename to settings.gradle
diff --git a/gradle/third_party/build.gradle b/third_party/build.gradle
similarity index 74%
rename from gradle/third_party/build.gradle
rename to third_party/build.gradle
index acaf8c817..84e94541f 100644
--- a/gradle/third_party/build.gradle
+++ b/third_party/build.gradle
@@ -6,7 +6,7 @@ sourceSets {
   main {
     java {
       srcDirs = [
-          "${rootDir}/../third_party/junit/"
+          "${rootDir}/third_party/junit/"
       ]
       include '**/*.java'
     }
diff --git a/gradle/third_party/gradle/dependency-locks/annotationProcessor.lockfile b/third_party/gradle/dependency-locks/annotationProcessor.lockfile
similarity index 100%
rename from gradle/third_party/gradle/dependency-locks/annotationProcessor.lockfile
rename to third_party/gradle/dependency-locks/annotationProcessor.lockfile
diff --git a/gradle/third_party/gradle/dependency-locks/buildscript-classpath.lockfile b/third_party/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/third_party/gradle/dependency-locks/buildscript-classpath.lockfile
rename to third_party/gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/third_party/gradle/dependency-locks/checkstyle.lockfile b/third_party/gradle/dependency-locks/checkstyle.lockfile
similarity index 100%
rename from gradle/third_party/gradle/dependency-locks/checkstyle.lockfile
rename to third_party/gradle/dependency-locks/checkstyle.lockfile
diff --git a/gradle/third_party/gradle/dependency-locks/compile.lockfile b/third_party/gradle/dependency-locks/compile.lockfile
similarity index 100%
rename from gradle/third_party/gradle/dependency-locks/compile.lockfile
rename to third_party/gradle/dependency-locks/compile.lockfile
diff --git a/gradle/third_party/gradle/dependency-locks/compileClasspath.lockfile b/third_party/gradle/dependency-locks/compileClasspath.lockfile
similarity index 100%
rename from gradle/third_party/gradle/dependency-locks/compileClasspath.lockfile
rename to third_party/gradle/dependency-locks/compileClasspath.lockfile
diff --git a/gradle/third_party/gradle/dependency-locks/errorproneJavac.lockfile b/third_party/gradle/dependency-locks/errorproneJavac.lockfile
similarity index 100%
rename from gradle/third_party/gradle/dependency-locks/errorproneJavac.lockfile
rename to third_party/gradle/dependency-locks/errorproneJavac.lockfile
diff --git a/gradle/third_party/gradle/dependency-locks/runtimeClasspath.lockfile b/third_party/gradle/dependency-locks/runtimeClasspath.lockfile
similarity index 100%
rename from gradle/third_party/gradle/dependency-locks/runtimeClasspath.lockfile
rename to third_party/gradle/dependency-locks/runtimeClasspath.lockfile
diff --git a/gradle/third_party/gradle/dependency-locks/testCompile.lockfile b/third_party/gradle/dependency-locks/testCompile.lockfile
similarity index 100%
rename from gradle/third_party/gradle/dependency-locks/testCompile.lockfile
rename to third_party/gradle/dependency-locks/testCompile.lockfile
diff --git a/gradle/third_party/gradle/dependency-locks/testRuntimeClasspath.lockfile b/third_party/gradle/dependency-locks/testRuntimeClasspath.lockfile
similarity index 100%
rename from gradle/third_party/gradle/dependency-locks/testRuntimeClasspath.lockfile
rename to third_party/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/gradle/util/build.gradle b/util/build.gradle
similarity index 93%
rename from gradle/util/build.gradle
rename to util/build.gradle
index c00b77019..28a39dd5d 100644
--- a/gradle/util/build.gradle
+++ b/util/build.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'java'
+
 dependencies {
   def deps = rootProject.dependencyMap
   compile deps['com.google.appengine:appengine-api-1.0-sdk']
@@ -22,7 +24,7 @@ dependencies {
   testCompile deps['org.hamcrest:hamcrest-all']
   testCompile deps['org.hamcrest:hamcrest-core']
   testCompile deps['org.mockito:mockito-core']
-  testCompile files("${rootDir}/../third_party/objectify/v4_1/objectify-4.1.3.jar")
+  testCompile files("${rootDir}/third_party/objectify/v4_1/objectify-4.1.3.jar")
   testCompile project(':third_party')
   testCompile project(path: ':core', configuration: 'testRuntime')
   annotationProcessor deps['com.google.auto.value:auto-value']
diff --git a/gradle/util/gradle/dependency-locks/annotationProcessor.lockfile b/util/gradle/dependency-locks/annotationProcessor.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/annotationProcessor.lockfile
rename to util/gradle/dependency-locks/annotationProcessor.lockfile
diff --git a/gradle/util/gradle/dependency-locks/buildscript-classpath.lockfile b/util/gradle/dependency-locks/buildscript-classpath.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/buildscript-classpath.lockfile
rename to util/gradle/dependency-locks/buildscript-classpath.lockfile
diff --git a/gradle/util/gradle/dependency-locks/checkstyle.lockfile b/util/gradle/dependency-locks/checkstyle.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/checkstyle.lockfile
rename to util/gradle/dependency-locks/checkstyle.lockfile
diff --git a/gradle/util/gradle/dependency-locks/compile.lockfile b/util/gradle/dependency-locks/compile.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/compile.lockfile
rename to util/gradle/dependency-locks/compile.lockfile
diff --git a/gradle/util/gradle/dependency-locks/compileClasspath.lockfile b/util/gradle/dependency-locks/compileClasspath.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/compileClasspath.lockfile
rename to util/gradle/dependency-locks/compileClasspath.lockfile
diff --git a/gradle/util/gradle/dependency-locks/errorproneJavac.lockfile b/util/gradle/dependency-locks/errorproneJavac.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/errorproneJavac.lockfile
rename to util/gradle/dependency-locks/errorproneJavac.lockfile
diff --git a/gradle/util/gradle/dependency-locks/runtimeClasspath.lockfile b/util/gradle/dependency-locks/runtimeClasspath.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/runtimeClasspath.lockfile
rename to util/gradle/dependency-locks/runtimeClasspath.lockfile
diff --git a/gradle/util/gradle/dependency-locks/testAnnotationProcessor.lockfile b/util/gradle/dependency-locks/testAnnotationProcessor.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/testAnnotationProcessor.lockfile
rename to util/gradle/dependency-locks/testAnnotationProcessor.lockfile
diff --git a/gradle/util/gradle/dependency-locks/testCompile.lockfile b/util/gradle/dependency-locks/testCompile.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/testCompile.lockfile
rename to util/gradle/dependency-locks/testCompile.lockfile
diff --git a/gradle/util/gradle/dependency-locks/testCompileClasspath.lockfile b/util/gradle/dependency-locks/testCompileClasspath.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/testCompileClasspath.lockfile
rename to util/gradle/dependency-locks/testCompileClasspath.lockfile
diff --git a/gradle/util/gradle/dependency-locks/testRuntimeClasspath.lockfile b/util/gradle/dependency-locks/testRuntimeClasspath.lockfile
similarity index 100%
rename from gradle/util/gradle/dependency-locks/testRuntimeClasspath.lockfile
rename to util/gradle/dependency-locks/testRuntimeClasspath.lockfile
diff --git a/java/google/registry/util/AppEngineServiceUtils.java b/util/src/main/java/google/registry/util/AppEngineServiceUtils.java
similarity index 100%
rename from java/google/registry/util/AppEngineServiceUtils.java
rename to util/src/main/java/google/registry/util/AppEngineServiceUtils.java
diff --git a/java/google/registry/util/AppEngineServiceUtilsImpl.java b/util/src/main/java/google/registry/util/AppEngineServiceUtilsImpl.java
similarity index 100%
rename from java/google/registry/util/AppEngineServiceUtilsImpl.java
rename to util/src/main/java/google/registry/util/AppEngineServiceUtilsImpl.java
diff --git a/java/google/registry/util/AppEngineTimeLimiter.java b/util/src/main/java/google/registry/util/AppEngineTimeLimiter.java
similarity index 100%
rename from java/google/registry/util/AppEngineTimeLimiter.java
rename to util/src/main/java/google/registry/util/AppEngineTimeLimiter.java
diff --git a/java/google/registry/util/BUILD b/util/src/main/java/google/registry/util/BUILD
similarity index 100%
rename from java/google/registry/util/BUILD
rename to util/src/main/java/google/registry/util/BUILD
diff --git a/java/google/registry/util/BuildPathUtils.java b/util/src/main/java/google/registry/util/BuildPathUtils.java
similarity index 94%
rename from java/google/registry/util/BuildPathUtils.java
rename to util/src/main/java/google/registry/util/BuildPathUtils.java
index 427535965..f96489df1 100644
--- a/java/google/registry/util/BuildPathUtils.java
+++ b/util/src/main/java/google/registry/util/BuildPathUtils.java
@@ -22,7 +22,7 @@ public final class BuildPathUtils {
   // When we run the build from gradlew's directory, the current working directory would be
   // ${projectRoot}/gradle/${subproject}. So, the project root is the grand parent of it.
   private static final Path PROJECT_ROOT =
-      Paths.get(System.getProperty("test.projectRoot", "../../")).normalize();
+      Paths.get(System.getProperty("test.projectRoot", "../")).normalize();
   private static final Path RESOURCES_DIR =
       Paths.get(System.getProperty("test.resourcesDir", "build/resources/main")).normalize();
 
diff --git a/java/google/registry/util/CapturingLogHandler.java b/util/src/main/java/google/registry/util/CapturingLogHandler.java
similarity index 100%
rename from java/google/registry/util/CapturingLogHandler.java
rename to util/src/main/java/google/registry/util/CapturingLogHandler.java
diff --git a/java/google/registry/util/CidrAddressBlock.java b/util/src/main/java/google/registry/util/CidrAddressBlock.java
similarity index 100%
rename from java/google/registry/util/CidrAddressBlock.java
rename to util/src/main/java/google/registry/util/CidrAddressBlock.java
diff --git a/java/google/registry/util/Clock.java b/util/src/main/java/google/registry/util/Clock.java
similarity index 100%
rename from java/google/registry/util/Clock.java
rename to util/src/main/java/google/registry/util/Clock.java
diff --git a/java/google/registry/util/CollectionUtils.java b/util/src/main/java/google/registry/util/CollectionUtils.java
similarity index 100%
rename from java/google/registry/util/CollectionUtils.java
rename to util/src/main/java/google/registry/util/CollectionUtils.java
diff --git a/java/google/registry/util/ComparingInvocationHandler.java b/util/src/main/java/google/registry/util/ComparingInvocationHandler.java
similarity index 100%
rename from java/google/registry/util/ComparingInvocationHandler.java
rename to util/src/main/java/google/registry/util/ComparingInvocationHandler.java
diff --git a/java/google/registry/util/Concurrent.java b/util/src/main/java/google/registry/util/Concurrent.java
similarity index 100%
rename from java/google/registry/util/Concurrent.java
rename to util/src/main/java/google/registry/util/Concurrent.java
diff --git a/java/google/registry/util/DatastoreServiceUtils.java b/util/src/main/java/google/registry/util/DatastoreServiceUtils.java
similarity index 100%
rename from java/google/registry/util/DatastoreServiceUtils.java
rename to util/src/main/java/google/registry/util/DatastoreServiceUtils.java
diff --git a/java/google/registry/util/DateTimeUtils.java b/util/src/main/java/google/registry/util/DateTimeUtils.java
similarity index 100%
rename from java/google/registry/util/DateTimeUtils.java
rename to util/src/main/java/google/registry/util/DateTimeUtils.java
diff --git a/java/google/registry/util/DiffUtils.java b/util/src/main/java/google/registry/util/DiffUtils.java
similarity index 100%
rename from java/google/registry/util/DiffUtils.java
rename to util/src/main/java/google/registry/util/DiffUtils.java
diff --git a/java/google/registry/util/DomainNameUtils.java b/util/src/main/java/google/registry/util/DomainNameUtils.java
similarity index 100%
rename from java/google/registry/util/DomainNameUtils.java
rename to util/src/main/java/google/registry/util/DomainNameUtils.java
diff --git a/java/google/registry/util/EmailMessage.java b/util/src/main/java/google/registry/util/EmailMessage.java
similarity index 100%
rename from java/google/registry/util/EmailMessage.java
rename to util/src/main/java/google/registry/util/EmailMessage.java
diff --git a/java/google/registry/util/FixedClock.java b/util/src/main/java/google/registry/util/FixedClock.java
similarity index 100%
rename from java/google/registry/util/FixedClock.java
rename to util/src/main/java/google/registry/util/FixedClock.java
diff --git a/java/google/registry/util/HexDumper.java b/util/src/main/java/google/registry/util/HexDumper.java
similarity index 100%
rename from java/google/registry/util/HexDumper.java
rename to util/src/main/java/google/registry/util/HexDumper.java
diff --git a/java/google/registry/util/Idn.java b/util/src/main/java/google/registry/util/Idn.java
similarity index 100%
rename from java/google/registry/util/Idn.java
rename to util/src/main/java/google/registry/util/Idn.java
diff --git a/java/google/registry/util/ImprovedInputStream.java b/util/src/main/java/google/registry/util/ImprovedInputStream.java
similarity index 100%
rename from java/google/registry/util/ImprovedInputStream.java
rename to util/src/main/java/google/registry/util/ImprovedInputStream.java
diff --git a/java/google/registry/util/ImprovedOutputStream.java b/util/src/main/java/google/registry/util/ImprovedOutputStream.java
similarity index 100%
rename from java/google/registry/util/ImprovedOutputStream.java
rename to util/src/main/java/google/registry/util/ImprovedOutputStream.java
diff --git a/java/google/registry/util/JavaCharMatchers.java b/util/src/main/java/google/registry/util/JavaCharMatchers.java
similarity index 100%
rename from java/google/registry/util/JavaCharMatchers.java
rename to util/src/main/java/google/registry/util/JavaCharMatchers.java
diff --git a/java/google/registry/util/ListNamingUtils.java b/util/src/main/java/google/registry/util/ListNamingUtils.java
similarity index 100%
rename from java/google/registry/util/ListNamingUtils.java
rename to util/src/main/java/google/registry/util/ListNamingUtils.java
diff --git a/java/google/registry/util/NetworkUtils.java b/util/src/main/java/google/registry/util/NetworkUtils.java
similarity index 100%
rename from java/google/registry/util/NetworkUtils.java
rename to util/src/main/java/google/registry/util/NetworkUtils.java
diff --git a/java/google/registry/util/NonFinalForTesting.java b/util/src/main/java/google/registry/util/NonFinalForTesting.java
similarity index 100%
rename from java/google/registry/util/NonFinalForTesting.java
rename to util/src/main/java/google/registry/util/NonFinalForTesting.java
diff --git a/java/google/registry/util/PosixTarHeader.java b/util/src/main/java/google/registry/util/PosixTarHeader.java
similarity index 100%
rename from java/google/registry/util/PosixTarHeader.java
rename to util/src/main/java/google/registry/util/PosixTarHeader.java
diff --git a/java/google/registry/util/PreconditionsUtils.java b/util/src/main/java/google/registry/util/PreconditionsUtils.java
similarity index 100%
rename from java/google/registry/util/PreconditionsUtils.java
rename to util/src/main/java/google/registry/util/PreconditionsUtils.java
diff --git a/java/google/registry/util/PredicateUtils.java b/util/src/main/java/google/registry/util/PredicateUtils.java
similarity index 100%
rename from java/google/registry/util/PredicateUtils.java
rename to util/src/main/java/google/registry/util/PredicateUtils.java
diff --git a/java/google/registry/util/RandomStringGenerator.java b/util/src/main/java/google/registry/util/RandomStringGenerator.java
similarity index 100%
rename from java/google/registry/util/RandomStringGenerator.java
rename to util/src/main/java/google/registry/util/RandomStringGenerator.java
diff --git a/java/google/registry/util/RegistrarUtils.java b/util/src/main/java/google/registry/util/RegistrarUtils.java
similarity index 100%
rename from java/google/registry/util/RegistrarUtils.java
rename to util/src/main/java/google/registry/util/RegistrarUtils.java
diff --git a/java/google/registry/util/RequestStatusChecker.java b/util/src/main/java/google/registry/util/RequestStatusChecker.java
similarity index 100%
rename from java/google/registry/util/RequestStatusChecker.java
rename to util/src/main/java/google/registry/util/RequestStatusChecker.java
diff --git a/java/google/registry/util/RequestStatusCheckerImpl.java b/util/src/main/java/google/registry/util/RequestStatusCheckerImpl.java
similarity index 100%
rename from java/google/registry/util/RequestStatusCheckerImpl.java
rename to util/src/main/java/google/registry/util/RequestStatusCheckerImpl.java
diff --git a/java/google/registry/util/ResourceUtils.java b/util/src/main/java/google/registry/util/ResourceUtils.java
similarity index 100%
rename from java/google/registry/util/ResourceUtils.java
rename to util/src/main/java/google/registry/util/ResourceUtils.java
diff --git a/java/google/registry/util/Retrier.java b/util/src/main/java/google/registry/util/Retrier.java
similarity index 100%
rename from java/google/registry/util/Retrier.java
rename to util/src/main/java/google/registry/util/Retrier.java
diff --git a/java/google/registry/util/SendEmailService.java b/util/src/main/java/google/registry/util/SendEmailService.java
similarity index 100%
rename from java/google/registry/util/SendEmailService.java
rename to util/src/main/java/google/registry/util/SendEmailService.java
diff --git a/java/google/registry/util/SerializeUtils.java b/util/src/main/java/google/registry/util/SerializeUtils.java
similarity index 100%
rename from java/google/registry/util/SerializeUtils.java
rename to util/src/main/java/google/registry/util/SerializeUtils.java
diff --git a/java/google/registry/util/Sleeper.java b/util/src/main/java/google/registry/util/Sleeper.java
similarity index 100%
rename from java/google/registry/util/Sleeper.java
rename to util/src/main/java/google/registry/util/Sleeper.java
diff --git a/java/google/registry/util/SqlTemplate.java b/util/src/main/java/google/registry/util/SqlTemplate.java
similarity index 100%
rename from java/google/registry/util/SqlTemplate.java
rename to util/src/main/java/google/registry/util/SqlTemplate.java
diff --git a/java/google/registry/util/StringGenerator.java b/util/src/main/java/google/registry/util/StringGenerator.java
similarity index 100%
rename from java/google/registry/util/StringGenerator.java
rename to util/src/main/java/google/registry/util/StringGenerator.java
diff --git a/java/google/registry/util/SystemClock.java b/util/src/main/java/google/registry/util/SystemClock.java
similarity index 100%
rename from java/google/registry/util/SystemClock.java
rename to util/src/main/java/google/registry/util/SystemClock.java
diff --git a/java/google/registry/util/SystemSleeper.java b/util/src/main/java/google/registry/util/SystemSleeper.java
similarity index 100%
rename from java/google/registry/util/SystemSleeper.java
rename to util/src/main/java/google/registry/util/SystemSleeper.java
diff --git a/java/google/registry/util/TaskQueueUtils.java b/util/src/main/java/google/registry/util/TaskQueueUtils.java
similarity index 100%
rename from java/google/registry/util/TaskQueueUtils.java
rename to util/src/main/java/google/registry/util/TaskQueueUtils.java
diff --git a/java/google/registry/util/TeeOutputStream.java b/util/src/main/java/google/registry/util/TeeOutputStream.java
similarity index 100%
rename from java/google/registry/util/TeeOutputStream.java
rename to util/src/main/java/google/registry/util/TeeOutputStream.java
diff --git a/java/google/registry/util/TransportEmailSender.java b/util/src/main/java/google/registry/util/TransportEmailSender.java
similarity index 100%
rename from java/google/registry/util/TransportEmailSender.java
rename to util/src/main/java/google/registry/util/TransportEmailSender.java
diff --git a/java/google/registry/util/TypeUtils.java b/util/src/main/java/google/registry/util/TypeUtils.java
similarity index 100%
rename from java/google/registry/util/TypeUtils.java
rename to util/src/main/java/google/registry/util/TypeUtils.java
diff --git a/java/google/registry/util/UrlChecker.java b/util/src/main/java/google/registry/util/UrlChecker.java
similarity index 100%
rename from java/google/registry/util/UrlChecker.java
rename to util/src/main/java/google/registry/util/UrlChecker.java
diff --git a/java/google/registry/util/UrlFetchException.java b/util/src/main/java/google/registry/util/UrlFetchException.java
similarity index 100%
rename from java/google/registry/util/UrlFetchException.java
rename to util/src/main/java/google/registry/util/UrlFetchException.java
diff --git a/java/google/registry/util/UrlFetchUtils.java b/util/src/main/java/google/registry/util/UrlFetchUtils.java
similarity index 100%
rename from java/google/registry/util/UrlFetchUtils.java
rename to util/src/main/java/google/registry/util/UrlFetchUtils.java
diff --git a/java/google/registry/util/UtilsModule.java b/util/src/main/java/google/registry/util/UtilsModule.java
similarity index 100%
rename from java/google/registry/util/UtilsModule.java
rename to util/src/main/java/google/registry/util/UtilsModule.java
diff --git a/java/google/registry/util/VoidCallable.java b/util/src/main/java/google/registry/util/VoidCallable.java
similarity index 100%
rename from java/google/registry/util/VoidCallable.java
rename to util/src/main/java/google/registry/util/VoidCallable.java
diff --git a/java/google/registry/util/X509Utils.java b/util/src/main/java/google/registry/util/X509Utils.java
similarity index 100%
rename from java/google/registry/util/X509Utils.java
rename to util/src/main/java/google/registry/util/X509Utils.java
diff --git a/java/google/registry/util/XmlEnumUtils.java b/util/src/main/java/google/registry/util/XmlEnumUtils.java
similarity index 100%
rename from java/google/registry/util/XmlEnumUtils.java
rename to util/src/main/java/google/registry/util/XmlEnumUtils.java
diff --git a/java/google/registry/util/XmlToEnumMapper.java b/util/src/main/java/google/registry/util/XmlToEnumMapper.java
similarity index 100%
rename from java/google/registry/util/XmlToEnumMapper.java
rename to util/src/main/java/google/registry/util/XmlToEnumMapper.java
diff --git a/java/google/registry/util/YamlUtils.java b/util/src/main/java/google/registry/util/YamlUtils.java
similarity index 100%
rename from java/google/registry/util/YamlUtils.java
rename to util/src/main/java/google/registry/util/YamlUtils.java
diff --git a/java/google/registry/util/package-info.java b/util/src/main/java/google/registry/util/package-info.java
similarity index 100%
rename from java/google/registry/util/package-info.java
rename to util/src/main/java/google/registry/util/package-info.java
diff --git a/javatests/google/registry/util/AppEngineServiceUtilsImplTest.java b/util/src/test/java/google/registry/util/AppEngineServiceUtilsImplTest.java
similarity index 100%
rename from javatests/google/registry/util/AppEngineServiceUtilsImplTest.java
rename to util/src/test/java/google/registry/util/AppEngineServiceUtilsImplTest.java
diff --git a/javatests/google/registry/util/BUILD b/util/src/test/java/google/registry/util/BUILD
similarity index 100%
rename from javatests/google/registry/util/BUILD
rename to util/src/test/java/google/registry/util/BUILD
diff --git a/javatests/google/registry/util/CidrAddressBlockTest.java b/util/src/test/java/google/registry/util/CidrAddressBlockTest.java
similarity index 100%
rename from javatests/google/registry/util/CidrAddressBlockTest.java
rename to util/src/test/java/google/registry/util/CidrAddressBlockTest.java
diff --git a/javatests/google/registry/util/CollectionUtilsTest.java b/util/src/test/java/google/registry/util/CollectionUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/CollectionUtilsTest.java
rename to util/src/test/java/google/registry/util/CollectionUtilsTest.java
diff --git a/javatests/google/registry/util/ComparingInvocationHandlerTest.java b/util/src/test/java/google/registry/util/ComparingInvocationHandlerTest.java
similarity index 100%
rename from javatests/google/registry/util/ComparingInvocationHandlerTest.java
rename to util/src/test/java/google/registry/util/ComparingInvocationHandlerTest.java
diff --git a/javatests/google/registry/util/ConcurrentTest.java b/util/src/test/java/google/registry/util/ConcurrentTest.java
similarity index 100%
rename from javatests/google/registry/util/ConcurrentTest.java
rename to util/src/test/java/google/registry/util/ConcurrentTest.java
diff --git a/javatests/google/registry/util/DateTimeUtilsTest.java b/util/src/test/java/google/registry/util/DateTimeUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/DateTimeUtilsTest.java
rename to util/src/test/java/google/registry/util/DateTimeUtilsTest.java
diff --git a/javatests/google/registry/util/DiffUtilsTest.java b/util/src/test/java/google/registry/util/DiffUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/DiffUtilsTest.java
rename to util/src/test/java/google/registry/util/DiffUtilsTest.java
diff --git a/javatests/google/registry/util/DomainNameUtilsTest.java b/util/src/test/java/google/registry/util/DomainNameUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/DomainNameUtilsTest.java
rename to util/src/test/java/google/registry/util/DomainNameUtilsTest.java
diff --git a/javatests/google/registry/util/HexDumperTest.java b/util/src/test/java/google/registry/util/HexDumperTest.java
similarity index 100%
rename from javatests/google/registry/util/HexDumperTest.java
rename to util/src/test/java/google/registry/util/HexDumperTest.java
diff --git a/javatests/google/registry/util/PosixTarHeaderSystemTest.java b/util/src/test/java/google/registry/util/PosixTarHeaderSystemTest.java
similarity index 100%
rename from javatests/google/registry/util/PosixTarHeaderSystemTest.java
rename to util/src/test/java/google/registry/util/PosixTarHeaderSystemTest.java
diff --git a/javatests/google/registry/util/PosixTarHeaderTest.java b/util/src/test/java/google/registry/util/PosixTarHeaderTest.java
similarity index 100%
rename from javatests/google/registry/util/PosixTarHeaderTest.java
rename to util/src/test/java/google/registry/util/PosixTarHeaderTest.java
diff --git a/javatests/google/registry/util/RegistrarUtilsTest.java b/util/src/test/java/google/registry/util/RegistrarUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/RegistrarUtilsTest.java
rename to util/src/test/java/google/registry/util/RegistrarUtilsTest.java
diff --git a/javatests/google/registry/util/RequestStatusCheckerImplTest.java b/util/src/test/java/google/registry/util/RequestStatusCheckerImplTest.java
similarity index 100%
rename from javatests/google/registry/util/RequestStatusCheckerImplTest.java
rename to util/src/test/java/google/registry/util/RequestStatusCheckerImplTest.java
diff --git a/javatests/google/registry/util/RetrierTest.java b/util/src/test/java/google/registry/util/RetrierTest.java
similarity index 100%
rename from javatests/google/registry/util/RetrierTest.java
rename to util/src/test/java/google/registry/util/RetrierTest.java
diff --git a/javatests/google/registry/util/SendEmailServiceTest.java b/util/src/test/java/google/registry/util/SendEmailServiceTest.java
similarity index 100%
rename from javatests/google/registry/util/SendEmailServiceTest.java
rename to util/src/test/java/google/registry/util/SendEmailServiceTest.java
diff --git a/javatests/google/registry/util/SerializeUtilsTest.java b/util/src/test/java/google/registry/util/SerializeUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/SerializeUtilsTest.java
rename to util/src/test/java/google/registry/util/SerializeUtilsTest.java
diff --git a/javatests/google/registry/util/SqlTemplateTest.java b/util/src/test/java/google/registry/util/SqlTemplateTest.java
similarity index 100%
rename from javatests/google/registry/util/SqlTemplateTest.java
rename to util/src/test/java/google/registry/util/SqlTemplateTest.java
diff --git a/javatests/google/registry/util/TaskQueueUtilsTest.java b/util/src/test/java/google/registry/util/TaskQueueUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/TaskQueueUtilsTest.java
rename to util/src/test/java/google/registry/util/TaskQueueUtilsTest.java
diff --git a/javatests/google/registry/util/TeeOutputStreamTest.java b/util/src/test/java/google/registry/util/TeeOutputStreamTest.java
similarity index 100%
rename from javatests/google/registry/util/TeeOutputStreamTest.java
rename to util/src/test/java/google/registry/util/TeeOutputStreamTest.java
diff --git a/javatests/google/registry/util/TypeUtilsTest.java b/util/src/test/java/google/registry/util/TypeUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/TypeUtilsTest.java
rename to util/src/test/java/google/registry/util/TypeUtilsTest.java
diff --git a/javatests/google/registry/util/UrlFetchUtilsTest.java b/util/src/test/java/google/registry/util/UrlFetchUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/UrlFetchUtilsTest.java
rename to util/src/test/java/google/registry/util/UrlFetchUtilsTest.java
diff --git a/javatests/google/registry/util/YamlUtilsTest.java b/util/src/test/java/google/registry/util/YamlUtilsTest.java
similarity index 100%
rename from javatests/google/registry/util/YamlUtilsTest.java
rename to util/src/test/java/google/registry/util/YamlUtilsTest.java