diff --git a/BUILD b/BUILD
index c85a3fc..fcafac3 100644
--- a/BUILD
+++ b/BUILD
@@ -3,7 +3,7 @@
 
 gerrit_plugin(
     name = "supermanifest",
-    srcs = glob(["src/main/java/**/*.java"]),
+    srcs = glob(["java/**/*.java"]),
     manifest_entries = [
         "Gerrit-PluginName: supermanifest",
         "Gerrit-Module: com.googlesource.gerrit.plugins.supermanifest.SuperManifestModule",
@@ -16,7 +16,7 @@
 junit_tests(
     name = "supermanifest_tests",
     size = "large",
-    srcs = glob(["src/test/java/**/*IT.java"]),
+    srcs = glob(["javatests/**/*IT.java"]),
     resources = glob(["src/test/resources/**"]),
     tags = [
         "supermanifest-plugin",
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/ConfigEntry.java b/java/com/googlesource/gerrit/plugins/supermanifest/ConfigEntry.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/ConfigEntry.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/ConfigEntry.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/JiriManifest.java b/java/com/googlesource/gerrit/plugins/supermanifest/JiriManifest.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/JiriManifest.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/JiriManifest.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/JiriManifestParser.java b/java/com/googlesource/gerrit/plugins/supermanifest/JiriManifestParser.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/JiriManifestParser.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/JiriManifestParser.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/JiriProjects.java b/java/com/googlesource/gerrit/plugins/supermanifest/JiriProjects.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/JiriProjects.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/JiriProjects.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/JiriUpdater.java b/java/com/googlesource/gerrit/plugins/supermanifest/JiriUpdater.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/JiriUpdater.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/JiriUpdater.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/RepoUpdater.java b/java/com/googlesource/gerrit/plugins/supermanifest/RepoUpdater.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/RepoUpdater.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/RepoUpdater.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/StringUtil.java b/java/com/googlesource/gerrit/plugins/supermanifest/StringUtil.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/StringUtil.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/StringUtil.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/SubModuleUpdater.java b/java/com/googlesource/gerrit/plugins/supermanifest/SubModuleUpdater.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/SubModuleUpdater.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/SubModuleUpdater.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestModule.java b/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestModule.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestModule.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestModule.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java b/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/SuperManifestRefUpdatedListener.java
diff --git a/src/main/java/com/googlesource/gerrit/plugins/supermanifest/Utils.java b/java/com/googlesource/gerrit/plugins/supermanifest/Utils.java
similarity index 100%
rename from src/main/java/com/googlesource/gerrit/plugins/supermanifest/Utils.java
rename to java/com/googlesource/gerrit/plugins/supermanifest/Utils.java
diff --git a/src/test/java/com/googlesource/gerrit/plugins/supermanifest/JiriSuperManifestIT.java b/javatests/com/googlesource/gerrit/plugins/supermanifest/JiriSuperManifestIT.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/supermanifest/JiriSuperManifestIT.java
rename to javatests/com/googlesource/gerrit/plugins/supermanifest/JiriSuperManifestIT.java
diff --git a/src/test/java/com/googlesource/gerrit/plugins/supermanifest/RepoSuperManifestIT.java b/javatests/com/googlesource/gerrit/plugins/supermanifest/RepoSuperManifestIT.java
similarity index 100%
rename from src/test/java/com/googlesource/gerrit/plugins/supermanifest/RepoSuperManifestIT.java
rename to javatests/com/googlesource/gerrit/plugins/supermanifest/RepoSuperManifestIT.java