diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
deleted file mode 100644
index 0434c15..0000000
--- a/gerrit-server/BUILD
+++ /dev/null
@@ -1,285 +0,0 @@
-load("//tools/bzl:junit.bzl", "junit_tests")
-
-CONSTANTS_SRC = [
-    "src/main/java/com/google/gerrit/server/documentation/Constants.java",
-]
-
-GERRIT_GLOBAL_MODULE_SRC = [
-    "src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java",
-]
-
-RECEIVE_SRCS = glob(["src/main/java/com/google/gerrit/server/git/receive/**/*.java"])
-
-SRCS = glob(
-    ["src/main/java/**/*.java"],
-    exclude = CONSTANTS_SRC + GERRIT_GLOBAL_MODULE_SRC + RECEIVE_SRCS,
-)
-
-RESOURCES = glob(["src/main/resources/**/*"])
-
-java_library(
-    name = "constants",
-    srcs = CONSTANTS_SRC,
-    visibility = ["//visibility:public"],
-)
-
-# Giant kitchen-sink target.
-#
-# The only reason this hasn't been split up further is because we have too many
-# tangled dependencies (and Guice unfortunately makes it quite easy to get into
-# this state). Which means if you see an opportunity to split something off, you
-# should seize it.
-java_library(
-    name = "server",
-    srcs = SRCS,
-    resources = RESOURCES,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":constants",
-        "//java/com/google/gerrit/common:annotations",
-        "//java/com/google/gerrit/common:server",
-        "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gerrit/index",
-        "//java/com/google/gerrit/index:query_exception",
-        "//java/com/google/gerrit/lifecycle",
-        "//java/com/google/gerrit/metrics",
-        "//java/com/google/gerrit/prettify:server",
-        "//java/com/google/gerrit/reviewdb:server",
-        "//java/com/google/gerrit/util/cli",
-        "//java/com/google/gerrit/util/ssl",
-        "//java/org/apache/commons/net",
-        "//java/org/eclipse/jgit:server",
-        "//lib:args4j",
-        "//lib:automaton",
-        "//lib:blame-cache",
-        "//lib:grappa",
-        "//lib:gson",
-        "//lib:guava",
-        "//lib:guava-retrying",
-        "//lib:gwtjsonrpc",
-        "//lib:gwtorm",
-        "//lib:jsch",
-        "//lib:juniversalchardet",
-        "//lib:mime-util",
-        "//lib:pegdown",
-        "//lib:protobuf",
-        "//lib:servlet-api-3_1",
-        "//lib:soy",
-        "//lib:tukaani-xz",
-        "//lib/auto:auto-value",
-        "//lib/bouncycastle:bcpkix-neverlink",
-        "//lib/bouncycastle:bcprov-neverlink",
-        "//lib/commons:codec",
-        "//lib/commons:compress",
-        "//lib/commons:dbcp",
-        "//lib/commons:lang",
-        "//lib/commons:net",
-        "//lib/commons:validator",
-        "//lib/guice",
-        "//lib/guice:guice-assistedinject",
-        "//lib/guice:guice-servlet",
-        "//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-        "//lib/jsoup",
-        "//lib/log:api",
-        "//lib/log:jsonevent-layout",
-        "//lib/log:log4j",
-        "//lib/lucene:lucene-analyzers-common",
-        "//lib/lucene:lucene-core-and-backward-codecs",
-        "//lib/lucene:lucene-queryparser",
-        "//lib/mime4j:core",
-        "//lib/mime4j:dom",
-        "//lib/ow2:ow2-asm",
-        "//lib/ow2:ow2-asm-tree",
-        "//lib/ow2:ow2-asm-util",
-        "//lib/prolog:runtime",
-    ],
-)
-
-# Large modules that import things from all across the server package
-# hierarchy, so they need lots of dependencies.
-java_library(
-    name = "module",
-    srcs = GERRIT_GLOBAL_MODULE_SRC,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":receive",
-        ":server",
-        "//java/com/google/gerrit/extensions:api",
-        "//lib:blame-cache",
-        "//lib:guava",
-        "//lib:soy",
-        "//lib/guice",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-    ],
-)
-
-java_library(
-    name = "receive",
-    srcs = RECEIVE_SRCS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":server",
-        "//java/com/google/gerrit/common:annotations",
-        "//java/com/google/gerrit/common:server",
-        "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gerrit/reviewdb:server",
-        "//java/com/google/gerrit/util/cli",
-        "//lib:args4j",
-        "//lib:guava",
-        "//lib:gwtorm",
-        "//lib/auto:auto-value",
-        "//lib/guice",
-        "//lib/guice:guice-assistedinject",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-        "//lib/log:api",
-    ],
-)
-
-TESTUTIL_DEPS = [
-    ":module",
-    ":server",
-    "//java/com/google/gerrit/common:annotations",
-    "//java/com/google/gerrit/common:server",
-    "//java/com/google/gerrit/extensions:api",
-    "//java/com/google/gerrit/gpg",
-    "//java/com/google/gerrit/lifecycle",
-    "//java/com/google/gerrit/metrics",
-    "//java/com/google/gerrit/reviewdb:server",
-    "//java/com/google/gerrit/server/cache/h2",
-    "//java/com/google/gerrit/index",
-    "//java/com/google/gerrit/lucene",
-    "//lib:gwtorm",
-    "//lib:h2",
-    "//lib:truth",
-    "//lib/guice:guice",
-    "//lib/guice:guice-servlet",
-    "//lib/jgit/org.eclipse.jgit:jgit",
-    "//lib/jgit/org.eclipse.jgit.junit:junit",
-    "//lib/log:api",
-    "//lib/log:impl_log4j",
-    "//lib/log:log4j",
-]
-
-CUSTOM_TRUTH_SUBJECTS = glob([
-    "src/test/java/com/google/gerrit/server/**/*Subject.java",
-])
-
-java_library(
-    name = "custom-truth-subjects",
-    testonly = 1,
-    srcs = CUSTOM_TRUTH_SUBJECTS,
-    deps = [
-        ":server",
-        "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gerrit/truth",
-        "//lib:truth",
-    ],
-)
-
-PROLOG_TEST_CASE = [
-    "src/test/java/com/google/gerrit/rules/PrologTestCase.java",
-]
-
-PROLOG_TESTS = glob(
-    ["src/test/java/com/google/gerrit/rules/**/*.java"],
-    exclude = PROLOG_TEST_CASE,
-)
-
-java_library(
-    name = "prolog_test_case",
-    testonly = 1,
-    srcs = PROLOG_TEST_CASE,
-    deps = [
-        ":server",
-        "//java/com/google/gerrit/common:server",
-        "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//lib:guava",
-        "//lib:junit",
-        "//lib:truth",
-        "//lib/guice",
-        "//lib/prolog:runtime",
-    ],
-)
-
-junit_tests(
-    name = "prolog_tests",
-    srcs = PROLOG_TESTS,
-    resource_strip_prefix = "prologtests",
-    resources = ["//prologtests:gerrit_common_test"],
-    deps = TESTUTIL_DEPS + [
-        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//java/com/google/gerrit/server/project/testing:project-test-util",
-        "//prolog:gerrit-prolog-common",
-        ":prolog_test_case",
-        "//lib/prolog:runtime",
-    ],
-)
-
-QUERY_TESTS = glob(
-    ["src/test/java/com/google/gerrit/server/query/**/*.java"],
-)
-
-java_library(
-    name = "query_tests_code",
-    testonly = 1,
-    srcs = QUERY_TESTS,
-    visibility = ["//visibility:public"],
-    deps = TESTUTIL_DEPS + [
-        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//prolog:gerrit-prolog-common",
-    ],
-)
-
-junit_tests(
-    name = "query_tests",
-    size = "large",
-    srcs = QUERY_TESTS,
-    visibility = ["//visibility:public"],
-    deps = TESTUTIL_DEPS + [
-        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//prolog:gerrit-prolog-common",
-    ],
-)
-
-junit_tests(
-    name = "server_tests",
-    size = "large",
-    srcs = glob(
-        ["src/test/java/**/*.java"],
-        exclude = CUSTOM_TRUTH_SUBJECTS + PROLOG_TESTS + PROLOG_TEST_CASE + QUERY_TESTS,
-    ),
-    resources = glob(["src/test/resources/com/google/gerrit/server/**/*"]),
-    visibility = ["//visibility:public"],
-    deps = TESTUTIL_DEPS + [
-        ":custom-truth-subjects",
-        "//java/com/google/gerrit/index:query_exception",
-        "//java/com/google/gerrit/server/project/testing:project-test-util",
-        "//java/com/google/gerrit/testing:gerrit-test-util",
-        "//java/org/eclipse/jgit:server",
-        "//java/com/google/gerrit/extensions/common/testing:common-test-util",
-        "//lib:args4j",
-        "//lib:grappa",
-        "//lib:gson",
-        "//lib:guava",
-        "//lib:guava-retrying",
-        "//lib:protobuf",
-        "//lib:truth-java8-extension",
-        "//lib/bouncycastle:bcprov",
-        "//lib/bouncycastle:bcpkix",
-        "//lib/guice:guice-assistedinject",
-        "//lib/prolog:runtime",
-        "//lib/commons:codec",
-        "//prolog:gerrit-prolog-common",
-    ],
-)
-
-load("//tools/bzl:javadoc.bzl", "java_doc")
-
-java_doc(
-    name = "doc",
-    libs = [":server"],
-    pkgs = ["com.google.gerrit"],
-    title = "Gerrit Review Server Documentation",
-)
diff --git a/java/com/google/gerrit/BUILD b/java/com/google/gerrit/BUILD
new file mode 100644
index 0000000..267a5de
--- /dev/null
+++ b/java/com/google/gerrit/BUILD
@@ -0,0 +1,122 @@
+# TODO(davido): Consider to isolate former gerrit-server specific rules
+# in server directory. Otherwise it is hard to see the whole dependency
+# picture given that this file is located in com/google/gerrit, but only
+# controls three directory: audit, rules and server.
+
+CONSTANTS_SRC = [
+    "server/documentation/Constants.java",
+]
+
+GERRIT_GLOBAL_MODULE_SRC = [
+    "server/config/GerritGlobalModule.java",
+]
+
+java_library(
+    name = "constants",
+    srcs = CONSTANTS_SRC,
+    visibility = ["//visibility:public"],
+)
+
+# Giant kitchen-sink target.
+#
+# The only reason this hasn't been split up further is because we have too many
+# tangled dependencies (and Guice unfortunately makes it quite easy to get into
+# this state). Which means if you see an opportunity to split something off, you
+# should seize it.
+java_library(
+    name = "server",
+    srcs = glob(
+        ["**/*.java"],
+        exclude = CONSTANTS_SRC + GERRIT_GLOBAL_MODULE_SRC,
+    ),
+    resource_strip_prefix = "resources",
+    resources = ["//resources/com/google/gerrit:server"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":constants",
+        "//java/com/google/gerrit/common:annotations",
+        "//java/com/google/gerrit/common:server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/index:query_exception",
+        "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/metrics",
+        "//java/com/google/gerrit/prettify:server",
+        "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/util/cli",
+        "//java/com/google/gerrit/util/ssl",
+        "//java/org/apache/commons/net",
+        "//java/org/eclipse/jgit:server",
+        "//lib:args4j",
+        "//lib:automaton",
+        "//lib:blame-cache",
+        "//lib:grappa",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:guava-retrying",
+        "//lib:gwtjsonrpc",
+        "//lib:gwtorm",
+        "//lib:jsch",
+        "//lib:juniversalchardet",
+        "//lib:mime-util",
+        "//lib:pegdown",
+        "//lib:protobuf",
+        "//lib:servlet-api-3_1",
+        "//lib:soy",
+        "//lib:tukaani-xz",
+        "//lib/auto:auto-value",
+        "//lib/bouncycastle:bcpkix-neverlink",
+        "//lib/bouncycastle:bcprov-neverlink",
+        "//lib/commons:codec",
+        "//lib/commons:compress",
+        "//lib/commons:dbcp",
+        "//lib/commons:lang",
+        "//lib/commons:net",
+        "//lib/commons:validator",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/guice:guice-servlet",
+        "//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/jsoup",
+        "//lib/log:api",
+        "//lib/log:jsonevent-layout",
+        "//lib/log:log4j",
+        "//lib/lucene:lucene-analyzers-common",
+        "//lib/lucene:lucene-core-and-backward-codecs",
+        "//lib/lucene:lucene-queryparser",
+        "//lib/mime4j:core",
+        "//lib/mime4j:dom",
+        "//lib/ow2:ow2-asm",
+        "//lib/ow2:ow2-asm-tree",
+        "//lib/ow2:ow2-asm-util",
+        "//lib/prolog:runtime",
+    ],
+)
+
+# Large modules that import things from all across the server package
+# hierarchy, so they need lots of dependencies.
+java_library(
+    name = "module",
+    srcs = GERRIT_GLOBAL_MODULE_SRC,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/server/git/receive",
+        "//lib:blame-cache",
+        "//lib:guava",
+        "//lib:soy",
+        "//lib/guice",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
+)
+
+load("//tools/bzl:javadoc.bzl", "java_doc")
+
+java_doc(
+    name = "doc",
+    libs = [":server"],
+    pkgs = ["com.google.gerrit"],
+    title = "Gerrit Review Server Documentation",
+)
diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD
index b86761a..49ddb7c 100644
--- a/java/com/google/gerrit/acceptance/BUILD
+++ b/java/com/google/gerrit/acceptance/BUILD
@@ -8,8 +8,7 @@
     visibility = ["//visibility:public"],
     exports = [
         ":framework-lib",
-        "//gerrit-server:receive",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
@@ -24,6 +23,7 @@
         "//java/com/google/gerrit/pgm/init",
         "//java/com/google/gerrit/pgm/util",
         "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/server/git/receive",
         "//java/com/google/gerrit/server/project/testing:project-test-util",
         "//java/com/google/gerrit/sshd",
         "//java/com/google/gerrit/testing:gerrit-test-util",
@@ -50,6 +50,7 @@
 )
 
 PROVIDED = [
+    "//java/com/google/gerrit:server",
     "//java/com/google/gerrit/common:annotations",
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
@@ -59,8 +60,7 @@
     "//java/com/google/gerrit/metrics",
     "//java/com/google/gerrit/reviewdb:server",
     "//java/com/google/gerrit/pgm/init",
-    "//gerrit-server:receive",
-    "//gerrit-server:server",
+    "//java/com/google/gerrit/server/git/receive",
     "//lib:gson",
     "//lib:jsch",
     "//lib/jgit/org.eclipse.jgit:jgit",
diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/AuditEvent.java b/java/com/google/gerrit/audit/AuditEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/audit/AuditEvent.java
rename to java/com/google/gerrit/audit/AuditEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/AuditListener.java b/java/com/google/gerrit/audit/AuditListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/audit/AuditListener.java
rename to java/com/google/gerrit/audit/AuditListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/AuditModule.java b/java/com/google/gerrit/audit/AuditModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/audit/AuditModule.java
rename to java/com/google/gerrit/audit/AuditModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/AuditService.java b/java/com/google/gerrit/audit/AuditService.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/audit/AuditService.java
rename to java/com/google/gerrit/audit/AuditService.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/ExtendedHttpAuditEvent.java b/java/com/google/gerrit/audit/ExtendedHttpAuditEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/audit/ExtendedHttpAuditEvent.java
rename to java/com/google/gerrit/audit/ExtendedHttpAuditEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/GroupMemberAuditListener.java b/java/com/google/gerrit/audit/GroupMemberAuditListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/audit/GroupMemberAuditListener.java
rename to java/com/google/gerrit/audit/GroupMemberAuditListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/HttpAuditEvent.java b/java/com/google/gerrit/audit/HttpAuditEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/audit/HttpAuditEvent.java
rename to java/com/google/gerrit/audit/HttpAuditEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/RpcAuditEvent.java b/java/com/google/gerrit/audit/RpcAuditEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/audit/RpcAuditEvent.java
rename to java/com/google/gerrit/audit/RpcAuditEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/audit/SshAuditEvent.java b/java/com/google/gerrit/audit/SshAuditEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/audit/SshAuditEvent.java
rename to java/com/google/gerrit/audit/SshAuditEvent.java
diff --git a/java/com/google/gerrit/elasticsearch/BUILD b/java/com/google/gerrit/elasticsearch/BUILD
index 0ef4685..2a49496 100644
--- a/java/com/google/gerrit/elasticsearch/BUILD
+++ b/java/com/google/gerrit/elasticsearch/BUILD
@@ -3,7 +3,7 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/index",
         "//java/com/google/gerrit/index:query_exception",
diff --git a/java/com/google/gerrit/gpg/BUILD b/java/com/google/gerrit/gpg/BUILD
index 55a8822..c9f1399 100644
--- a/java/com/google/gerrit/gpg/BUILD
+++ b/java/com/google/gerrit/gpg/BUILD
@@ -3,7 +3,7 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/reviewdb:server",
diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD
index 05fb58d..c651f84 100644
--- a/java/com/google/gerrit/httpd/BUILD
+++ b/java/com/google/gerrit/httpd/BUILD
@@ -5,8 +5,7 @@
     resources = ["//resources/com/google/gerrit/httpd"],
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:receive",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
@@ -14,6 +13,7 @@
         "//java/com/google/gerrit/lifecycle",
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/server/git/receive",
         "//java/com/google/gerrit/util/cli",
         "//java/com/google/gerrit/util/http",
         "//java/com/google/gwtexpui/linker:server",
diff --git a/java/com/google/gerrit/httpd/auth/oauth/BUILD b/java/com/google/gerrit/httpd/auth/oauth/BUILD
index f305b15..af0e3a7 100644
--- a/java/com/google/gerrit/httpd/auth/oauth/BUILD
+++ b/java/com/google/gerrit/httpd/auth/oauth/BUILD
@@ -5,7 +5,7 @@
     resources = ["//resources/com/google/gerrit/httpd/auth/oauth"],
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/httpd",
diff --git a/java/com/google/gerrit/httpd/auth/openid/BUILD b/java/com/google/gerrit/httpd/auth/openid/BUILD
index 5b29260..ae45439 100644
--- a/java/com/google/gerrit/httpd/auth/openid/BUILD
+++ b/java/com/google/gerrit/httpd/auth/openid/BUILD
@@ -12,7 +12,7 @@
         "//java/com/google/gerrit/httpd",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gwtexpui/server",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//lib:guava",
         "//lib:gwtorm",
         "//lib:servlet-api-3_1",
diff --git a/java/com/google/gerrit/httpd/init/BUILD b/java/com/google/gerrit/httpd/init/BUILD
index a4ea7e2..cd80152 100644
--- a/java/com/google/gerrit/httpd/init/BUILD
+++ b/java/com/google/gerrit/httpd/init/BUILD
@@ -3,9 +3,8 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:module",
-        "//gerrit-server:receive",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:module",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/elasticsearch",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/gpg",
@@ -19,6 +18,7 @@
         "//java/com/google/gerrit/pgm/util",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",
+        "//java/com/google/gerrit/server/git/receive",
         "//java/com/google/gerrit/sshd",
         "//lib:guava",
         "//lib:gwtorm",
diff --git a/java/com/google/gerrit/lucene/BUILD b/java/com/google/gerrit/lucene/BUILD
index 059da76..80877c9 100644
--- a/java/com/google/gerrit/lucene/BUILD
+++ b/java/com/google/gerrit/lucene/BUILD
@@ -5,7 +5,7 @@
     srcs = QUERY_BUILDER,
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/index",
         "//java/com/google/gerrit/index:query_exception",
         "//java/com/google/gerrit/reviewdb:server",
@@ -24,7 +24,7 @@
     visibility = ["//visibility:public"],
     deps = [
         ":query_builder",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
diff --git a/java/com/google/gerrit/metrics/dropwizard/BUILD b/java/com/google/gerrit/metrics/dropwizard/BUILD
index a61a075..54ae69e 100644
--- a/java/com/google/gerrit/metrics/dropwizard/BUILD
+++ b/java/com/google/gerrit/metrics/dropwizard/BUILD
@@ -3,7 +3,7 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/metrics",
diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD
index b1d049e..ff2c0e6 100644
--- a/java/com/google/gerrit/pgm/BUILD
+++ b/java/com/google/gerrit/pgm/BUILD
@@ -15,9 +15,8 @@
     resources = ["//resources/com/google/gerrit/pgm"],
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:module",
-        "//gerrit-server:receive",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:module",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/elasticsearch",
@@ -37,6 +36,7 @@
         "//java/com/google/gerrit/pgm/util",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",
+        "//java/com/google/gerrit/server/git/receive",
         "//java/com/google/gerrit/sshd",
         "//java/com/google/gwtexpui/linker:server",
         "//java/com/google/gwtexpui/server",
diff --git a/java/com/google/gerrit/pgm/http/jetty/BUILD b/java/com/google/gerrit/pgm/http/jetty/BUILD
index 47af4e3..0b3460a 100644
--- a/java/com/google/gerrit/pgm/http/jetty/BUILD
+++ b/java/com/google/gerrit/pgm/http/jetty/BUILD
@@ -3,7 +3,7 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/httpd",
diff --git a/java/com/google/gerrit/pgm/init/BUILD b/java/com/google/gerrit/pgm/init/BUILD
index 50f0081..ea15e6b 100644
--- a/java/com/google/gerrit/pgm/init/BUILD
+++ b/java/com/google/gerrit/pgm/init/BUILD
@@ -5,7 +5,7 @@
     resources = ["//resources/com/google/gerrit/pgm/init"],
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/elasticsearch",
diff --git a/java/com/google/gerrit/pgm/init/api/BUILD b/java/com/google/gerrit/pgm/init/api/BUILD
index 2da6709..fe476f1 100644
--- a/java/com/google/gerrit/pgm/init/api/BUILD
+++ b/java/com/google/gerrit/pgm/init/api/BUILD
@@ -3,7 +3,7 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/reviewdb:server",
diff --git a/java/com/google/gerrit/pgm/util/BUILD b/java/com/google/gerrit/pgm/util/BUILD
index 6b7dd8e..53880ae 100644
--- a/java/com/google/gerrit/pgm/util/BUILD
+++ b/java/com/google/gerrit/pgm/util/BUILD
@@ -3,9 +3,8 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:module",
-        "//gerrit-server:receive",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:module",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/lifecycle",
@@ -13,6 +12,7 @@
         "//java/com/google/gerrit/metrics/dropwizard",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",
+        "//java/com/google/gerrit/server/git/receive",
         "//java/com/google/gerrit/util/cli",
         "//lib:args4j",
         "//lib:guava",
diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java b/java/com/google/gerrit/rules/PredicateClassLoader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/rules/PredicateClassLoader.java
rename to java/com/google/gerrit/rules/PredicateClassLoader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PredicateProvider.java b/java/com/google/gerrit/rules/PredicateProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/rules/PredicateProvider.java
rename to java/com/google/gerrit/rules/PredicateProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java b/java/com/google/gerrit/rules/PrologEnvironment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/rules/PrologEnvironment.java
rename to java/com/google/gerrit/rules/PrologEnvironment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/PrologModule.java b/java/com/google/gerrit/rules/PrologModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/rules/PrologModule.java
rename to java/com/google/gerrit/rules/PrologModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java b/java/com/google/gerrit/rules/RulesCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/rules/RulesCache.java
rename to java/com/google/gerrit/rules/RulesCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/StoredValue.java b/java/com/google/gerrit/rules/StoredValue.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/rules/StoredValue.java
rename to java/com/google/gerrit/rules/StoredValue.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/rules/StoredValues.java b/java/com/google/gerrit/rules/StoredValues.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/rules/StoredValues.java
rename to java/com/google/gerrit/rules/StoredValues.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/AccessPath.java b/java/com/google/gerrit/server/AccessPath.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/AccessPath.java
rename to java/com/google/gerrit/server/AccessPath.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/AnonymousUser.java b/java/com/google/gerrit/server/AnonymousUser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/AnonymousUser.java
rename to java/com/google/gerrit/server/AnonymousUser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java b/java/com/google/gerrit/server/ApprovalCopier.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ApprovalCopier.java
rename to java/com/google/gerrit/server/ApprovalCopier.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java b/java/com/google/gerrit/server/ApprovalsUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ApprovalsUtil.java
rename to java/com/google/gerrit/server/ApprovalsUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeFinder.java b/java/com/google/gerrit/server/ChangeFinder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ChangeFinder.java
rename to java/com/google/gerrit/server/ChangeFinder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeMessagesUtil.java b/java/com/google/gerrit/server/ChangeMessagesUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ChangeMessagesUtil.java
rename to java/com/google/gerrit/server/ChangeMessagesUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/java/com/google/gerrit/server/ChangeUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
rename to java/com/google/gerrit/server/ChangeUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/CmdLineParserModule.java b/java/com/google/gerrit/server/CmdLineParserModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/CmdLineParserModule.java
rename to java/com/google/gerrit/server/CmdLineParserModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java b/java/com/google/gerrit/server/CommentsUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/CommentsUtil.java
rename to java/com/google/gerrit/server/CommentsUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/CommonConverters.java b/java/com/google/gerrit/server/CommonConverters.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/CommonConverters.java
rename to java/com/google/gerrit/server/CommonConverters.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java b/java/com/google/gerrit/server/CurrentUser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/CurrentUser.java
rename to java/com/google/gerrit/server/CurrentUser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java b/java/com/google/gerrit/server/DynamicOptions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/DynamicOptions.java
rename to java/com/google/gerrit/server/DynamicOptions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/EnableSignedPush.java b/java/com/google/gerrit/server/EnableSignedPush.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/EnableSignedPush.java
rename to java/com/google/gerrit/server/EnableSignedPush.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdent.java b/java/com/google/gerrit/server/GerritPersonIdent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdent.java
rename to java/com/google/gerrit/server/GerritPersonIdent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java b/java/com/google/gerrit/server/GerritPersonIdentProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/GerritPersonIdentProvider.java
rename to java/com/google/gerrit/server/GerritPersonIdentProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/GpgException.java b/java/com/google/gerrit/server/GpgException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/GpgException.java
rename to java/com/google/gerrit/server/GpgException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java b/java/com/google/gerrit/server/IdentifiedUser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/IdentifiedUser.java
rename to java/com/google/gerrit/server/IdentifiedUser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/InternalUser.java b/java/com/google/gerrit/server/InternalUser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/InternalUser.java
rename to java/com/google/gerrit/server/InternalUser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/LibModuleLoader.java b/java/com/google/gerrit/server/LibModuleLoader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/LibModuleLoader.java
rename to java/com/google/gerrit/server/LibModuleLoader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/OptionUtil.java b/java/com/google/gerrit/server/OptionUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/OptionUtil.java
rename to java/com/google/gerrit/server/OptionUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/OutputFormat.java b/java/com/google/gerrit/server/OutputFormat.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/OutputFormat.java
rename to java/com/google/gerrit/server/OutputFormat.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/PatchSetUtil.java b/java/com/google/gerrit/server/PatchSetUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/PatchSetUtil.java
rename to java/com/google/gerrit/server/PatchSetUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/PeerDaemonUser.java b/java/com/google/gerrit/server/PeerDaemonUser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/PeerDaemonUser.java
rename to java/com/google/gerrit/server/PeerDaemonUser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/PluginUser.java b/java/com/google/gerrit/server/PluginUser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/PluginUser.java
rename to java/com/google/gerrit/server/PluginUser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java b/java/com/google/gerrit/server/ProjectUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ProjectUtil.java
rename to java/com/google/gerrit/server/ProjectUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/RemotePeer.java b/java/com/google/gerrit/server/RemotePeer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/RemotePeer.java
rename to java/com/google/gerrit/server/RemotePeer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java b/java/com/google/gerrit/server/RequestCleanup.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/RequestCleanup.java
rename to java/com/google/gerrit/server/RequestCleanup.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerByEmailSet.java b/java/com/google/gerrit/server/ReviewerByEmailSet.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ReviewerByEmailSet.java
rename to java/com/google/gerrit/server/ReviewerByEmailSet.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java b/java/com/google/gerrit/server/ReviewerRecommender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ReviewerRecommender.java
rename to java/com/google/gerrit/server/ReviewerRecommender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerSet.java b/java/com/google/gerrit/server/ReviewerSet.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ReviewerSet.java
rename to java/com/google/gerrit/server/ReviewerSet.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewerStatusUpdate.java b/java/com/google/gerrit/server/ReviewerStatusUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ReviewerStatusUpdate.java
rename to java/com/google/gerrit/server/ReviewerStatusUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java b/java/com/google/gerrit/server/ReviewersUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ReviewersUtil.java
rename to java/com/google/gerrit/server/ReviewersUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/Sequences.java b/java/com/google/gerrit/server/Sequences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/Sequences.java
rename to java/com/google/gerrit/server/Sequences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java b/java/com/google/gerrit/server/StarredChangesUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/StarredChangesUtil.java
rename to java/com/google/gerrit/server/StarredChangesUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StartupCheck.java b/java/com/google/gerrit/server/StartupCheck.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/StartupCheck.java
rename to java/com/google/gerrit/server/StartupCheck.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StartupChecks.java b/java/com/google/gerrit/server/StartupChecks.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/StartupChecks.java
rename to java/com/google/gerrit/server/StartupChecks.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StartupException.java b/java/com/google/gerrit/server/StartupException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/StartupException.java
rename to java/com/google/gerrit/server/StartupException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java b/java/com/google/gerrit/server/StringUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/StringUtil.java
rename to java/com/google/gerrit/server/StringUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java b/java/com/google/gerrit/server/UrlEncoded.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/UrlEncoded.java
rename to java/com/google/gerrit/server/UrlEncoded.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/java/com/google/gerrit/server/WebLinks.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
rename to java/com/google/gerrit/server/WebLinks.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/access/AccessCollection.java b/java/com/google/gerrit/server/access/AccessCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/access/AccessCollection.java
rename to java/com/google/gerrit/server/access/AccessCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/access/AccessResource.java b/java/com/google/gerrit/server/access/AccessResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/access/AccessResource.java
rename to java/com/google/gerrit/server/access/AccessResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java b/java/com/google/gerrit/server/access/ListAccess.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java
rename to java/com/google/gerrit/server/access/ListAccess.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/access/Module.java b/java/com/google/gerrit/server/access/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/access/Module.java
rename to java/com/google/gerrit/server/access/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AbstractGroupBackend.java b/java/com/google/gerrit/server/account/AbstractGroupBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AbstractGroupBackend.java
rename to java/com/google/gerrit/server/account/AbstractGroupBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AbstractRealm.java b/java/com/google/gerrit/server/account/AbstractRealm.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AbstractRealm.java
rename to java/com/google/gerrit/server/account/AbstractRealm.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCache.java b/java/com/google/gerrit/server/account/AccountCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCache.java
rename to java/com/google/gerrit/server/account/AccountCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java b/java/com/google/gerrit/server/account/AccountCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountCacheImpl.java
rename to java/com/google/gerrit/server/account/AccountCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountConfig.java b/java/com/google/gerrit/server/account/AccountConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountConfig.java
rename to java/com/google/gerrit/server/account/AccountConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java b/java/com/google/gerrit/server/account/AccountControl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountControl.java
rename to java/com/google/gerrit/server/account/AccountControl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountDeactivator.java b/java/com/google/gerrit/server/account/AccountDeactivator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountDeactivator.java
rename to java/com/google/gerrit/server/account/AccountDeactivator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountDirectory.java b/java/com/google/gerrit/server/account/AccountDirectory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountDirectory.java
rename to java/com/google/gerrit/server/account/AccountDirectory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java b/java/com/google/gerrit/server/account/AccountException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountException.java
rename to java/com/google/gerrit/server/account/AccountException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountLimits.java b/java/com/google/gerrit/server/account/AccountLimits.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountLimits.java
rename to java/com/google/gerrit/server/account/AccountLimits.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountLoader.java b/java/com/google/gerrit/server/account/AccountLoader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountLoader.java
rename to java/com/google/gerrit/server/account/AccountLoader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java b/java/com/google/gerrit/server/account/AccountManager.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountManager.java
rename to java/com/google/gerrit/server/account/AccountManager.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java b/java/com/google/gerrit/server/account/AccountResolver.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResolver.java
rename to java/com/google/gerrit/server/account/AccountResolver.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResource.java b/java/com/google/gerrit/server/account/AccountResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountResource.java
rename to java/com/google/gerrit/server/account/AccountResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountState.java b/java/com/google/gerrit/server/account/AccountState.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountState.java
rename to java/com/google/gerrit/server/account/AccountState.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java b/java/com/google/gerrit/server/account/AccountUserNameException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountUserNameException.java
rename to java/com/google/gerrit/server/account/AccountUserNameException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountVisibilityProvider.java b/java/com/google/gerrit/server/account/AccountVisibilityProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountVisibilityProvider.java
rename to java/com/google/gerrit/server/account/AccountVisibilityProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Accounts.java b/java/com/google/gerrit/server/account/Accounts.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/Accounts.java
rename to java/com/google/gerrit/server/account/Accounts.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsCollection.java b/java/com/google/gerrit/server/account/AccountsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsCollection.java
rename to java/com/google/gerrit/server/account/AccountsCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java b/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsConsistencyChecker.java
rename to java/com/google/gerrit/server/account/AccountsConsistencyChecker.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsUpdate.java b/java/com/google/gerrit/server/account/AccountsUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AccountsUpdate.java
rename to java/com/google/gerrit/server/account/AccountsUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AddSshKey.java b/java/com/google/gerrit/server/account/AddSshKey.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AddSshKey.java
rename to java/com/google/gerrit/server/account/AddSshKey.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java b/java/com/google/gerrit/server/account/AuthRequest.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AuthRequest.java
rename to java/com/google/gerrit/server/account/AuthRequest.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthResult.java b/java/com/google/gerrit/server/account/AuthResult.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AuthResult.java
rename to java/com/google/gerrit/server/account/AuthResult.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthenticationFailedException.java b/java/com/google/gerrit/server/account/AuthenticationFailedException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AuthenticationFailedException.java
rename to java/com/google/gerrit/server/account/AuthenticationFailedException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/AuthorizedKeys.java b/java/com/google/gerrit/server/account/AuthorizedKeys.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/AuthorizedKeys.java
rename to java/com/google/gerrit/server/account/AuthorizedKeys.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Capabilities.java b/java/com/google/gerrit/server/account/Capabilities.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/Capabilities.java
rename to java/com/google/gerrit/server/account/Capabilities.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityCollection.java b/java/com/google/gerrit/server/account/CapabilityCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/CapabilityCollection.java
rename to java/com/google/gerrit/server/account/CapabilityCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java b/java/com/google/gerrit/server/account/ChangeUserName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/ChangeUserName.java
rename to java/com/google/gerrit/server/account/ChangeUserName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java b/java/com/google/gerrit/server/account/CreateAccount.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/CreateAccount.java
rename to java/com/google/gerrit/server/account/CreateAccount.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java b/java/com/google/gerrit/server/account/CreateEmail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java
rename to java/com/google/gerrit/server/account/CreateEmail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/CreateGroupArgs.java b/java/com/google/gerrit/server/account/CreateGroupArgs.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/CreateGroupArgs.java
rename to java/com/google/gerrit/server/account/CreateGroupArgs.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java b/java/com/google/gerrit/server/account/DefaultRealm.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/DefaultRealm.java
rename to java/com/google/gerrit/server/account/DefaultRealm.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java b/java/com/google/gerrit/server/account/DeleteActive.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteActive.java
rename to java/com/google/gerrit/server/account/DeleteActive.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java b/java/com/google/gerrit/server/account/DeleteEmail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteEmail.java
rename to java/com/google/gerrit/server/account/DeleteEmail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java b/java/com/google/gerrit/server/account/DeleteExternalIds.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteExternalIds.java
rename to java/com/google/gerrit/server/account/DeleteExternalIds.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteSshKey.java b/java/com/google/gerrit/server/account/DeleteSshKey.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteSshKey.java
rename to java/com/google/gerrit/server/account/DeleteSshKey.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java b/java/com/google/gerrit/server/account/DeleteWatchedProjects.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/DeleteWatchedProjects.java
rename to java/com/google/gerrit/server/account/DeleteWatchedProjects.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java b/java/com/google/gerrit/server/account/EmailExpander.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java
rename to java/com/google/gerrit/server/account/EmailExpander.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java b/java/com/google/gerrit/server/account/Emails.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/Emails.java
rename to java/com/google/gerrit/server/account/Emails.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailsCollection.java b/java/com/google/gerrit/server/account/EmailsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/EmailsCollection.java
rename to java/com/google/gerrit/server/account/EmailsCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/FakeRealm.java b/java/com/google/gerrit/server/account/FakeRealm.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/FakeRealm.java
rename to java/com/google/gerrit/server/account/FakeRealm.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GeneralPreferencesLoader.java b/java/com/google/gerrit/server/account/GeneralPreferencesLoader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GeneralPreferencesLoader.java
rename to java/com/google/gerrit/server/account/GeneralPreferencesLoader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAccount.java b/java/com/google/gerrit/server/account/GetAccount.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetAccount.java
rename to java/com/google/gerrit/server/account/GetAccount.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetActive.java b/java/com/google/gerrit/server/account/GetActive.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetActive.java
rename to java/com/google/gerrit/server/account/GetActive.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAgreements.java b/java/com/google/gerrit/server/account/GetAgreements.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetAgreements.java
rename to java/com/google/gerrit/server/account/GetAgreements.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java b/java/com/google/gerrit/server/account/GetAvatar.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java
rename to java/com/google/gerrit/server/account/GetAvatar.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatarChangeUrl.java b/java/com/google/gerrit/server/account/GetAvatarChangeUrl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatarChangeUrl.java
rename to java/com/google/gerrit/server/account/GetAvatarChangeUrl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java b/java/com/google/gerrit/server/account/GetCapabilities.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetCapabilities.java
rename to java/com/google/gerrit/server/account/GetCapabilities.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDetail.java b/java/com/google/gerrit/server/account/GetDetail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetDetail.java
rename to java/com/google/gerrit/server/account/GetDetail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java b/java/com/google/gerrit/server/account/GetDiffPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetDiffPreferences.java
rename to java/com/google/gerrit/server/account/GetDiffPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEditPreferences.java b/java/com/google/gerrit/server/account/GetEditPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetEditPreferences.java
rename to java/com/google/gerrit/server/account/GetEditPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmail.java b/java/com/google/gerrit/server/account/GetEmail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmail.java
rename to java/com/google/gerrit/server/account/GetEmail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java b/java/com/google/gerrit/server/account/GetEmails.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetEmails.java
rename to java/com/google/gerrit/server/account/GetEmails.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetExternalIds.java b/java/com/google/gerrit/server/account/GetExternalIds.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetExternalIds.java
rename to java/com/google/gerrit/server/account/GetExternalIds.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetGroups.java b/java/com/google/gerrit/server/account/GetGroups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetGroups.java
rename to java/com/google/gerrit/server/account/GetGroups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetName.java b/java/com/google/gerrit/server/account/GetName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetName.java
rename to java/com/google/gerrit/server/account/GetName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetOAuthToken.java b/java/com/google/gerrit/server/account/GetOAuthToken.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetOAuthToken.java
rename to java/com/google/gerrit/server/account/GetOAuthToken.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java b/java/com/google/gerrit/server/account/GetPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetPreferences.java
rename to java/com/google/gerrit/server/account/GetPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetSshKey.java b/java/com/google/gerrit/server/account/GetSshKey.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetSshKey.java
rename to java/com/google/gerrit/server/account/GetSshKey.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetSshKeys.java b/java/com/google/gerrit/server/account/GetSshKeys.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetSshKeys.java
rename to java/com/google/gerrit/server/account/GetSshKeys.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetStatus.java b/java/com/google/gerrit/server/account/GetStatus.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetStatus.java
rename to java/com/google/gerrit/server/account/GetStatus.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetUsername.java b/java/com/google/gerrit/server/account/GetUsername.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetUsername.java
rename to java/com/google/gerrit/server/account/GetUsername.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java b/java/com/google/gerrit/server/account/GetWatchedProjects.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GetWatchedProjects.java
rename to java/com/google/gerrit/server/account/GetWatchedProjects.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupBackend.java b/java/com/google/gerrit/server/account/GroupBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupBackend.java
rename to java/com/google/gerrit/server/account/GroupBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupBackends.java b/java/com/google/gerrit/server/account/GroupBackends.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupBackends.java
rename to java/com/google/gerrit/server/account/GroupBackends.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCache.java b/java/com/google/gerrit/server/account/GroupCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCache.java
rename to java/com/google/gerrit/server/account/GroupCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java b/java/com/google/gerrit/server/account/GroupCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupCacheImpl.java
rename to java/com/google/gerrit/server/account/GroupCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java b/java/com/google/gerrit/server/account/GroupControl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupControl.java
rename to java/com/google/gerrit/server/account/GroupControl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCache.java b/java/com/google/gerrit/server/account/GroupIncludeCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCache.java
rename to java/com/google/gerrit/server/account/GroupIncludeCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java b/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java
rename to java/com/google/gerrit/server/account/GroupIncludeCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java b/java/com/google/gerrit/server/account/GroupMembers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembers.java
rename to java/com/google/gerrit/server/account/GroupMembers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembership.java b/java/com/google/gerrit/server/account/GroupMembership.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembership.java
rename to java/com/google/gerrit/server/account/GroupMembership.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupUUID.java b/java/com/google/gerrit/server/account/GroupUUID.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/GroupUUID.java
rename to java/com/google/gerrit/server/account/GroupUUID.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/HashedPassword.java b/java/com/google/gerrit/server/account/HashedPassword.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/HashedPassword.java
rename to java/com/google/gerrit/server/account/HashedPassword.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/IncludingGroupMembership.java b/java/com/google/gerrit/server/account/IncludingGroupMembership.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/IncludingGroupMembership.java
rename to java/com/google/gerrit/server/account/IncludingGroupMembership.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Index.java b/java/com/google/gerrit/server/account/Index.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/Index.java
rename to java/com/google/gerrit/server/account/Index.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalAccountDirectory.java b/java/com/google/gerrit/server/account/InternalAccountDirectory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/InternalAccountDirectory.java
rename to java/com/google/gerrit/server/account/InternalAccountDirectory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java b/java/com/google/gerrit/server/account/InternalGroupBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/InternalGroupBackend.java
rename to java/com/google/gerrit/server/account/InternalGroupBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/InvalidUserNameException.java b/java/com/google/gerrit/server/account/InvalidUserNameException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/InvalidUserNameException.java
rename to java/com/google/gerrit/server/account/InvalidUserNameException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/ListGroupMembership.java b/java/com/google/gerrit/server/account/ListGroupMembership.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/ListGroupMembership.java
rename to java/com/google/gerrit/server/account/ListGroupMembership.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Module.java b/java/com/google/gerrit/server/account/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/Module.java
rename to java/com/google/gerrit/server/account/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PostWatchedProjects.java b/java/com/google/gerrit/server/account/PostWatchedProjects.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PostWatchedProjects.java
rename to java/com/google/gerrit/server/account/PostWatchedProjects.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutAccount.java b/java/com/google/gerrit/server/account/PutAccount.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PutAccount.java
rename to java/com/google/gerrit/server/account/PutAccount.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java b/java/com/google/gerrit/server/account/PutActive.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PutActive.java
rename to java/com/google/gerrit/server/account/PutActive.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutAgreement.java b/java/com/google/gerrit/server/account/PutAgreement.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PutAgreement.java
rename to java/com/google/gerrit/server/account/PutAgreement.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutEmail.java b/java/com/google/gerrit/server/account/PutEmail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PutEmail.java
rename to java/com/google/gerrit/server/account/PutEmail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutHttpPassword.java b/java/com/google/gerrit/server/account/PutHttpPassword.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PutHttpPassword.java
rename to java/com/google/gerrit/server/account/PutHttpPassword.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java b/java/com/google/gerrit/server/account/PutName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PutName.java
rename to java/com/google/gerrit/server/account/PutName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java b/java/com/google/gerrit/server/account/PutPreferred.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PutPreferred.java
rename to java/com/google/gerrit/server/account/PutPreferred.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutStatus.java b/java/com/google/gerrit/server/account/PutStatus.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PutStatus.java
rename to java/com/google/gerrit/server/account/PutStatus.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/PutUsername.java b/java/com/google/gerrit/server/account/PutUsername.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/PutUsername.java
rename to java/com/google/gerrit/server/account/PutUsername.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java b/java/com/google/gerrit/server/account/QueryAccounts.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java
rename to java/com/google/gerrit/server/account/QueryAccounts.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Realm.java b/java/com/google/gerrit/server/account/Realm.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/Realm.java
rename to java/com/google/gerrit/server/account/Realm.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java b/java/com/google/gerrit/server/account/SetDiffPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/SetDiffPreferences.java
rename to java/com/google/gerrit/server/account/SetDiffPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetEditPreferences.java b/java/com/google/gerrit/server/account/SetEditPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/SetEditPreferences.java
rename to java/com/google/gerrit/server/account/SetEditPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetInactiveFlag.java b/java/com/google/gerrit/server/account/SetInactiveFlag.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/SetInactiveFlag.java
rename to java/com/google/gerrit/server/account/SetInactiveFlag.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java b/java/com/google/gerrit/server/account/SetPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/SetPreferences.java
rename to java/com/google/gerrit/server/account/SetPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/SshKeys.java b/java/com/google/gerrit/server/account/SshKeys.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/SshKeys.java
rename to java/com/google/gerrit/server/account/SshKeys.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/StarredChanges.java b/java/com/google/gerrit/server/account/StarredChanges.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/StarredChanges.java
rename to java/com/google/gerrit/server/account/StarredChanges.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/Stars.java b/java/com/google/gerrit/server/account/Stars.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/Stars.java
rename to java/com/google/gerrit/server/account/Stars.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java b/java/com/google/gerrit/server/account/UniversalGroupBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/UniversalGroupBackend.java
rename to java/com/google/gerrit/server/account/UniversalGroupBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountDestinations.java b/java/com/google/gerrit/server/account/VersionedAccountDestinations.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountDestinations.java
rename to java/com/google/gerrit/server/account/VersionedAccountDestinations.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountPreferences.java b/java/com/google/gerrit/server/account/VersionedAccountPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountPreferences.java
rename to java/com/google/gerrit/server/account/VersionedAccountPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountQueries.java b/java/com/google/gerrit/server/account/VersionedAccountQueries.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAccountQueries.java
rename to java/com/google/gerrit/server/account/VersionedAccountQueries.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAuthorizedKeys.java b/java/com/google/gerrit/server/account/VersionedAuthorizedKeys.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/VersionedAuthorizedKeys.java
rename to java/com/google/gerrit/server/account/VersionedAuthorizedKeys.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/WatchConfig.java b/java/com/google/gerrit/server/account/WatchConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/WatchConfig.java
rename to java/com/google/gerrit/server/account/WatchConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/DisabledExternalIdCache.java b/java/com/google/gerrit/server/account/externalids/DisabledExternalIdCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/DisabledExternalIdCache.java
rename to java/com/google/gerrit/server/account/externalids/DisabledExternalIdCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalId.java b/java/com/google/gerrit/server/account/externalids/ExternalId.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalId.java
rename to java/com/google/gerrit/server/account/externalids/ExternalId.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdCache.java b/java/com/google/gerrit/server/account/externalids/ExternalIdCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdCache.java
rename to java/com/google/gerrit/server/account/externalids/ExternalIdCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdCacheImpl.java b/java/com/google/gerrit/server/account/externalids/ExternalIdCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdCacheImpl.java
rename to java/com/google/gerrit/server/account/externalids/ExternalIdCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdModule.java b/java/com/google/gerrit/server/account/externalids/ExternalIdModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdModule.java
rename to java/com/google/gerrit/server/account/externalids/ExternalIdModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdReader.java b/java/com/google/gerrit/server/account/externalids/ExternalIdReader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdReader.java
rename to java/com/google/gerrit/server/account/externalids/ExternalIdReader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIds.java b/java/com/google/gerrit/server/account/externalids/ExternalIds.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIds.java
rename to java/com/google/gerrit/server/account/externalids/ExternalIds.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsBatchUpdate.java b/java/com/google/gerrit/server/account/externalids/ExternalIdsBatchUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsBatchUpdate.java
rename to java/com/google/gerrit/server/account/externalids/ExternalIdsBatchUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java b/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java
rename to java/com/google/gerrit/server/account/externalids/ExternalIdsConsistencyChecker.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsUpdate.java b/java/com/google/gerrit/server/account/externalids/ExternalIdsUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/account/externalids/ExternalIdsUpdate.java
rename to java/com/google/gerrit/server/account/externalids/ExternalIdsUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/ApiUtil.java b/java/com/google/gerrit/server/api/ApiUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/ApiUtil.java
rename to java/com/google/gerrit/server/api/ApiUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/GerritApiImpl.java b/java/com/google/gerrit/server/api/GerritApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/GerritApiImpl.java
rename to java/com/google/gerrit/server/api/GerritApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/Module.java b/java/com/google/gerrit/server/api/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/Module.java
rename to java/com/google/gerrit/server/api/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountApiImpl.java b/java/com/google/gerrit/server/api/accounts/AccountApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountApiImpl.java
rename to java/com/google/gerrit/server/api/accounts/AccountApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountExternalIdCreator.java b/java/com/google/gerrit/server/api/accounts/AccountExternalIdCreator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountExternalIdCreator.java
rename to java/com/google/gerrit/server/api/accounts/AccountExternalIdCreator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountInfoComparator.java b/java/com/google/gerrit/server/api/accounts/AccountInfoComparator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountInfoComparator.java
rename to java/com/google/gerrit/server/api/accounts/AccountInfoComparator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountsImpl.java b/java/com/google/gerrit/server/api/accounts/AccountsImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountsImpl.java
rename to java/com/google/gerrit/server/api/accounts/AccountsImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/GpgApiAdapter.java b/java/com/google/gerrit/server/api/accounts/GpgApiAdapter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/GpgApiAdapter.java
rename to java/com/google/gerrit/server/api/accounts/GpgApiAdapter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/Module.java b/java/com/google/gerrit/server/api/accounts/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/Module.java
rename to java/com/google/gerrit/server/api/accounts/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java b/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
rename to java/com/google/gerrit/server/api/changes/ChangeApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeEditApiImpl.java b/java/com/google/gerrit/server/api/changes/ChangeEditApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangeEditApiImpl.java
rename to java/com/google/gerrit/server/api/changes/ChangeEditApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java b/java/com/google/gerrit/server/api/changes/ChangesImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ChangesImpl.java
rename to java/com/google/gerrit/server/api/changes/ChangesImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/CommentApiImpl.java b/java/com/google/gerrit/server/api/changes/CommentApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/CommentApiImpl.java
rename to java/com/google/gerrit/server/api/changes/CommentApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/DraftApiImpl.java b/java/com/google/gerrit/server/api/changes/DraftApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/DraftApiImpl.java
rename to java/com/google/gerrit/server/api/changes/DraftApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/FileApiImpl.java b/java/com/google/gerrit/server/api/changes/FileApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/FileApiImpl.java
rename to java/com/google/gerrit/server/api/changes/FileApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/Module.java b/java/com/google/gerrit/server/api/changes/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/Module.java
rename to java/com/google/gerrit/server/api/changes/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ReviewerApiImpl.java b/java/com/google/gerrit/server/api/changes/ReviewerApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ReviewerApiImpl.java
rename to java/com/google/gerrit/server/api/changes/ReviewerApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java b/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RevisionApiImpl.java
rename to java/com/google/gerrit/server/api/changes/RevisionApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RevisionReviewerApiImpl.java b/java/com/google/gerrit/server/api/changes/RevisionReviewerApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RevisionReviewerApiImpl.java
rename to java/com/google/gerrit/server/api/changes/RevisionReviewerApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RobotCommentApiImpl.java b/java/com/google/gerrit/server/api/changes/RobotCommentApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/changes/RobotCommentApiImpl.java
rename to java/com/google/gerrit/server/api/changes/RobotCommentApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/config/ConfigImpl.java b/java/com/google/gerrit/server/api/config/ConfigImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/config/ConfigImpl.java
rename to java/com/google/gerrit/server/api/config/ConfigImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/config/Module.java b/java/com/google/gerrit/server/api/config/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/config/Module.java
rename to java/com/google/gerrit/server/api/config/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/config/ServerImpl.java b/java/com/google/gerrit/server/api/config/ServerImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/config/ServerImpl.java
rename to java/com/google/gerrit/server/api/config/ServerImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/groups/GroupApiImpl.java b/java/com/google/gerrit/server/api/groups/GroupApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/groups/GroupApiImpl.java
rename to java/com/google/gerrit/server/api/groups/GroupApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/groups/GroupsImpl.java b/java/com/google/gerrit/server/api/groups/GroupsImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/groups/GroupsImpl.java
rename to java/com/google/gerrit/server/api/groups/GroupsImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/groups/Module.java b/java/com/google/gerrit/server/api/groups/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/groups/Module.java
rename to java/com/google/gerrit/server/api/groups/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/plugins/PluginApiImpl.java b/java/com/google/gerrit/server/api/plugins/PluginApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/plugins/PluginApiImpl.java
rename to java/com/google/gerrit/server/api/plugins/PluginApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/plugins/PluginsImpl.java b/java/com/google/gerrit/server/api/plugins/PluginsImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/plugins/PluginsImpl.java
rename to java/com/google/gerrit/server/api/plugins/PluginsImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java b/java/com/google/gerrit/server/api/projects/BranchApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/projects/BranchApiImpl.java
rename to java/com/google/gerrit/server/api/projects/BranchApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ChildProjectApiImpl.java b/java/com/google/gerrit/server/api/projects/ChildProjectApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ChildProjectApiImpl.java
rename to java/com/google/gerrit/server/api/projects/ChildProjectApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/CommitApiImpl.java b/java/com/google/gerrit/server/api/projects/CommitApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/projects/CommitApiImpl.java
rename to java/com/google/gerrit/server/api/projects/CommitApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/DashboardApiImpl.java b/java/com/google/gerrit/server/api/projects/DashboardApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/projects/DashboardApiImpl.java
rename to java/com/google/gerrit/server/api/projects/DashboardApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/Module.java b/java/com/google/gerrit/server/api/projects/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/projects/Module.java
rename to java/com/google/gerrit/server/api/projects/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java b/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ProjectApiImpl.java
rename to java/com/google/gerrit/server/api/projects/ProjectApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ProjectsImpl.java b/java/com/google/gerrit/server/api/projects/ProjectsImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/projects/ProjectsImpl.java
rename to java/com/google/gerrit/server/api/projects/ProjectsImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/projects/TagApiImpl.java b/java/com/google/gerrit/server/api/projects/TagApiImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/api/projects/TagApiImpl.java
rename to java/com/google/gerrit/server/api/projects/TagApiImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java b/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java
rename to java/com/google/gerrit/server/args4j/AccountGroupIdHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java b/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java
rename to java/com/google/gerrit/server/args4j/AccountGroupUUIDHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java b/java/com/google/gerrit/server/args4j/AccountIdHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/AccountIdHandler.java
rename to java/com/google/gerrit/server/args4j/AccountIdHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java b/java/com/google/gerrit/server/args4j/ChangeIdHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/ChangeIdHandler.java
rename to java/com/google/gerrit/server/args4j/ChangeIdHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ObjectIdHandler.java b/java/com/google/gerrit/server/args4j/ObjectIdHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/ObjectIdHandler.java
rename to java/com/google/gerrit/server/args4j/ObjectIdHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java b/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/PatchSetIdHandler.java
rename to java/com/google/gerrit/server/args4j/PatchSetIdHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectHandler.java b/java/com/google/gerrit/server/args4j/ProjectHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectHandler.java
rename to java/com/google/gerrit/server/args4j/ProjectHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java b/java/com/google/gerrit/server/args4j/SocketAddressHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/SocketAddressHandler.java
rename to java/com/google/gerrit/server/args4j/SocketAddressHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java b/java/com/google/gerrit/server/args4j/SubcommandHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/SubcommandHandler.java
rename to java/com/google/gerrit/server/args4j/SubcommandHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/args4j/TimestampHandler.java b/java/com/google/gerrit/server/args4j/TimestampHandler.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/args4j/TimestampHandler.java
rename to java/com/google/gerrit/server/args4j/TimestampHandler.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthBackend.java b/java/com/google/gerrit/server/auth/AuthBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthBackend.java
rename to java/com/google/gerrit/server/auth/AuthBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthException.java b/java/com/google/gerrit/server/auth/AuthException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthException.java
rename to java/com/google/gerrit/server/auth/AuthException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthRequest.java b/java/com/google/gerrit/server/auth/AuthRequest.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthRequest.java
rename to java/com/google/gerrit/server/auth/AuthRequest.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthUser.java b/java/com/google/gerrit/server/auth/AuthUser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthUser.java
rename to java/com/google/gerrit/server/auth/AuthUser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java b/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java
rename to java/com/google/gerrit/server/auth/AuthenticationUnavailableException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/InternalAuthBackend.java b/java/com/google/gerrit/server/auth/InternalAuthBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/InternalAuthBackend.java
rename to java/com/google/gerrit/server/auth/InternalAuthBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/InvalidCredentialsException.java b/java/com/google/gerrit/server/auth/InvalidCredentialsException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/InvalidCredentialsException.java
rename to java/com/google/gerrit/server/auth/InvalidCredentialsException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/MissingCredentialsException.java b/java/com/google/gerrit/server/auth/MissingCredentialsException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/MissingCredentialsException.java
rename to java/com/google/gerrit/server/auth/MissingCredentialsException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/NoSuchUserException.java b/java/com/google/gerrit/server/auth/NoSuchUserException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/NoSuchUserException.java
rename to java/com/google/gerrit/server/auth/NoSuchUserException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java b/java/com/google/gerrit/server/auth/UniversalAuthBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/UniversalAuthBackend.java
rename to java/com/google/gerrit/server/auth/UniversalAuthBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/UnknownUserException.java b/java/com/google/gerrit/server/auth/UnknownUserException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/UnknownUserException.java
rename to java/com/google/gerrit/server/auth/UnknownUserException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/UserNotAllowedException.java b/java/com/google/gerrit/server/auth/UserNotAllowedException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/UserNotAllowedException.java
rename to java/com/google/gerrit/server/auth/UserNotAllowedException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java b/java/com/google/gerrit/server/auth/ldap/Helper.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/Helper.java
rename to java/com/google/gerrit/server/auth/ldap/Helper.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapAuthBackend.java b/java/com/google/gerrit/server/auth/ldap/LdapAuthBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapAuthBackend.java
rename to java/com/google/gerrit/server/auth/ldap/LdapAuthBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java b/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java
rename to java/com/google/gerrit/server/auth/ldap/LdapGroupBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupMembership.java b/java/com/google/gerrit/server/auth/ldap/LdapGroupMembership.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapGroupMembership.java
rename to java/com/google/gerrit/server/auth/ldap/LdapGroupMembership.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapModule.java b/java/com/google/gerrit/server/auth/ldap/LdapModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapModule.java
rename to java/com/google/gerrit/server/auth/ldap/LdapModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java b/java/com/google/gerrit/server/auth/ldap/LdapQuery.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapQuery.java
rename to java/com/google/gerrit/server/auth/ldap/LdapQuery.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java b/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
rename to java/com/google/gerrit/server/auth/ldap/LdapRealm.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java b/java/com/google/gerrit/server/auth/ldap/LdapType.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapType.java
rename to java/com/google/gerrit/server/auth/ldap/LdapType.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java b/java/com/google/gerrit/server/auth/ldap/SearchScope.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/SearchScope.java
rename to java/com/google/gerrit/server/auth/ldap/SearchScope.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/oauth/OAuthRealm.java b/java/com/google/gerrit/server/auth/oauth/OAuthRealm.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/oauth/OAuthRealm.java
rename to java/com/google/gerrit/server/auth/oauth/OAuthRealm.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/oauth/OAuthTokenCache.java b/java/com/google/gerrit/server/auth/oauth/OAuthTokenCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/oauth/OAuthTokenCache.java
rename to java/com/google/gerrit/server/auth/oauth/OAuthTokenCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/openid/OpenIdProviderPattern.java b/java/com/google/gerrit/server/auth/openid/OpenIdProviderPattern.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/auth/openid/OpenIdProviderPattern.java
rename to java/com/google/gerrit/server/auth/openid/OpenIdProviderPattern.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/avatar/AvatarProvider.java b/java/com/google/gerrit/server/avatar/AvatarProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/avatar/AvatarProvider.java
rename to java/com/google/gerrit/server/avatar/AvatarProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheBinding.java b/java/com/google/gerrit/server/cache/CacheBinding.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheBinding.java
rename to java/com/google/gerrit/server/cache/CacheBinding.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheMetrics.java b/java/com/google/gerrit/server/cache/CacheMetrics.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheMetrics.java
rename to java/com/google/gerrit/server/cache/CacheMetrics.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheModule.java b/java/com/google/gerrit/server/cache/CacheModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheModule.java
rename to java/com/google/gerrit/server/cache/CacheModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheProvider.java b/java/com/google/gerrit/server/cache/CacheProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheProvider.java
rename to java/com/google/gerrit/server/cache/CacheProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheRemovalListener.java b/java/com/google/gerrit/server/cache/CacheRemovalListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/cache/CacheRemovalListener.java
rename to java/com/google/gerrit/server/cache/CacheRemovalListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/ForwardingRemovalListener.java b/java/com/google/gerrit/server/cache/ForwardingRemovalListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/cache/ForwardingRemovalListener.java
rename to java/com/google/gerrit/server/cache/ForwardingRemovalListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/MemoryCacheFactory.java b/java/com/google/gerrit/server/cache/MemoryCacheFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/cache/MemoryCacheFactory.java
rename to java/com/google/gerrit/server/cache/MemoryCacheFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/PersistentCache.java b/java/com/google/gerrit/server/cache/PersistentCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/cache/PersistentCache.java
rename to java/com/google/gerrit/server/cache/PersistentCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/PersistentCacheFactory.java b/java/com/google/gerrit/server/cache/PersistentCacheFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/cache/PersistentCacheFactory.java
rename to java/com/google/gerrit/server/cache/PersistentCacheFactory.java
diff --git a/java/com/google/gerrit/server/cache/h2/BUILD b/java/com/google/gerrit/server/cache/h2/BUILD
index c3b0a88..ba2f9e4 100644
--- a/java/com/google/gerrit/server/cache/h2/BUILD
+++ b/java/com/google/gerrit/server/cache/h2/BUILD
@@ -3,7 +3,7 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/lifecycle",
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java b/java/com/google/gerrit/server/change/Abandon.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Abandon.java
rename to java/com/google/gerrit/server/change/Abandon.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/AbandonUtil.java b/java/com/google/gerrit/server/change/AbandonUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/AbandonUtil.java
rename to java/com/google/gerrit/server/change/AbandonUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/AccountPatchReviewStore.java b/java/com/google/gerrit/server/change/AccountPatchReviewStore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/AccountPatchReviewStore.java
rename to java/com/google/gerrit/server/change/AccountPatchReviewStore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ActionJson.java b/java/com/google/gerrit/server/change/ActionJson.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ActionJson.java
rename to java/com/google/gerrit/server/change/ActionJson.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/AllowedFormats.java b/java/com/google/gerrit/server/change/AllowedFormats.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/AllowedFormats.java
rename to java/com/google/gerrit/server/change/AllowedFormats.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ApplyFix.java b/java/com/google/gerrit/server/change/ApplyFix.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ApplyFix.java
rename to java/com/google/gerrit/server/change/ApplyFix.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ArchiveFormat.java b/java/com/google/gerrit/server/change/ArchiveFormat.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ArchiveFormat.java
rename to java/com/google/gerrit/server/change/ArchiveFormat.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeCleanupRunner.java b/java/com/google/gerrit/server/change/ChangeCleanupRunner.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeCleanupRunner.java
rename to java/com/google/gerrit/server/change/ChangeCleanupRunner.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEditResource.java b/java/com/google/gerrit/server/change/ChangeEditResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEditResource.java
rename to java/com/google/gerrit/server/change/ChangeEditResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java b/java/com/google/gerrit/server/change/ChangeEdits.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java
rename to java/com/google/gerrit/server/change/ChangeEdits.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeIncludedIn.java b/java/com/google/gerrit/server/change/ChangeIncludedIn.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeIncludedIn.java
rename to java/com/google/gerrit/server/change/ChangeIncludedIn.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeInserter.java
rename to java/com/google/gerrit/server/change/ChangeInserter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeJson.java
rename to java/com/google/gerrit/server/change/ChangeJson.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCache.java b/java/com/google/gerrit/server/change/ChangeKindCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCache.java
rename to java/com/google/gerrit/server/change/ChangeKindCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java b/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
rename to java/com/google/gerrit/server/change/ChangeKindCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeMessages.java b/java/com/google/gerrit/server/change/ChangeMessages.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeMessages.java
rename to java/com/google/gerrit/server/change/ChangeMessages.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java b/java/com/google/gerrit/server/change/ChangeResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeResource.java
rename to java/com/google/gerrit/server/change/ChangeResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeTriplet.java b/java/com/google/gerrit/server/change/ChangeTriplet.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeTriplet.java
rename to java/com/google/gerrit/server/change/ChangeTriplet.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangesCollection.java b/java/com/google/gerrit/server/change/ChangesCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ChangesCollection.java
rename to java/com/google/gerrit/server/change/ChangesCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Check.java b/java/com/google/gerrit/server/change/Check.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Check.java
rename to java/com/google/gerrit/server/change/Check.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java b/java/com/google/gerrit/server/change/CherryPick.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPick.java
rename to java/com/google/gerrit/server/change/CherryPick.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java b/java/com/google/gerrit/server/change/CherryPickChange.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickChange.java
rename to java/com/google/gerrit/server/change/CherryPickChange.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java b/java/com/google/gerrit/server/change/CherryPickCommit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/CherryPickCommit.java
rename to java/com/google/gerrit/server/change/CherryPickCommit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentJson.java b/java/com/google/gerrit/server/change/CommentJson.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/CommentJson.java
rename to java/com/google/gerrit/server/change/CommentJson.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CommentResource.java b/java/com/google/gerrit/server/change/CommentResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/CommentResource.java
rename to java/com/google/gerrit/server/change/CommentResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Comments.java b/java/com/google/gerrit/server/change/Comments.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Comments.java
rename to java/com/google/gerrit/server/change/Comments.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java b/java/com/google/gerrit/server/change/ConsistencyChecker.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ConsistencyChecker.java
rename to java/com/google/gerrit/server/change/ConsistencyChecker.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java b/java/com/google/gerrit/server/change/CreateChange.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/CreateChange.java
rename to java/com/google/gerrit/server/change/CreateChange.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateDraftComment.java b/java/com/google/gerrit/server/change/CreateDraftComment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/CreateDraftComment.java
rename to java/com/google/gerrit/server/change/CreateDraftComment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/CreateMergePatchSet.java b/java/com/google/gerrit/server/change/CreateMergePatchSet.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/CreateMergePatchSet.java
rename to java/com/google/gerrit/server/change/CreateMergePatchSet.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteAssignee.java b/java/com/google/gerrit/server/change/DeleteAssignee.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteAssignee.java
rename to java/com/google/gerrit/server/change/DeleteAssignee.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteChange.java b/java/com/google/gerrit/server/change/DeleteChange.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteChange.java
rename to java/com/google/gerrit/server/change/DeleteChange.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteChangeEdit.java b/java/com/google/gerrit/server/change/DeleteChangeEdit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteChangeEdit.java
rename to java/com/google/gerrit/server/change/DeleteChangeEdit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteChangeOp.java b/java/com/google/gerrit/server/change/DeleteChangeOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteChangeOp.java
rename to java/com/google/gerrit/server/change/DeleteChangeOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteComment.java b/java/com/google/gerrit/server/change/DeleteComment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteComment.java
rename to java/com/google/gerrit/server/change/DeleteComment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftComment.java b/java/com/google/gerrit/server/change/DeleteDraftComment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteDraftComment.java
rename to java/com/google/gerrit/server/change/DeleteDraftComment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeletePrivate.java b/java/com/google/gerrit/server/change/DeletePrivate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeletePrivate.java
rename to java/com/google/gerrit/server/change/DeletePrivate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeletePrivateByPost.java b/java/com/google/gerrit/server/change/DeletePrivateByPost.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeletePrivateByPost.java
rename to java/com/google/gerrit/server/change/DeletePrivateByPost.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java b/java/com/google/gerrit/server/change/DeleteReviewer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java
rename to java/com/google/gerrit/server/change/DeleteReviewer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewerByEmailOp.java b/java/com/google/gerrit/server/change/DeleteReviewerByEmailOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewerByEmailOp.java
rename to java/com/google/gerrit/server/change/DeleteReviewerByEmailOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewerOp.java b/java/com/google/gerrit/server/change/DeleteReviewerOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewerOp.java
rename to java/com/google/gerrit/server/change/DeleteReviewerOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteVote.java b/java/com/google/gerrit/server/change/DeleteVote.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteVote.java
rename to java/com/google/gerrit/server/change/DeleteVote.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DownloadContent.java b/java/com/google/gerrit/server/change/DownloadContent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DownloadContent.java
rename to java/com/google/gerrit/server/change/DownloadContent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DraftCommentResource.java b/java/com/google/gerrit/server/change/DraftCommentResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DraftCommentResource.java
rename to java/com/google/gerrit/server/change/DraftCommentResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DraftComments.java b/java/com/google/gerrit/server/change/DraftComments.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/DraftComments.java
rename to java/com/google/gerrit/server/change/DraftComments.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java b/java/com/google/gerrit/server/change/EmailReviewComments.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/EmailReviewComments.java
rename to java/com/google/gerrit/server/change/EmailReviewComments.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java b/java/com/google/gerrit/server/change/FileContentUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/FileContentUtil.java
rename to java/com/google/gerrit/server/change/FileContentUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java b/java/com/google/gerrit/server/change/FileInfoJson.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/FileInfoJson.java
rename to java/com/google/gerrit/server/change/FileInfoJson.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FileResource.java b/java/com/google/gerrit/server/change/FileResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/FileResource.java
rename to java/com/google/gerrit/server/change/FileResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java b/java/com/google/gerrit/server/change/Files.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java
rename to java/com/google/gerrit/server/change/Files.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/FixResource.java b/java/com/google/gerrit/server/change/FixResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/FixResource.java
rename to java/com/google/gerrit/server/change/FixResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Fixes.java b/java/com/google/gerrit/server/change/Fixes.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Fixes.java
rename to java/com/google/gerrit/server/change/Fixes.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetArchive.java b/java/com/google/gerrit/server/change/GetArchive.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetArchive.java
rename to java/com/google/gerrit/server/change/GetArchive.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetAssignee.java b/java/com/google/gerrit/server/change/GetAssignee.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetAssignee.java
rename to java/com/google/gerrit/server/change/GetAssignee.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java b/java/com/google/gerrit/server/change/GetBlame.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java
rename to java/com/google/gerrit/server/change/GetBlame.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetChange.java b/java/com/google/gerrit/server/change/GetChange.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetChange.java
rename to java/com/google/gerrit/server/change/GetChange.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetComment.java b/java/com/google/gerrit/server/change/GetComment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetComment.java
rename to java/com/google/gerrit/server/change/GetComment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetCommit.java b/java/com/google/gerrit/server/change/GetCommit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetCommit.java
rename to java/com/google/gerrit/server/change/GetCommit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetContent.java b/java/com/google/gerrit/server/change/GetContent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetContent.java
rename to java/com/google/gerrit/server/change/GetContent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDescription.java b/java/com/google/gerrit/server/change/GetDescription.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetDescription.java
rename to java/com/google/gerrit/server/change/GetDescription.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDetail.java b/java/com/google/gerrit/server/change/GetDetail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetDetail.java
rename to java/com/google/gerrit/server/change/GetDetail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java b/java/com/google/gerrit/server/change/GetDiff.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
rename to java/com/google/gerrit/server/change/GetDiff.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetDraftComment.java b/java/com/google/gerrit/server/change/GetDraftComment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetDraftComment.java
rename to java/com/google/gerrit/server/change/GetDraftComment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java b/java/com/google/gerrit/server/change/GetHashtags.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetHashtags.java
rename to java/com/google/gerrit/server/change/GetHashtags.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetMergeList.java b/java/com/google/gerrit/server/change/GetMergeList.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetMergeList.java
rename to java/com/google/gerrit/server/change/GetMergeList.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPastAssignees.java b/java/com/google/gerrit/server/change/GetPastAssignees.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetPastAssignees.java
rename to java/com/google/gerrit/server/change/GetPastAssignees.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPatch.java b/java/com/google/gerrit/server/change/GetPatch.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetPatch.java
rename to java/com/google/gerrit/server/change/GetPatch.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetPureRevert.java b/java/com/google/gerrit/server/change/GetPureRevert.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetPureRevert.java
rename to java/com/google/gerrit/server/change/GetPureRevert.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java b/java/com/google/gerrit/server/change/GetRelated.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetRelated.java
rename to java/com/google/gerrit/server/change/GetRelated.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReview.java b/java/com/google/gerrit/server/change/GetReview.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetReview.java
rename to java/com/google/gerrit/server/change/GetReview.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetReviewer.java b/java/com/google/gerrit/server/change/GetReviewer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetReviewer.java
rename to java/com/google/gerrit/server/change/GetReviewer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRevisionActions.java b/java/com/google/gerrit/server/change/GetRevisionActions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetRevisionActions.java
rename to java/com/google/gerrit/server/change/GetRevisionActions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetRobotComment.java b/java/com/google/gerrit/server/change/GetRobotComment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetRobotComment.java
rename to java/com/google/gerrit/server/change/GetRobotComment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetTopic.java b/java/com/google/gerrit/server/change/GetTopic.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/GetTopic.java
rename to java/com/google/gerrit/server/change/GetTopic.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java b/java/com/google/gerrit/server/change/HashtagsUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/HashtagsUtil.java
rename to java/com/google/gerrit/server/change/HashtagsUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Ignore.java b/java/com/google/gerrit/server/change/Ignore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Ignore.java
rename to java/com/google/gerrit/server/change/Ignore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java b/java/com/google/gerrit/server/change/IncludedIn.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedIn.java
rename to java/com/google/gerrit/server/change/IncludedIn.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java b/java/com/google/gerrit/server/change/IncludedInResolver.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/IncludedInResolver.java
rename to java/com/google/gerrit/server/change/IncludedInResolver.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Index.java b/java/com/google/gerrit/server/change/Index.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Index.java
rename to java/com/google/gerrit/server/change/Index.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/LimitedByteArrayOutputStream.java b/java/com/google/gerrit/server/change/LimitedByteArrayOutputStream.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/LimitedByteArrayOutputStream.java
rename to java/com/google/gerrit/server/change/LimitedByteArrayOutputStream.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListChangeComments.java b/java/com/google/gerrit/server/change/ListChangeComments.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ListChangeComments.java
rename to java/com/google/gerrit/server/change/ListChangeComments.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListChangeDrafts.java b/java/com/google/gerrit/server/change/ListChangeDrafts.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ListChangeDrafts.java
rename to java/com/google/gerrit/server/change/ListChangeDrafts.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListChangeRobotComments.java b/java/com/google/gerrit/server/change/ListChangeRobotComments.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ListChangeRobotComments.java
rename to java/com/google/gerrit/server/change/ListChangeRobotComments.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListReviewers.java b/java/com/google/gerrit/server/change/ListReviewers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ListReviewers.java
rename to java/com/google/gerrit/server/change/ListReviewers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListRevisionComments.java b/java/com/google/gerrit/server/change/ListRevisionComments.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ListRevisionComments.java
rename to java/com/google/gerrit/server/change/ListRevisionComments.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListRevisionDrafts.java b/java/com/google/gerrit/server/change/ListRevisionDrafts.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ListRevisionDrafts.java
rename to java/com/google/gerrit/server/change/ListRevisionDrafts.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListRevisionReviewers.java b/java/com/google/gerrit/server/change/ListRevisionReviewers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ListRevisionReviewers.java
rename to java/com/google/gerrit/server/change/ListRevisionReviewers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ListRobotComments.java b/java/com/google/gerrit/server/change/ListRobotComments.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ListRobotComments.java
rename to java/com/google/gerrit/server/change/ListRobotComments.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/MarkAsReviewed.java b/java/com/google/gerrit/server/change/MarkAsReviewed.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/MarkAsReviewed.java
rename to java/com/google/gerrit/server/change/MarkAsReviewed.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/MarkAsUnreviewed.java b/java/com/google/gerrit/server/change/MarkAsUnreviewed.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/MarkAsUnreviewed.java
rename to java/com/google/gerrit/server/change/MarkAsUnreviewed.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java b/java/com/google/gerrit/server/change/MergeabilityCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java
rename to java/com/google/gerrit/server/change/MergeabilityCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java b/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCacheImpl.java
rename to java/com/google/gerrit/server/change/MergeabilityCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java b/java/com/google/gerrit/server/change/Mergeable.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java
rename to java/com/google/gerrit/server/change/Mergeable.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java b/java/com/google/gerrit/server/change/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java
rename to java/com/google/gerrit/server/change/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java b/java/com/google/gerrit/server/change/Move.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java
rename to java/com/google/gerrit/server/change/Move.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/NotifyUtil.java b/java/com/google/gerrit/server/change/NotifyUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/NotifyUtil.java
rename to java/com/google/gerrit/server/change/NotifyUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PatchSetInserter.java
rename to java/com/google/gerrit/server/change/PatchSetInserter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java b/java/com/google/gerrit/server/change/PostHashtags.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PostHashtags.java
rename to java/com/google/gerrit/server/change/PostHashtags.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostPrivate.java b/java/com/google/gerrit/server/change/PostPrivate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PostPrivate.java
rename to java/com/google/gerrit/server/change/PostPrivate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java b/java/com/google/gerrit/server/change/PostReview.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PostReview.java
rename to java/com/google/gerrit/server/change/PostReview.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java b/java/com/google/gerrit/server/change/PostReviewers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
rename to java/com/google/gerrit/server/change/PostReviewers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewersOp.java b/java/com/google/gerrit/server/change/PostReviewersOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewersOp.java
rename to java/com/google/gerrit/server/change/PostReviewersOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PreviewSubmit.java b/java/com/google/gerrit/server/change/PreviewSubmit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PreviewSubmit.java
rename to java/com/google/gerrit/server/change/PreviewSubmit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java b/java/com/google/gerrit/server/change/PublishChangeEdit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PublishChangeEdit.java
rename to java/com/google/gerrit/server/change/PublishChangeEdit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutAssignee.java b/java/com/google/gerrit/server/change/PutAssignee.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PutAssignee.java
rename to java/com/google/gerrit/server/change/PutAssignee.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDescription.java b/java/com/google/gerrit/server/change/PutDescription.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PutDescription.java
rename to java/com/google/gerrit/server/change/PutDescription.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutDraftComment.java b/java/com/google/gerrit/server/change/PutDraftComment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PutDraftComment.java
rename to java/com/google/gerrit/server/change/PutDraftComment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutMessage.java b/java/com/google/gerrit/server/change/PutMessage.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PutMessage.java
rename to java/com/google/gerrit/server/change/PutMessage.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PutTopic.java b/java/com/google/gerrit/server/change/PutTopic.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/PutTopic.java
rename to java/com/google/gerrit/server/change/PutTopic.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java b/java/com/google/gerrit/server/change/Rebase.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
rename to java/com/google/gerrit/server/change/Rebase.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeEdit.java b/java/com/google/gerrit/server/change/RebaseChangeEdit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeEdit.java
rename to java/com/google/gerrit/server/change/RebaseChangeEdit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java b/java/com/google/gerrit/server/change/RebaseChangeOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseChangeOp.java
rename to java/com/google/gerrit/server/change/RebaseChangeOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseUtil.java b/java/com/google/gerrit/server/change/RebaseUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/RebaseUtil.java
rename to java/com/google/gerrit/server/change/RebaseUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Rebuild.java b/java/com/google/gerrit/server/change/Rebuild.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Rebuild.java
rename to java/com/google/gerrit/server/change/Rebuild.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RelatedChangesSorter.java b/java/com/google/gerrit/server/change/RelatedChangesSorter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/RelatedChangesSorter.java
rename to java/com/google/gerrit/server/change/RelatedChangesSorter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java b/java/com/google/gerrit/server/change/Restore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Restore.java
rename to java/com/google/gerrit/server/change/Restore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java b/java/com/google/gerrit/server/change/Revert.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Revert.java
rename to java/com/google/gerrit/server/change/Revert.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java b/java/com/google/gerrit/server/change/Reviewed.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java
rename to java/com/google/gerrit/server/change/Reviewed.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java b/java/com/google/gerrit/server/change/ReviewerJson.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
rename to java/com/google/gerrit/server/change/ReviewerJson.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerResource.java b/java/com/google/gerrit/server/change/ReviewerResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerResource.java
rename to java/com/google/gerrit/server/change/ReviewerResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestion.java b/java/com/google/gerrit/server/change/ReviewerSuggestion.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerSuggestion.java
rename to java/com/google/gerrit/server/change/ReviewerSuggestion.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewers.java b/java/com/google/gerrit/server/change/Reviewers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewers.java
rename to java/com/google/gerrit/server/change/Reviewers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RevisionResource.java b/java/com/google/gerrit/server/change/RevisionResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/RevisionResource.java
rename to java/com/google/gerrit/server/change/RevisionResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RevisionReviewers.java b/java/com/google/gerrit/server/change/RevisionReviewers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/RevisionReviewers.java
rename to java/com/google/gerrit/server/change/RevisionReviewers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java b/java/com/google/gerrit/server/change/Revisions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Revisions.java
rename to java/com/google/gerrit/server/change/Revisions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RobotCommentResource.java b/java/com/google/gerrit/server/change/RobotCommentResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/RobotCommentResource.java
rename to java/com/google/gerrit/server/change/RobotCommentResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/RobotComments.java b/java/com/google/gerrit/server/change/RobotComments.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/RobotComments.java
rename to java/com/google/gerrit/server/change/RobotComments.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java b/java/com/google/gerrit/server/change/SetAssigneeOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/SetAssigneeOp.java
rename to java/com/google/gerrit/server/change/SetAssigneeOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetHashtagsOp.java b/java/com/google/gerrit/server/change/SetHashtagsOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/SetHashtagsOp.java
rename to java/com/google/gerrit/server/change/SetHashtagsOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetPrivateOp.java b/java/com/google/gerrit/server/change/SetPrivateOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/SetPrivateOp.java
rename to java/com/google/gerrit/server/change/SetPrivateOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetReadyForReview.java b/java/com/google/gerrit/server/change/SetReadyForReview.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/SetReadyForReview.java
rename to java/com/google/gerrit/server/change/SetReadyForReview.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SetWorkInProgress.java b/java/com/google/gerrit/server/change/SetWorkInProgress.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/SetWorkInProgress.java
rename to java/com/google/gerrit/server/change/SetWorkInProgress.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java b/java/com/google/gerrit/server/change/Submit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Submit.java
rename to java/com/google/gerrit/server/change/Submit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SubmittedTogether.java b/java/com/google/gerrit/server/change/SubmittedTogether.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/SubmittedTogether.java
rename to java/com/google/gerrit/server/change/SubmittedTogether.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java b/java/com/google/gerrit/server/change/SuggestChangeReviewers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java
rename to java/com/google/gerrit/server/change/SuggestChangeReviewers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java b/java/com/google/gerrit/server/change/SuggestReviewers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java
rename to java/com/google/gerrit/server/change/SuggestReviewers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestedReviewer.java b/java/com/google/gerrit/server/change/SuggestedReviewer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestedReviewer.java
rename to java/com/google/gerrit/server/change/SuggestedReviewer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitRule.java b/java/com/google/gerrit/server/change/TestSubmitRule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitRule.java
rename to java/com/google/gerrit/server/change/TestSubmitRule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitType.java b/java/com/google/gerrit/server/change/TestSubmitType.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/TestSubmitType.java
rename to java/com/google/gerrit/server/change/TestSubmitType.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Unignore.java b/java/com/google/gerrit/server/change/Unignore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Unignore.java
rename to java/com/google/gerrit/server/change/Unignore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/VoteResource.java b/java/com/google/gerrit/server/change/VoteResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/VoteResource.java
rename to java/com/google/gerrit/server/change/VoteResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Votes.java b/java/com/google/gerrit/server/change/Votes.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/Votes.java
rename to java/com/google/gerrit/server/change/Votes.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/WalkSorter.java b/java/com/google/gerrit/server/change/WalkSorter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/WalkSorter.java
rename to java/com/google/gerrit/server/change/WalkSorter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/WorkInProgressOp.java b/java/com/google/gerrit/server/change/WorkInProgressOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/change/WorkInProgressOp.java
rename to java/com/google/gerrit/server/change/WorkInProgressOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AdministrateServerGroups.java b/java/com/google/gerrit/server/config/AdministrateServerGroups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AdministrateServerGroups.java
rename to java/com/google/gerrit/server/config/AdministrateServerGroups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java b/java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java
rename to java/com/google/gerrit/server/config/AdministrateServerGroupsProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AgreementJson.java b/java/com/google/gerrit/server/config/AgreementJson.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AgreementJson.java
rename to java/com/google/gerrit/server/config/AgreementJson.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsName.java b/java/com/google/gerrit/server/config/AllProjectsName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsName.java
rename to java/com/google/gerrit/server/config/AllProjectsName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsNameProvider.java b/java/com/google/gerrit/server/config/AllProjectsNameProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AllProjectsNameProvider.java
rename to java/com/google/gerrit/server/config/AllProjectsNameProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersName.java b/java/com/google/gerrit/server/config/AllUsersName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersName.java
rename to java/com/google/gerrit/server/config/AllUsersName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersNameProvider.java b/java/com/google/gerrit/server/config/AllUsersNameProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AllUsersNameProvider.java
rename to java/com/google/gerrit/server/config/AllUsersNameProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardName.java b/java/com/google/gerrit/server/config/AnonymousCowardName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardName.java
rename to java/com/google/gerrit/server/config/AnonymousCowardName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java b/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java
rename to java/com/google/gerrit/server/config/AnonymousCowardNameProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java b/java/com/google/gerrit/server/config/AuthConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfig.java
rename to java/com/google/gerrit/server/config/AuthConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfigModule.java b/java/com/google/gerrit/server/config/AuthConfigModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AuthConfigModule.java
rename to java/com/google/gerrit/server/config/AuthConfigModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/AuthModule.java b/java/com/google/gerrit/server/config/AuthModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/AuthModule.java
rename to java/com/google/gerrit/server/config/AuthModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java b/java/com/google/gerrit/server/config/CacheResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/CacheResource.java
rename to java/com/google/gerrit/server/config/CacheResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CachesCollection.java b/java/com/google/gerrit/server/config/CachesCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/CachesCollection.java
rename to java/com/google/gerrit/server/config/CachesCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrl.java b/java/com/google/gerrit/server/config/CanonicalWebUrl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrl.java
rename to java/com/google/gerrit/server/config/CanonicalWebUrl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlModule.java b/java/com/google/gerrit/server/config/CanonicalWebUrlModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlModule.java
rename to java/com/google/gerrit/server/config/CanonicalWebUrlModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java b/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java
rename to java/com/google/gerrit/server/config/CanonicalWebUrlProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilitiesCollection.java b/java/com/google/gerrit/server/config/CapabilitiesCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilitiesCollection.java
rename to java/com/google/gerrit/server/config/CapabilitiesCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilityConstants.java b/java/com/google/gerrit/server/config/CapabilityConstants.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilityConstants.java
rename to java/com/google/gerrit/server/config/CapabilityConstants.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilityResource.java b/java/com/google/gerrit/server/config/CapabilityResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/CapabilityResource.java
rename to java/com/google/gerrit/server/config/CapabilityResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ChangeCleanupConfig.java b/java/com/google/gerrit/server/config/ChangeCleanupConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ChangeCleanupConfig.java
rename to java/com/google/gerrit/server/config/ChangeCleanupConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/CheckConsistency.java b/java/com/google/gerrit/server/config/CheckConsistency.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/CheckConsistency.java
rename to java/com/google/gerrit/server/config/CheckConsistency.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java b/java/com/google/gerrit/server/config/ConfigCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigCollection.java
rename to java/com/google/gerrit/server/config/ConfigCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigResource.java b/java/com/google/gerrit/server/config/ConfigResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigResource.java
rename to java/com/google/gerrit/server/config/ConfigResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigSection.java b/java/com/google/gerrit/server/config/ConfigSection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigSection.java
rename to java/com/google/gerrit/server/config/ConfigSection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java b/java/com/google/gerrit/server/config/ConfigUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ConfigUtil.java
rename to java/com/google/gerrit/server/config/ConfigUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ConfirmEmail.java b/java/com/google/gerrit/server/config/ConfirmEmail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ConfirmEmail.java
rename to java/com/google/gerrit/server/config/ConfirmEmail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/DeleteTask.java b/java/com/google/gerrit/server/config/DeleteTask.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/DeleteTask.java
rename to java/com/google/gerrit/server/config/DeleteTask.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/DisableReverseDnsLookup.java b/java/com/google/gerrit/server/config/DisableReverseDnsLookup.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/DisableReverseDnsLookup.java
rename to java/com/google/gerrit/server/config/DisableReverseDnsLookup.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/DisableReverseDnsLookupProvider.java b/java/com/google/gerrit/server/config/DisableReverseDnsLookupProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/DisableReverseDnsLookupProvider.java
rename to java/com/google/gerrit/server/config/DisableReverseDnsLookupProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java b/java/com/google/gerrit/server/config/DownloadConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/DownloadConfig.java
rename to java/com/google/gerrit/server/config/DownloadConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java b/java/com/google/gerrit/server/config/EmailExpanderProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/EmailExpanderProvider.java
rename to java/com/google/gerrit/server/config/EmailExpanderProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/FlushCache.java b/java/com/google/gerrit/server/config/FlushCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/FlushCache.java
rename to java/com/google/gerrit/server/config/FlushCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GcConfig.java b/java/com/google/gerrit/server/config/GcConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GcConfig.java
rename to java/com/google/gerrit/server/config/GcConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritConfig.java b/java/com/google/gerrit/server/config/GerritConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GerritConfig.java
rename to java/com/google/gerrit/server/config/GerritConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/java/com/google/gerrit/server/config/GerritGlobalModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
rename to java/com/google/gerrit/server/config/GerritGlobalModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritOptions.java b/java/com/google/gerrit/server/config/GerritOptions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GerritOptions.java
rename to java/com/google/gerrit/server/config/GerritOptions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java b/java/com/google/gerrit/server/config/GerritRequestModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GerritRequestModule.java
rename to java/com/google/gerrit/server/config/GerritRequestModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfig.java b/java/com/google/gerrit/server/config/GerritServerConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfig.java
rename to java/com/google/gerrit/server/config/GerritServerConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java b/java/com/google/gerrit/server/config/GerritServerConfigModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigModule.java
rename to java/com/google/gerrit/server/config/GerritServerConfigModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java b/java/com/google/gerrit/server/config/GerritServerConfigProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerConfigProvider.java
rename to java/com/google/gerrit/server/config/GerritServerConfigProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerId.java b/java/com/google/gerrit/server/config/GerritServerId.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerId.java
rename to java/com/google/gerrit/server/config/GerritServerId.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerIdProvider.java b/java/com/google/gerrit/server/config/GerritServerIdProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GerritServerIdProvider.java
rename to java/com/google/gerrit/server/config/GerritServerIdProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetCache.java b/java/com/google/gerrit/server/config/GetCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GetCache.java
rename to java/com/google/gerrit/server/config/GetCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetDiffPreferences.java b/java/com/google/gerrit/server/config/GetDiffPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GetDiffPreferences.java
rename to java/com/google/gerrit/server/config/GetDiffPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetPreferences.java b/java/com/google/gerrit/server/config/GetPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GetPreferences.java
rename to java/com/google/gerrit/server/config/GetPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java b/java/com/google/gerrit/server/config/GetServerInfo.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GetServerInfo.java
rename to java/com/google/gerrit/server/config/GetServerInfo.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetSummary.java b/java/com/google/gerrit/server/config/GetSummary.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GetSummary.java
rename to java/com/google/gerrit/server/config/GetSummary.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetTask.java b/java/com/google/gerrit/server/config/GetTask.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GetTask.java
rename to java/com/google/gerrit/server/config/GetTask.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GetVersion.java b/java/com/google/gerrit/server/config/GetVersion.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GetVersion.java
rename to java/com/google/gerrit/server/config/GetVersion.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitReceivePackGroups.java b/java/com/google/gerrit/server/config/GitReceivePackGroups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GitReceivePackGroups.java
rename to java/com/google/gerrit/server/config/GitReceivePackGroups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitReceivePackGroupsProvider.java b/java/com/google/gerrit/server/config/GitReceivePackGroupsProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GitReceivePackGroupsProvider.java
rename to java/com/google/gerrit/server/config/GitReceivePackGroupsProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitUploadPackGroups.java b/java/com/google/gerrit/server/config/GitUploadPackGroups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GitUploadPackGroups.java
rename to java/com/google/gerrit/server/config/GitUploadPackGroups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitUploadPackGroupsProvider.java b/java/com/google/gerrit/server/config/GitUploadPackGroupsProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GitUploadPackGroupsProvider.java
rename to java/com/google/gerrit/server/config/GitUploadPackGroupsProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebCgiConfig.java b/java/com/google/gerrit/server/config/GitwebCgiConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebCgiConfig.java
rename to java/com/google/gerrit/server/config/GitwebCgiConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebConfig.java b/java/com/google/gerrit/server/config/GitwebConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GitwebConfig.java
rename to java/com/google/gerrit/server/config/GitwebConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GlobalPluginConfig.java b/java/com/google/gerrit/server/config/GlobalPluginConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GlobalPluginConfig.java
rename to java/com/google/gerrit/server/config/GlobalPluginConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GroupSetProvider.java b/java/com/google/gerrit/server/config/GroupSetProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/GroupSetProvider.java
rename to java/com/google/gerrit/server/config/GroupSetProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCaches.java b/java/com/google/gerrit/server/config/ListCaches.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ListCaches.java
rename to java/com/google/gerrit/server/config/ListCaches.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListCapabilities.java b/java/com/google/gerrit/server/config/ListCapabilities.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ListCapabilities.java
rename to java/com/google/gerrit/server/config/ListCapabilities.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTasks.java b/java/com/google/gerrit/server/config/ListTasks.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ListTasks.java
rename to java/com/google/gerrit/server/config/ListTasks.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ListTopMenus.java b/java/com/google/gerrit/server/config/ListTopMenus.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ListTopMenus.java
rename to java/com/google/gerrit/server/config/ListTopMenus.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/Module.java b/java/com/google/gerrit/server/config/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/Module.java
rename to java/com/google/gerrit/server/config/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfig.java b/java/com/google/gerrit/server/config/PluginConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfig.java
rename to java/com/google/gerrit/server/config/PluginConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java b/java/com/google/gerrit/server/config/PluginConfigFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/PluginConfigFactory.java
rename to java/com/google/gerrit/server/config/PluginConfigFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/PostCaches.java b/java/com/google/gerrit/server/config/PostCaches.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/PostCaches.java
rename to java/com/google/gerrit/server/config/PostCaches.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectConfigEntry.java b/java/com/google/gerrit/server/config/ProjectConfigEntry.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectConfigEntry.java
rename to java/com/google/gerrit/server/config/ProjectConfigEntry.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectOwnerGroupsProvider.java b/java/com/google/gerrit/server/config/ProjectOwnerGroupsProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ProjectOwnerGroupsProvider.java
rename to java/com/google/gerrit/server/config/ProjectOwnerGroupsProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/RepositoryConfig.java b/java/com/google/gerrit/server/config/RepositoryConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/RepositoryConfig.java
rename to java/com/google/gerrit/server/config/RepositoryConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java b/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java
rename to java/com/google/gerrit/server/config/RequestScopedReviewDbProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/RestCacheAdminModule.java b/java/com/google/gerrit/server/config/RestCacheAdminModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/RestCacheAdminModule.java
rename to java/com/google/gerrit/server/config/RestCacheAdminModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ScheduleConfig.java b/java/com/google/gerrit/server/config/ScheduleConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ScheduleConfig.java
rename to java/com/google/gerrit/server/config/ScheduleConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/SetDiffPreferences.java b/java/com/google/gerrit/server/config/SetDiffPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/SetDiffPreferences.java
rename to java/com/google/gerrit/server/config/SetDiffPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/SetPreferences.java b/java/com/google/gerrit/server/config/SetPreferences.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/SetPreferences.java
rename to java/com/google/gerrit/server/config/SetPreferences.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePath.java b/java/com/google/gerrit/server/config/SitePath.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/SitePath.java
rename to java/com/google/gerrit/server/config/SitePath.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java b/java/com/google/gerrit/server/config/SitePaths.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/SitePaths.java
rename to java/com/google/gerrit/server/config/SitePaths.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TaskResource.java b/java/com/google/gerrit/server/config/TaskResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/TaskResource.java
rename to java/com/google/gerrit/server/config/TaskResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TasksCollection.java b/java/com/google/gerrit/server/config/TasksCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/TasksCollection.java
rename to java/com/google/gerrit/server/config/TasksCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/ThreadSettingsConfig.java b/java/com/google/gerrit/server/config/ThreadSettingsConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/ThreadSettingsConfig.java
rename to java/com/google/gerrit/server/config/ThreadSettingsConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TopMenuCollection.java b/java/com/google/gerrit/server/config/TopMenuCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/TopMenuCollection.java
rename to java/com/google/gerrit/server/config/TopMenuCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TopMenuResource.java b/java/com/google/gerrit/server/config/TopMenuResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/TopMenuResource.java
rename to java/com/google/gerrit/server/config/TopMenuResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java b/java/com/google/gerrit/server/config/TrackingFooter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooter.java
rename to java/com/google/gerrit/server/config/TrackingFooter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java b/java/com/google/gerrit/server/config/TrackingFooters.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFooters.java
rename to java/com/google/gerrit/server/config/TrackingFooters.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java b/java/com/google/gerrit/server/config/TrackingFootersProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/TrackingFootersProvider.java
rename to java/com/google/gerrit/server/config/TrackingFootersProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/VerboseSuperprojectUpdate.java b/java/com/google/gerrit/server/config/VerboseSuperprojectUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/config/VerboseSuperprojectUpdate.java
rename to java/com/google/gerrit/server/config/VerboseSuperprojectUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/AccountAttribute.java b/java/com/google/gerrit/server/data/AccountAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/AccountAttribute.java
rename to java/com/google/gerrit/server/data/AccountAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/ApprovalAttribute.java b/java/com/google/gerrit/server/data/ApprovalAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/ApprovalAttribute.java
rename to java/com/google/gerrit/server/data/ApprovalAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/ChangeAttribute.java b/java/com/google/gerrit/server/data/ChangeAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/ChangeAttribute.java
rename to java/com/google/gerrit/server/data/ChangeAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/DependencyAttribute.java b/java/com/google/gerrit/server/data/DependencyAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/DependencyAttribute.java
rename to java/com/google/gerrit/server/data/DependencyAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/MessageAttribute.java b/java/com/google/gerrit/server/data/MessageAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/MessageAttribute.java
rename to java/com/google/gerrit/server/data/MessageAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/PatchAttribute.java b/java/com/google/gerrit/server/data/PatchAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/PatchAttribute.java
rename to java/com/google/gerrit/server/data/PatchAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/PatchSetAttribute.java b/java/com/google/gerrit/server/data/PatchSetAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/PatchSetAttribute.java
rename to java/com/google/gerrit/server/data/PatchSetAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/PatchSetCommentAttribute.java b/java/com/google/gerrit/server/data/PatchSetCommentAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/PatchSetCommentAttribute.java
rename to java/com/google/gerrit/server/data/PatchSetCommentAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/QueryStatsAttribute.java b/java/com/google/gerrit/server/data/QueryStatsAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/QueryStatsAttribute.java
rename to java/com/google/gerrit/server/data/QueryStatsAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/RefUpdateAttribute.java b/java/com/google/gerrit/server/data/RefUpdateAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/RefUpdateAttribute.java
rename to java/com/google/gerrit/server/data/RefUpdateAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/SubmitLabelAttribute.java b/java/com/google/gerrit/server/data/SubmitLabelAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/SubmitLabelAttribute.java
rename to java/com/google/gerrit/server/data/SubmitLabelAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/SubmitRecordAttribute.java b/java/com/google/gerrit/server/data/SubmitRecordAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/SubmitRecordAttribute.java
rename to java/com/google/gerrit/server/data/SubmitRecordAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/data/TrackingIdAttribute.java b/java/com/google/gerrit/server/data/TrackingIdAttribute.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/data/TrackingIdAttribute.java
rename to java/com/google/gerrit/server/data/TrackingIdAttribute.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/documentation/Constants.java b/java/com/google/gerrit/server/documentation/Constants.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/documentation/Constants.java
rename to java/com/google/gerrit/server/documentation/Constants.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/documentation/MarkdownFormatter.java b/java/com/google/gerrit/server/documentation/MarkdownFormatter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/documentation/MarkdownFormatter.java
rename to java/com/google/gerrit/server/documentation/MarkdownFormatter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java b/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java
rename to java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEdit.java b/java/com/google/gerrit/server/edit/ChangeEdit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEdit.java
rename to java/com/google/gerrit/server/edit/ChangeEdit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java b/java/com/google/gerrit/server/edit/ChangeEditJson.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditJson.java
rename to java/com/google/gerrit/server/edit/ChangeEditJson.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java b/java/com/google/gerrit/server/edit/ChangeEditModifier.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditModifier.java
rename to java/com/google/gerrit/server/edit/ChangeEditModifier.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java b/java/com/google/gerrit/server/edit/ChangeEditUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
rename to java/com/google/gerrit/server/edit/ChangeEditUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/UnchangedCommitMessageException.java b/java/com/google/gerrit/server/edit/UnchangedCommitMessageException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/UnchangedCommitMessageException.java
rename to java/com/google/gerrit/server/edit/UnchangedCommitMessageException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/AddPath.java b/java/com/google/gerrit/server/edit/tree/AddPath.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/AddPath.java
rename to java/com/google/gerrit/server/edit/tree/AddPath.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/ChangeFileContentModification.java b/java/com/google/gerrit/server/edit/tree/ChangeFileContentModification.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/ChangeFileContentModification.java
rename to java/com/google/gerrit/server/edit/tree/ChangeFileContentModification.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/DeleteFileModification.java b/java/com/google/gerrit/server/edit/tree/DeleteFileModification.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/DeleteFileModification.java
rename to java/com/google/gerrit/server/edit/tree/DeleteFileModification.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/RenameFileModification.java b/java/com/google/gerrit/server/edit/tree/RenameFileModification.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/RenameFileModification.java
rename to java/com/google/gerrit/server/edit/tree/RenameFileModification.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/RestoreFileModification.java b/java/com/google/gerrit/server/edit/tree/RestoreFileModification.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/RestoreFileModification.java
rename to java/com/google/gerrit/server/edit/tree/RestoreFileModification.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/TreeCreator.java b/java/com/google/gerrit/server/edit/tree/TreeCreator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/TreeCreator.java
rename to java/com/google/gerrit/server/edit/tree/TreeCreator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/TreeModification.java b/java/com/google/gerrit/server/edit/tree/TreeModification.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/edit/tree/TreeModification.java
rename to java/com/google/gerrit/server/edit/tree/TreeModification.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/AssigneeChangedEvent.java b/java/com/google/gerrit/server/events/AssigneeChangedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/AssigneeChangedEvent.java
rename to java/com/google/gerrit/server/events/AssigneeChangedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeAbandonedEvent.java b/java/com/google/gerrit/server/events/ChangeAbandonedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeAbandonedEvent.java
rename to java/com/google/gerrit/server/events/ChangeAbandonedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeEvent.java b/java/com/google/gerrit/server/events/ChangeEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeEvent.java
rename to java/com/google/gerrit/server/events/ChangeEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeMergedEvent.java b/java/com/google/gerrit/server/events/ChangeMergedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeMergedEvent.java
rename to java/com/google/gerrit/server/events/ChangeMergedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeRestoredEvent.java b/java/com/google/gerrit/server/events/ChangeRestoredEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/ChangeRestoredEvent.java
rename to java/com/google/gerrit/server/events/ChangeRestoredEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/CommentAddedEvent.java b/java/com/google/gerrit/server/events/CommentAddedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/CommentAddedEvent.java
rename to java/com/google/gerrit/server/events/CommentAddedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/CommitReceivedEvent.java b/java/com/google/gerrit/server/events/CommitReceivedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/CommitReceivedEvent.java
rename to java/com/google/gerrit/server/events/CommitReceivedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/Event.java b/java/com/google/gerrit/server/events/Event.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/Event.java
rename to java/com/google/gerrit/server/events/Event.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventBroker.java b/java/com/google/gerrit/server/events/EventBroker.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/EventBroker.java
rename to java/com/google/gerrit/server/events/EventBroker.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventDeserializer.java b/java/com/google/gerrit/server/events/EventDeserializer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/EventDeserializer.java
rename to java/com/google/gerrit/server/events/EventDeserializer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventDispatcher.java b/java/com/google/gerrit/server/events/EventDispatcher.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/EventDispatcher.java
rename to java/com/google/gerrit/server/events/EventDispatcher.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java b/java/com/google/gerrit/server/events/EventFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/EventFactory.java
rename to java/com/google/gerrit/server/events/EventFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventListener.java b/java/com/google/gerrit/server/events/EventListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/EventListener.java
rename to java/com/google/gerrit/server/events/EventListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java b/java/com/google/gerrit/server/events/EventTypes.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/EventTypes.java
rename to java/com/google/gerrit/server/events/EventTypes.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/EventsMetrics.java b/java/com/google/gerrit/server/events/EventsMetrics.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/EventsMetrics.java
rename to java/com/google/gerrit/server/events/EventsMetrics.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/HashtagsChangedEvent.java b/java/com/google/gerrit/server/events/HashtagsChangedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/HashtagsChangedEvent.java
rename to java/com/google/gerrit/server/events/HashtagsChangedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetCreatedEvent.java b/java/com/google/gerrit/server/events/PatchSetCreatedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetCreatedEvent.java
rename to java/com/google/gerrit/server/events/PatchSetCreatedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetEvent.java b/java/com/google/gerrit/server/events/PatchSetEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/PatchSetEvent.java
rename to java/com/google/gerrit/server/events/PatchSetEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ProjectCreatedEvent.java b/java/com/google/gerrit/server/events/ProjectCreatedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/ProjectCreatedEvent.java
rename to java/com/google/gerrit/server/events/ProjectCreatedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ProjectEvent.java b/java/com/google/gerrit/server/events/ProjectEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/ProjectEvent.java
rename to java/com/google/gerrit/server/events/ProjectEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ProjectNameKeySerializer.java b/java/com/google/gerrit/server/events/ProjectNameKeySerializer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/ProjectNameKeySerializer.java
rename to java/com/google/gerrit/server/events/ProjectNameKeySerializer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/RefEvent.java b/java/com/google/gerrit/server/events/RefEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/RefEvent.java
rename to java/com/google/gerrit/server/events/RefEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/RefReceivedEvent.java b/java/com/google/gerrit/server/events/RefReceivedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/RefReceivedEvent.java
rename to java/com/google/gerrit/server/events/RefReceivedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/RefUpdatedEvent.java b/java/com/google/gerrit/server/events/RefUpdatedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/RefUpdatedEvent.java
rename to java/com/google/gerrit/server/events/RefUpdatedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerAddedEvent.java b/java/com/google/gerrit/server/events/ReviewerAddedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerAddedEvent.java
rename to java/com/google/gerrit/server/events/ReviewerAddedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerDeletedEvent.java b/java/com/google/gerrit/server/events/ReviewerDeletedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerDeletedEvent.java
rename to java/com/google/gerrit/server/events/ReviewerDeletedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/java/com/google/gerrit/server/events/StreamEventsApiListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java
rename to java/com/google/gerrit/server/events/StreamEventsApiListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/SupplierDeserializer.java b/java/com/google/gerrit/server/events/SupplierDeserializer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/SupplierDeserializer.java
rename to java/com/google/gerrit/server/events/SupplierDeserializer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/SupplierSerializer.java b/java/com/google/gerrit/server/events/SupplierSerializer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/SupplierSerializer.java
rename to java/com/google/gerrit/server/events/SupplierSerializer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/TopicChangedEvent.java b/java/com/google/gerrit/server/events/TopicChangedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/TopicChangedEvent.java
rename to java/com/google/gerrit/server/events/TopicChangedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/UserScopedEventListener.java b/java/com/google/gerrit/server/events/UserScopedEventListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/UserScopedEventListener.java
rename to java/com/google/gerrit/server/events/UserScopedEventListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/VoteDeletedEvent.java b/java/com/google/gerrit/server/events/VoteDeletedEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/events/VoteDeletedEvent.java
rename to java/com/google/gerrit/server/events/VoteDeletedEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AbstractChangeEvent.java b/java/com/google/gerrit/server/extensions/events/AbstractChangeEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AbstractChangeEvent.java
rename to java/com/google/gerrit/server/extensions/events/AbstractChangeEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AbstractNoNotifyEvent.java b/java/com/google/gerrit/server/extensions/events/AbstractNoNotifyEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AbstractNoNotifyEvent.java
rename to java/com/google/gerrit/server/extensions/events/AbstractNoNotifyEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AbstractRevisionEvent.java b/java/com/google/gerrit/server/extensions/events/AbstractRevisionEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AbstractRevisionEvent.java
rename to java/com/google/gerrit/server/extensions/events/AbstractRevisionEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AgreementSignup.java b/java/com/google/gerrit/server/extensions/events/AgreementSignup.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AgreementSignup.java
rename to java/com/google/gerrit/server/extensions/events/AgreementSignup.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AssigneeChanged.java b/java/com/google/gerrit/server/extensions/events/AssigneeChanged.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AssigneeChanged.java
rename to java/com/google/gerrit/server/extensions/events/AssigneeChanged.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java b/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java
rename to java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java b/java/com/google/gerrit/server/extensions/events/ChangeMerged.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java
rename to java/com/google/gerrit/server/extensions/events/ChangeMerged.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java b/java/com/google/gerrit/server/extensions/events/ChangeRestored.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java
rename to java/com/google/gerrit/server/extensions/events/ChangeRestored.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeReverted.java b/java/com/google/gerrit/server/extensions/events/ChangeReverted.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeReverted.java
rename to java/com/google/gerrit/server/extensions/events/ChangeReverted.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java b/java/com/google/gerrit/server/extensions/events/CommentAdded.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java
rename to java/com/google/gerrit/server/extensions/events/CommentAdded.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/EventUtil.java b/java/com/google/gerrit/server/extensions/events/EventUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/EventUtil.java
rename to java/com/google/gerrit/server/extensions/events/EventUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java b/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java
rename to java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java b/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java
rename to java/com/google/gerrit/server/extensions/events/HashtagsEdited.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/PluginEvent.java b/java/com/google/gerrit/server/extensions/events/PluginEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/PluginEvent.java
rename to java/com/google/gerrit/server/extensions/events/PluginEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerAdded.java b/java/com/google/gerrit/server/extensions/events/ReviewerAdded.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerAdded.java
rename to java/com/google/gerrit/server/extensions/events/ReviewerAdded.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerDeleted.java b/java/com/google/gerrit/server/extensions/events/ReviewerDeleted.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerDeleted.java
rename to java/com/google/gerrit/server/extensions/events/ReviewerDeleted.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java b/java/com/google/gerrit/server/extensions/events/RevisionCreated.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java
rename to java/com/google/gerrit/server/extensions/events/RevisionCreated.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java b/java/com/google/gerrit/server/extensions/events/TopicEdited.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java
rename to java/com/google/gerrit/server/extensions/events/TopicEdited.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/VoteDeleted.java b/java/com/google/gerrit/server/extensions/events/VoteDeleted.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/VoteDeleted.java
rename to java/com/google/gerrit/server/extensions/events/VoteDeleted.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/webui/UiActions.java b/java/com/google/gerrit/server/extensions/webui/UiActions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/extensions/webui/UiActions.java
rename to java/com/google/gerrit/server/extensions/webui/UiActions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/fixes/FixReplacementInterpreter.java b/java/com/google/gerrit/server/fixes/FixReplacementInterpreter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/fixes/FixReplacementInterpreter.java
rename to java/com/google/gerrit/server/fixes/FixReplacementInterpreter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/fixes/LineIdentifier.java b/java/com/google/gerrit/server/fixes/LineIdentifier.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/fixes/LineIdentifier.java
rename to java/com/google/gerrit/server/fixes/LineIdentifier.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/fixes/StringModifier.java b/java/com/google/gerrit/server/fixes/StringModifier.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/fixes/StringModifier.java
rename to java/com/google/gerrit/server/fixes/StringModifier.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AbandonOp.java b/java/com/google/gerrit/server/git/AbandonOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/AbandonOp.java
rename to java/com/google/gerrit/server/git/AbandonOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/AccountsSection.java b/java/com/google/gerrit/server/git/AccountsSection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/AccountsSection.java
rename to java/com/google/gerrit/server/git/AccountsSection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java b/java/com/google/gerrit/server/git/BanCommit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommit.java
rename to java/com/google/gerrit/server/git/BanCommit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommitResult.java b/java/com/google/gerrit/server/git/BanCommitResult.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/BanCommitResult.java
rename to java/com/google/gerrit/server/git/BanCommitResult.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/BranchOrderSection.java b/java/com/google/gerrit/server/git/BranchOrderSection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/BranchOrderSection.java
rename to java/com/google/gerrit/server/git/BranchOrderSection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeAlreadyMergedException.java b/java/com/google/gerrit/server/git/ChangeAlreadyMergedException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeAlreadyMergedException.java
rename to java/com/google/gerrit/server/git/ChangeAlreadyMergedException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMessageModifier.java b/java/com/google/gerrit/server/git/ChangeMessageModifier.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeMessageModifier.java
rename to java/com/google/gerrit/server/git/ChangeMessageModifier.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeReportFormatter.java b/java/com/google/gerrit/server/git/ChangeReportFormatter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeReportFormatter.java
rename to java/com/google/gerrit/server/git/ChangeReportFormatter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeSet.java b/java/com/google/gerrit/server/git/ChangeSet.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeSet.java
rename to java/com/google/gerrit/server/git/ChangeSet.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java b/java/com/google/gerrit/server/git/CodeReviewCommit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/CodeReviewCommit.java
rename to java/com/google/gerrit/server/git/CodeReviewCommit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ConfiguredMimeTypes.java b/java/com/google/gerrit/server/git/ConfiguredMimeTypes.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ConfiguredMimeTypes.java
rename to java/com/google/gerrit/server/git/ConfiguredMimeTypes.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultChangeReportFormatter.java b/java/com/google/gerrit/server/git/DefaultChangeReportFormatter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultChangeReportFormatter.java
rename to java/com/google/gerrit/server/git/DefaultChangeReportFormatter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultQueueOp.java b/java/com/google/gerrit/server/git/DefaultQueueOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultQueueOp.java
rename to java/com/google/gerrit/server/git/DefaultQueueOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/DestinationList.java b/java/com/google/gerrit/server/git/DestinationList.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/DestinationList.java
rename to java/com/google/gerrit/server/git/DestinationList.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/EmailMerge.java b/java/com/google/gerrit/server/git/EmailMerge.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/EmailMerge.java
rename to java/com/google/gerrit/server/git/EmailMerge.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java b/java/com/google/gerrit/server/git/GarbageCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollection.java
rename to java/com/google/gerrit/server/git/GarbageCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionLogFile.java b/java/com/google/gerrit/server/git/GarbageCollectionLogFile.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionLogFile.java
rename to java/com/google/gerrit/server/git/GarbageCollectionLogFile.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionModule.java b/java/com/google/gerrit/server/git/GarbageCollectionModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionModule.java
rename to java/com/google/gerrit/server/git/GarbageCollectionModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionQueue.java b/java/com/google/gerrit/server/git/GarbageCollectionQueue.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionQueue.java
rename to java/com/google/gerrit/server/git/GarbageCollectionQueue.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionRunner.java b/java/com/google/gerrit/server/git/GarbageCollectionRunner.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GarbageCollectionRunner.java
rename to java/com/google/gerrit/server/git/GarbageCollectionRunner.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GitModule.java b/java/com/google/gerrit/server/git/GitModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GitModule.java
rename to java/com/google/gerrit/server/git/GitModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GitModules.java b/java/com/google/gerrit/server/git/GitModules.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GitModules.java
rename to java/com/google/gerrit/server/git/GitModules.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GitRepositoryManager.java b/java/com/google/gerrit/server/git/GitRepositoryManager.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GitRepositoryManager.java
rename to java/com/google/gerrit/server/git/GitRepositoryManager.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GitRepositoryManagerModule.java b/java/com/google/gerrit/server/git/GitRepositoryManagerModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GitRepositoryManagerModule.java
rename to java/com/google/gerrit/server/git/GitRepositoryManagerModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GroupCollector.java b/java/com/google/gerrit/server/git/GroupCollector.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GroupCollector.java
rename to java/com/google/gerrit/server/git/GroupCollector.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/GroupList.java b/java/com/google/gerrit/server/git/GroupList.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/GroupList.java
rename to java/com/google/gerrit/server/git/GroupList.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/HackPushNegotiateHook.java b/java/com/google/gerrit/server/git/HackPushNegotiateHook.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/HackPushNegotiateHook.java
rename to java/com/google/gerrit/server/git/HackPushNegotiateHook.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/HookUtil.java b/java/com/google/gerrit/server/git/HookUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/HookUtil.java
rename to java/com/google/gerrit/server/git/HookUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/InMemoryInserter.java b/java/com/google/gerrit/server/git/InMemoryInserter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/InMemoryInserter.java
rename to java/com/google/gerrit/server/git/InMemoryInserter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/InsertedObject.java b/java/com/google/gerrit/server/git/InsertedObject.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/InsertedObject.java
rename to java/com/google/gerrit/server/git/InsertedObject.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/IntegrationException.java b/java/com/google/gerrit/server/git/IntegrationException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/IntegrationException.java
rename to java/com/google/gerrit/server/git/IntegrationException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LabelNormalizer.java b/java/com/google/gerrit/server/git/LabelNormalizer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/LabelNormalizer.java
rename to java/com/google/gerrit/server/git/LabelNormalizer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java b/java/com/google/gerrit/server/git/LargeObjectException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/LargeObjectException.java
rename to java/com/google/gerrit/server/git/LargeObjectException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java b/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
rename to java/com/google/gerrit/server/git/LocalDiskRepositoryManager.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LocalMergeSuperSetComputation.java b/java/com/google/gerrit/server/git/LocalMergeSuperSetComputation.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/LocalMergeSuperSetComputation.java
rename to java/com/google/gerrit/server/git/LocalMergeSuperSetComputation.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/LockFailureException.java b/java/com/google/gerrit/server/git/LockFailureException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/LockFailureException.java
rename to java/com/google/gerrit/server/git/LockFailureException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeIdenticalTreeException.java b/java/com/google/gerrit/server/git/MergeIdenticalTreeException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MergeIdenticalTreeException.java
rename to java/com/google/gerrit/server/git/MergeIdenticalTreeException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/java/com/google/gerrit/server/git/MergeOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
rename to java/com/google/gerrit/server/git/MergeOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOpRepoManager.java b/java/com/google/gerrit/server/git/MergeOpRepoManager.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOpRepoManager.java
rename to java/com/google/gerrit/server/git/MergeOpRepoManager.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java b/java/com/google/gerrit/server/git/MergeSorter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSorter.java
rename to java/com/google/gerrit/server/git/MergeSorter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSuperSet.java b/java/com/google/gerrit/server/git/MergeSuperSet.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSuperSet.java
rename to java/com/google/gerrit/server/git/MergeSuperSet.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSuperSetComputation.java b/java/com/google/gerrit/server/git/MergeSuperSetComputation.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MergeSuperSetComputation.java
rename to java/com/google/gerrit/server/git/MergeSuperSetComputation.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeTip.java b/java/com/google/gerrit/server/git/MergeTip.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MergeTip.java
rename to java/com/google/gerrit/server/git/MergeTip.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java b/java/com/google/gerrit/server/git/MergeUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MergeUtil.java
rename to java/com/google/gerrit/server/git/MergeUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergedByPushOp.java b/java/com/google/gerrit/server/git/MergedByPushOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MergedByPushOp.java
rename to java/com/google/gerrit/server/git/MergedByPushOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MetaDataUpdate.java b/java/com/google/gerrit/server/git/MetaDataUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MetaDataUpdate.java
rename to java/com/google/gerrit/server/git/MetaDataUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManager.java b/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManager.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManager.java
rename to java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManager.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java b/java/com/google/gerrit/server/git/MultiProgressMonitor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/MultiProgressMonitor.java
rename to java/com/google/gerrit/server/git/MultiProgressMonitor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java b/java/com/google/gerrit/server/git/NotesBranchUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/NotesBranchUtil.java
rename to java/com/google/gerrit/server/git/NotesBranchUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/NotifyConfig.java b/java/com/google/gerrit/server/git/NotifyConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/NotifyConfig.java
rename to java/com/google/gerrit/server/git/NotifyConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java b/java/com/google/gerrit/server/git/PerThreadRequestScope.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/PerThreadRequestScope.java
rename to java/com/google/gerrit/server/git/PerThreadRequestScope.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java b/java/com/google/gerrit/server/git/ProjectConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectConfig.java
rename to java/com/google/gerrit/server/git/ProjectConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectLevelConfig.java b/java/com/google/gerrit/server/git/ProjectLevelConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectLevelConfig.java
rename to java/com/google/gerrit/server/git/ProjectLevelConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectRunnable.java b/java/com/google/gerrit/server/git/ProjectRunnable.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ProjectRunnable.java
rename to java/com/google/gerrit/server/git/ProjectRunnable.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/QueryList.java b/java/com/google/gerrit/server/git/QueryList.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/QueryList.java
rename to java/com/google/gerrit/server/git/QueryList.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java b/java/com/google/gerrit/server/git/QueueProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java
rename to java/com/google/gerrit/server/git/QueueProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/RebaseSorter.java b/java/com/google/gerrit/server/git/RebaseSorter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/RebaseSorter.java
rename to java/com/google/gerrit/server/git/RebaseSorter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceivePackInitializer.java b/java/com/google/gerrit/server/git/ReceivePackInitializer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ReceivePackInitializer.java
rename to java/com/google/gerrit/server/git/ReceivePackInitializer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/RefCache.java b/java/com/google/gerrit/server/git/RefCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/RefCache.java
rename to java/com/google/gerrit/server/git/RefCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/RenameGroupOp.java b/java/com/google/gerrit/server/git/RenameGroupOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/RenameGroupOp.java
rename to java/com/google/gerrit/server/git/RenameGroupOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/RepoRefCache.java b/java/com/google/gerrit/server/git/RepoRefCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/RepoRefCache.java
rename to java/com/google/gerrit/server/git/RepoRefCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java b/java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java
rename to java/com/google/gerrit/server/git/RepositoryCaseMismatchException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReviewNoteMerger.java b/java/com/google/gerrit/server/git/ReviewNoteMerger.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ReviewNoteMerger.java
rename to java/com/google/gerrit/server/git/ReviewNoteMerger.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/SearchingChangeCacheImpl.java b/java/com/google/gerrit/server/git/SearchingChangeCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/SearchingChangeCacheImpl.java
rename to java/com/google/gerrit/server/git/SearchingChangeCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/SendEmailExecutor.java b/java/com/google/gerrit/server/git/SendEmailExecutor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/SendEmailExecutor.java
rename to java/com/google/gerrit/server/git/SendEmailExecutor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleException.java b/java/com/google/gerrit/server/git/SubmoduleException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleException.java
rename to java/com/google/gerrit/server/git/SubmoduleException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java b/java/com/google/gerrit/server/git/SubmoduleOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/SubmoduleOp.java
rename to java/com/google/gerrit/server/git/SubmoduleOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TabFile.java b/java/com/google/gerrit/server/git/TabFile.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/TabFile.java
rename to java/com/google/gerrit/server/git/TabFile.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TagCache.java b/java/com/google/gerrit/server/git/TagCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/TagCache.java
rename to java/com/google/gerrit/server/git/TagCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TagMatcher.java b/java/com/google/gerrit/server/git/TagMatcher.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/TagMatcher.java
rename to java/com/google/gerrit/server/git/TagMatcher.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TagSet.java b/java/com/google/gerrit/server/git/TagSet.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/TagSet.java
rename to java/com/google/gerrit/server/git/TagSet.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TagSetHolder.java b/java/com/google/gerrit/server/git/TagSetHolder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/TagSetHolder.java
rename to java/com/google/gerrit/server/git/TagSetHolder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TaskInfoFactory.java b/java/com/google/gerrit/server/git/TaskInfoFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/TaskInfoFactory.java
rename to java/com/google/gerrit/server/git/TaskInfoFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java b/java/com/google/gerrit/server/git/TransferConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/TransferConfig.java
rename to java/com/google/gerrit/server/git/TransferConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/UploadPackInitializer.java b/java/com/google/gerrit/server/git/UploadPackInitializer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/UploadPackInitializer.java
rename to java/com/google/gerrit/server/git/UploadPackInitializer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/UploadPackMetricsHook.java b/java/com/google/gerrit/server/git/UploadPackMetricsHook.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/UploadPackMetricsHook.java
rename to java/com/google/gerrit/server/git/UploadPackMetricsHook.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/UserConfigSections.java b/java/com/google/gerrit/server/git/UserConfigSections.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/UserConfigSections.java
rename to java/com/google/gerrit/server/git/UserConfigSections.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ValidationError.java b/java/com/google/gerrit/server/git/ValidationError.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/ValidationError.java
rename to java/com/google/gerrit/server/git/ValidationError.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java b/java/com/google/gerrit/server/git/VersionedMetaData.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/VersionedMetaData.java
rename to java/com/google/gerrit/server/git/VersionedMetaData.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java b/java/com/google/gerrit/server/git/VisibleRefFilter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/VisibleRefFilter.java
rename to java/com/google/gerrit/server/git/VisibleRefFilter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java b/java/com/google/gerrit/server/git/WorkQueue.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/WorkQueue.java
rename to java/com/google/gerrit/server/git/WorkQueue.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/AllRefsWatcher.java b/java/com/google/gerrit/server/git/receive/AllRefsWatcher.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/AllRefsWatcher.java
rename to java/com/google/gerrit/server/git/receive/AllRefsWatcher.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java b/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java
rename to java/com/google/gerrit/server/git/receive/AsyncReceiveCommits.java
diff --git a/java/com/google/gerrit/server/git/receive/BUILD b/java/com/google/gerrit/server/git/receive/BUILD
new file mode 100644
index 0000000..db7a0ba
--- /dev/null
+++ b/java/com/google/gerrit/server/git/receive/BUILD
@@ -0,0 +1,21 @@
+java_library(
+    name = "receive",
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//java/com/google/gerrit:server",
+        "//java/com/google/gerrit/common:annotations",
+        "//java/com/google/gerrit/common:server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/util/cli",
+        "//lib:args4j",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib/auto:auto-value",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+    ],
+)
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ChangeProgressOp.java b/java/com/google/gerrit/server/git/receive/ChangeProgressOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ChangeProgressOp.java
rename to java/com/google/gerrit/server/git/receive/ChangeProgressOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/LazyPostReceiveHookChain.java b/java/com/google/gerrit/server/git/receive/LazyPostReceiveHookChain.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/LazyPostReceiveHookChain.java
rename to java/com/google/gerrit/server/git/receive/LazyPostReceiveHookChain.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/MessageSender.java b/java/com/google/gerrit/server/git/receive/MessageSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/MessageSender.java
rename to java/com/google/gerrit/server/git/receive/MessageSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
rename to java/com/google/gerrit/server/git/receive/ReceiveCommits.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommitsAdvertiseRefsHook.java b/java/com/google/gerrit/server/git/receive/ReceiveCommitsAdvertiseRefsHook.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommitsAdvertiseRefsHook.java
rename to java/com/google/gerrit/server/git/receive/ReceiveCommitsAdvertiseRefsHook.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommitsExecutor.java b/java/com/google/gerrit/server/git/receive/ReceiveCommitsExecutor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommitsExecutor.java
rename to java/com/google/gerrit/server/git/receive/ReceiveCommitsExecutor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommitsExecutorModule.java b/java/com/google/gerrit/server/git/receive/ReceiveCommitsExecutorModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommitsExecutorModule.java
rename to java/com/google/gerrit/server/git/receive/ReceiveCommitsExecutorModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommitsModule.java b/java/com/google/gerrit/server/git/receive/ReceiveCommitsModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveCommitsModule.java
rename to java/com/google/gerrit/server/git/receive/ReceiveCommitsModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveConfig.java b/java/com/google/gerrit/server/git/receive/ReceiveConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveConfig.java
rename to java/com/google/gerrit/server/git/receive/ReceiveConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveConstants.java b/java/com/google/gerrit/server/git/receive/ReceiveConstants.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveConstants.java
rename to java/com/google/gerrit/server/git/receive/ReceiveConstants.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveRefFilter.java b/java/com/google/gerrit/server/git/receive/ReceiveRefFilter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReceiveRefFilter.java
rename to java/com/google/gerrit/server/git/receive/ReceiveRefFilter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/receive/ReplaceOp.java
rename to java/com/google/gerrit/server/git/receive/ReplaceOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java b/java/com/google/gerrit/server/git/strategy/CherryPick.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CherryPick.java
rename to java/com/google/gerrit/server/git/strategy/CherryPick.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CommitMergeStatus.java b/java/com/google/gerrit/server/git/strategy/CommitMergeStatus.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/CommitMergeStatus.java
rename to java/com/google/gerrit/server/git/strategy/CommitMergeStatus.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/FastForwardOnly.java b/java/com/google/gerrit/server/git/strategy/FastForwardOnly.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/FastForwardOnly.java
rename to java/com/google/gerrit/server/git/strategy/FastForwardOnly.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/FastForwardOp.java b/java/com/google/gerrit/server/git/strategy/FastForwardOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/FastForwardOp.java
rename to java/com/google/gerrit/server/git/strategy/FastForwardOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/ImplicitIntegrateOp.java b/java/com/google/gerrit/server/git/strategy/ImplicitIntegrateOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/ImplicitIntegrateOp.java
rename to java/com/google/gerrit/server/git/strategy/ImplicitIntegrateOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/MergeAlways.java b/java/com/google/gerrit/server/git/strategy/MergeAlways.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/MergeAlways.java
rename to java/com/google/gerrit/server/git/strategy/MergeAlways.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/MergeIfNecessary.java b/java/com/google/gerrit/server/git/strategy/MergeIfNecessary.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/MergeIfNecessary.java
rename to java/com/google/gerrit/server/git/strategy/MergeIfNecessary.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/MergeOneOp.java b/java/com/google/gerrit/server/git/strategy/MergeOneOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/MergeOneOp.java
rename to java/com/google/gerrit/server/git/strategy/MergeOneOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseAlways.java b/java/com/google/gerrit/server/git/strategy/RebaseAlways.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseAlways.java
rename to java/com/google/gerrit/server/git/strategy/RebaseAlways.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseIfNecessary.java b/java/com/google/gerrit/server/git/strategy/RebaseIfNecessary.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseIfNecessary.java
rename to java/com/google/gerrit/server/git/strategy/RebaseIfNecessary.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseSubmitStrategy.java b/java/com/google/gerrit/server/git/strategy/RebaseSubmitStrategy.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/RebaseSubmitStrategy.java
rename to java/com/google/gerrit/server/git/strategy/RebaseSubmitStrategy.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitDryRun.java b/java/com/google/gerrit/server/git/strategy/SubmitDryRun.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitDryRun.java
rename to java/com/google/gerrit/server/git/strategy/SubmitDryRun.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategy.java b/java/com/google/gerrit/server/git/strategy/SubmitStrategy.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategy.java
rename to java/com/google/gerrit/server/git/strategy/SubmitStrategy.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java b/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java
rename to java/com/google/gerrit/server/git/strategy/SubmitStrategyFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyListener.java b/java/com/google/gerrit/server/git/strategy/SubmitStrategyListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyListener.java
rename to java/com/google/gerrit/server/git/strategy/SubmitStrategyListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java b/java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java
rename to java/com/google/gerrit/server/git/strategy/SubmitStrategyOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/TestHelperOp.java b/java/com/google/gerrit/server/git/strategy/TestHelperOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/strategy/TestHelperOp.java
rename to java/com/google/gerrit/server/git/strategy/TestHelperOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/AccountValidator.java b/java/com/google/gerrit/server/git/validators/AccountValidator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/AccountValidator.java
rename to java/com/google/gerrit/server/git/validators/AccountValidator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationException.java b/java/com/google/gerrit/server/git/validators/CommitValidationException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationException.java
rename to java/com/google/gerrit/server/git/validators/CommitValidationException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationListener.java b/java/com/google/gerrit/server/git/validators/CommitValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationListener.java
rename to java/com/google/gerrit/server/git/validators/CommitValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationMessage.java b/java/com/google/gerrit/server/git/validators/CommitValidationMessage.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidationMessage.java
rename to java/com/google/gerrit/server/git/validators/CommitValidationMessage.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java b/java/com/google/gerrit/server/git/validators/CommitValidators.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/CommitValidators.java
rename to java/com/google/gerrit/server/git/validators/CommitValidators.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidationException.java b/java/com/google/gerrit/server/git/validators/MergeValidationException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidationException.java
rename to java/com/google/gerrit/server/git/validators/MergeValidationException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidationListener.java b/java/com/google/gerrit/server/git/validators/MergeValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidationListener.java
rename to java/com/google/gerrit/server/git/validators/MergeValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java b/java/com/google/gerrit/server/git/validators/MergeValidators.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/MergeValidators.java
rename to java/com/google/gerrit/server/git/validators/MergeValidators.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/OnSubmitValidationListener.java b/java/com/google/gerrit/server/git/validators/OnSubmitValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/OnSubmitValidationListener.java
rename to java/com/google/gerrit/server/git/validators/OnSubmitValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/OnSubmitValidators.java b/java/com/google/gerrit/server/git/validators/OnSubmitValidators.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/OnSubmitValidators.java
rename to java/com/google/gerrit/server/git/validators/OnSubmitValidators.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/RefOperationValidationException.java b/java/com/google/gerrit/server/git/validators/RefOperationValidationException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/RefOperationValidationException.java
rename to java/com/google/gerrit/server/git/validators/RefOperationValidationException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/RefOperationValidationListener.java b/java/com/google/gerrit/server/git/validators/RefOperationValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/RefOperationValidationListener.java
rename to java/com/google/gerrit/server/git/validators/RefOperationValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/RefOperationValidators.java b/java/com/google/gerrit/server/git/validators/RefOperationValidators.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/RefOperationValidators.java
rename to java/com/google/gerrit/server/git/validators/RefOperationValidators.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/UploadValidationException.java b/java/com/google/gerrit/server/git/validators/UploadValidationException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/UploadValidationException.java
rename to java/com/google/gerrit/server/git/validators/UploadValidationException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/UploadValidationListener.java b/java/com/google/gerrit/server/git/validators/UploadValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/UploadValidationListener.java
rename to java/com/google/gerrit/server/git/validators/UploadValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/UploadValidators.java b/java/com/google/gerrit/server/git/validators/UploadValidators.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/UploadValidators.java
rename to java/com/google/gerrit/server/git/validators/UploadValidators.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/validators/ValidationMessage.java b/java/com/google/gerrit/server/git/validators/ValidationMessage.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/git/validators/ValidationMessage.java
rename to java/com/google/gerrit/server/git/validators/ValidationMessage.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/AddMembers.java b/java/com/google/gerrit/server/group/AddMembers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/AddMembers.java
rename to java/com/google/gerrit/server/group/AddMembers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/AddSubgroups.java b/java/com/google/gerrit/server/group/AddSubgroups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/AddSubgroups.java
rename to java/com/google/gerrit/server/group/AddSubgroups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/CreateGroup.java b/java/com/google/gerrit/server/group/CreateGroup.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/CreateGroup.java
rename to java/com/google/gerrit/server/group/CreateGroup.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java b/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
rename to java/com/google/gerrit/server/group/DbGroupMemberAuditListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java b/java/com/google/gerrit/server/group/DeleteMembers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteMembers.java
rename to java/com/google/gerrit/server/group/DeleteMembers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteSubgroups.java b/java/com/google/gerrit/server/group/DeleteSubgroups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/DeleteSubgroups.java
rename to java/com/google/gerrit/server/group/DeleteSubgroups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetAuditLog.java b/java/com/google/gerrit/server/group/GetAuditLog.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GetAuditLog.java
rename to java/com/google/gerrit/server/group/GetAuditLog.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetDescription.java b/java/com/google/gerrit/server/group/GetDescription.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GetDescription.java
rename to java/com/google/gerrit/server/group/GetDescription.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetDetail.java b/java/com/google/gerrit/server/group/GetDetail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GetDetail.java
rename to java/com/google/gerrit/server/group/GetDetail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetGroup.java b/java/com/google/gerrit/server/group/GetGroup.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GetGroup.java
rename to java/com/google/gerrit/server/group/GetGroup.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetMember.java b/java/com/google/gerrit/server/group/GetMember.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GetMember.java
rename to java/com/google/gerrit/server/group/GetMember.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetName.java b/java/com/google/gerrit/server/group/GetName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GetName.java
rename to java/com/google/gerrit/server/group/GetName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetOptions.java b/java/com/google/gerrit/server/group/GetOptions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GetOptions.java
rename to java/com/google/gerrit/server/group/GetOptions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetOwner.java b/java/com/google/gerrit/server/group/GetOwner.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GetOwner.java
rename to java/com/google/gerrit/server/group/GetOwner.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GetSubgroup.java b/java/com/google/gerrit/server/group/GetSubgroup.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GetSubgroup.java
rename to java/com/google/gerrit/server/group/GetSubgroup.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupJson.java b/java/com/google/gerrit/server/group/GroupJson.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GroupJson.java
rename to java/com/google/gerrit/server/group/GroupJson.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupModule.java b/java/com/google/gerrit/server/group/GroupModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GroupModule.java
rename to java/com/google/gerrit/server/group/GroupModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupResource.java b/java/com/google/gerrit/server/group/GroupResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GroupResource.java
rename to java/com/google/gerrit/server/group/GroupResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsCollection.java b/java/com/google/gerrit/server/group/GroupsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/GroupsCollection.java
rename to java/com/google/gerrit/server/group/GroupsCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/Index.java b/java/com/google/gerrit/server/group/Index.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/Index.java
rename to java/com/google/gerrit/server/group/Index.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/InternalGroup.java b/java/com/google/gerrit/server/group/InternalGroup.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/InternalGroup.java
rename to java/com/google/gerrit/server/group/InternalGroup.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/InternalGroupDescription.java b/java/com/google/gerrit/server/group/InternalGroupDescription.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/InternalGroupDescription.java
rename to java/com/google/gerrit/server/group/InternalGroupDescription.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java b/java/com/google/gerrit/server/group/ListGroups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java
rename to java/com/google/gerrit/server/group/ListGroups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java b/java/com/google/gerrit/server/group/ListMembers.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/ListMembers.java
rename to java/com/google/gerrit/server/group/ListMembers.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListSubgroups.java b/java/com/google/gerrit/server/group/ListSubgroups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/ListSubgroups.java
rename to java/com/google/gerrit/server/group/ListSubgroups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/MemberResource.java b/java/com/google/gerrit/server/group/MemberResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/MemberResource.java
rename to java/com/google/gerrit/server/group/MemberResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/MembersCollection.java b/java/com/google/gerrit/server/group/MembersCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/MembersCollection.java
rename to java/com/google/gerrit/server/group/MembersCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/Module.java b/java/com/google/gerrit/server/group/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/Module.java
rename to java/com/google/gerrit/server/group/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutDescription.java b/java/com/google/gerrit/server/group/PutDescription.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/PutDescription.java
rename to java/com/google/gerrit/server/group/PutDescription.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutGroup.java b/java/com/google/gerrit/server/group/PutGroup.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/PutGroup.java
rename to java/com/google/gerrit/server/group/PutGroup.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutName.java b/java/com/google/gerrit/server/group/PutName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/PutName.java
rename to java/com/google/gerrit/server/group/PutName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOptions.java b/java/com/google/gerrit/server/group/PutOptions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/PutOptions.java
rename to java/com/google/gerrit/server/group/PutOptions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/PutOwner.java b/java/com/google/gerrit/server/group/PutOwner.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/PutOwner.java
rename to java/com/google/gerrit/server/group/PutOwner.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java b/java/com/google/gerrit/server/group/QueryGroups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java
rename to java/com/google/gerrit/server/group/QueryGroups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ServerInitiated.java b/java/com/google/gerrit/server/group/ServerInitiated.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/ServerInitiated.java
rename to java/com/google/gerrit/server/group/ServerInitiated.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/SubgroupResource.java b/java/com/google/gerrit/server/group/SubgroupResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/SubgroupResource.java
rename to java/com/google/gerrit/server/group/SubgroupResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/SubgroupsCollection.java b/java/com/google/gerrit/server/group/SubgroupsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/SubgroupsCollection.java
rename to java/com/google/gerrit/server/group/SubgroupsCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/SystemGroupBackend.java b/java/com/google/gerrit/server/group/SystemGroupBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/SystemGroupBackend.java
rename to java/com/google/gerrit/server/group/SystemGroupBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/UserInitiated.java b/java/com/google/gerrit/server/group/UserInitiated.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/UserInitiated.java
rename to java/com/google/gerrit/server/group/UserInitiated.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/db/Groups.java b/java/com/google/gerrit/server/group/db/Groups.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/db/Groups.java
rename to java/com/google/gerrit/server/group/db/Groups.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/db/GroupsUpdate.java b/java/com/google/gerrit/server/group/db/GroupsUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/group/db/GroupsUpdate.java
rename to java/com/google/gerrit/server/group/db/GroupsUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/DummyIndexModule.java b/java/com/google/gerrit/server/index/DummyIndexModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/DummyIndexModule.java
rename to java/com/google/gerrit/server/index/DummyIndexModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/GerritIndexStatus.java b/java/com/google/gerrit/server/index/GerritIndexStatus.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/GerritIndexStatus.java
rename to java/com/google/gerrit/server/index/GerritIndexStatus.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexExecutor.java b/java/com/google/gerrit/server/index/IndexExecutor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IndexExecutor.java
rename to java/com/google/gerrit/server/index/IndexExecutor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java b/java/com/google/gerrit/server/index/IndexModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IndexModule.java
rename to java/com/google/gerrit/server/index/IndexModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/IndexUtils.java b/java/com/google/gerrit/server/index/IndexUtils.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/IndexUtils.java
rename to java/com/google/gerrit/server/index/IndexUtils.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java b/java/com/google/gerrit/server/index/OnlineReindexer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineReindexer.java
rename to java/com/google/gerrit/server/index/OnlineReindexer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineUpgradeListener.java b/java/com/google/gerrit/server/index/OnlineUpgradeListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineUpgradeListener.java
rename to java/com/google/gerrit/server/index/OnlineUpgradeListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineUpgrader.java b/java/com/google/gerrit/server/index/OnlineUpgrader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/OnlineUpgrader.java
rename to java/com/google/gerrit/server/index/OnlineUpgrader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/RefState.java b/java/com/google/gerrit/server/index/RefState.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/RefState.java
rename to java/com/google/gerrit/server/index/RefState.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ReindexerAlreadyRunningException.java b/java/com/google/gerrit/server/index/ReindexerAlreadyRunningException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/ReindexerAlreadyRunningException.java
rename to java/com/google/gerrit/server/index/ReindexerAlreadyRunningException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/SingleVersionModule.java b/java/com/google/gerrit/server/index/SingleVersionModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/SingleVersionModule.java
rename to java/com/google/gerrit/server/index/SingleVersionModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/VersionManager.java b/java/com/google/gerrit/server/index/VersionManager.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/VersionManager.java
rename to java/com/google/gerrit/server/index/VersionManager.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java b/java/com/google/gerrit/server/index/account/AccountField.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountField.java
rename to java/com/google/gerrit/server/index/account/AccountField.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndex.java b/java/com/google/gerrit/server/index/account/AccountIndex.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndex.java
rename to java/com/google/gerrit/server/index/account/AccountIndex.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java b/java/com/google/gerrit/server/index/account/AccountIndexCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexCollection.java
rename to java/com/google/gerrit/server/index/account/AccountIndexCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexDefinition.java b/java/com/google/gerrit/server/index/account/AccountIndexDefinition.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexDefinition.java
rename to java/com/google/gerrit/server/index/account/AccountIndexDefinition.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexRewriter.java b/java/com/google/gerrit/server/index/account/AccountIndexRewriter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexRewriter.java
rename to java/com/google/gerrit/server/index/account/AccountIndexRewriter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexer.java b/java/com/google/gerrit/server/index/account/AccountIndexer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexer.java
rename to java/com/google/gerrit/server/index/account/AccountIndexer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexerImpl.java b/java/com/google/gerrit/server/index/account/AccountIndexerImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountIndexerImpl.java
rename to java/com/google/gerrit/server/index/account/AccountIndexerImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java b/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java
rename to java/com/google/gerrit/server/index/account/AccountSchemaDefinitions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java b/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/AllAccountsIndexer.java
rename to java/com/google/gerrit/server/index/account/AllAccountsIndexer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/account/IndexedAccountQuery.java b/java/com/google/gerrit/server/index/account/IndexedAccountQuery.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/account/IndexedAccountQuery.java
rename to java/com/google/gerrit/server/index/account/IndexedAccountQuery.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java b/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
rename to java/com/google/gerrit/server/index/change/AllChangesIndexer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java b/java/com/google/gerrit/server/index/change/ChangeField.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java
rename to java/com/google/gerrit/server/index/change/ChangeField.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndex.java b/java/com/google/gerrit/server/index/change/ChangeIndex.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndex.java
rename to java/com/google/gerrit/server/index/change/ChangeIndex.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java b/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexCollection.java
rename to java/com/google/gerrit/server/index/change/ChangeIndexCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexDefinition.java b/java/com/google/gerrit/server/index/change/ChangeIndexDefinition.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexDefinition.java
rename to java/com/google/gerrit/server/index/change/ChangeIndexDefinition.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexRewriter.java b/java/com/google/gerrit/server/index/change/ChangeIndexRewriter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexRewriter.java
rename to java/com/google/gerrit/server/index/change/ChangeIndexRewriter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexer.java b/java/com/google/gerrit/server/index/change/ChangeIndexer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeIndexer.java
rename to java/com/google/gerrit/server/index/change/ChangeIndexer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java b/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java
rename to java/com/google/gerrit/server/index/change/ChangeSchemaDefinitions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/DummyChangeIndex.java b/java/com/google/gerrit/server/index/change/DummyChangeIndex.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/DummyChangeIndex.java
rename to java/com/google/gerrit/server/index/change/DummyChangeIndex.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/IndexedChangeQuery.java b/java/com/google/gerrit/server/index/change/IndexedChangeQuery.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/IndexedChangeQuery.java
rename to java/com/google/gerrit/server/index/change/IndexedChangeQuery.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterRefUpdate.java b/java/com/google/gerrit/server/index/change/ReindexAfterRefUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/ReindexAfterRefUpdate.java
rename to java/com/google/gerrit/server/index/change/ReindexAfterRefUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/change/StalenessChecker.java b/java/com/google/gerrit/server/index/change/StalenessChecker.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/change/StalenessChecker.java
rename to java/com/google/gerrit/server/index/change/StalenessChecker.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java b/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/AllGroupsIndexer.java
rename to java/com/google/gerrit/server/index/group/AllGroupsIndexer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java b/java/com/google/gerrit/server/index/group/GroupField.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupField.java
rename to java/com/google/gerrit/server/index/group/GroupField.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java b/java/com/google/gerrit/server/index/group/GroupIndex.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndex.java
rename to java/com/google/gerrit/server/index/group/GroupIndex.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexCollection.java b/java/com/google/gerrit/server/index/group/GroupIndexCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexCollection.java
rename to java/com/google/gerrit/server/index/group/GroupIndexCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexDefinition.java b/java/com/google/gerrit/server/index/group/GroupIndexDefinition.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexDefinition.java
rename to java/com/google/gerrit/server/index/group/GroupIndexDefinition.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexRewriter.java b/java/com/google/gerrit/server/index/group/GroupIndexRewriter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexRewriter.java
rename to java/com/google/gerrit/server/index/group/GroupIndexRewriter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexer.java b/java/com/google/gerrit/server/index/group/GroupIndexer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexer.java
rename to java/com/google/gerrit/server/index/group/GroupIndexer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexerImpl.java b/java/com/google/gerrit/server/index/group/GroupIndexerImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupIndexerImpl.java
rename to java/com/google/gerrit/server/index/group/GroupIndexerImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java b/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java
rename to java/com/google/gerrit/server/index/group/GroupSchemaDefinitions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/group/IndexedGroupQuery.java b/java/com/google/gerrit/server/index/group/IndexedGroupQuery.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/group/IndexedGroupQuery.java
rename to java/com/google/gerrit/server/index/group/IndexedGroupQuery.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/AllProjectsIndexer.java b/java/com/google/gerrit/server/index/project/AllProjectsIndexer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/AllProjectsIndexer.java
rename to java/com/google/gerrit/server/index/project/AllProjectsIndexer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/IndexedProjectQuery.java b/java/com/google/gerrit/server/index/project/IndexedProjectQuery.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/IndexedProjectQuery.java
rename to java/com/google/gerrit/server/index/project/IndexedProjectQuery.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectField.java b/java/com/google/gerrit/server/index/project/ProjectField.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectField.java
rename to java/com/google/gerrit/server/index/project/ProjectField.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndex.java b/java/com/google/gerrit/server/index/project/ProjectIndex.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndex.java
rename to java/com/google/gerrit/server/index/project/ProjectIndex.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexCollection.java b/java/com/google/gerrit/server/index/project/ProjectIndexCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexCollection.java
rename to java/com/google/gerrit/server/index/project/ProjectIndexCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexDefinition.java b/java/com/google/gerrit/server/index/project/ProjectIndexDefinition.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexDefinition.java
rename to java/com/google/gerrit/server/index/project/ProjectIndexDefinition.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexRewriter.java b/java/com/google/gerrit/server/index/project/ProjectIndexRewriter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexRewriter.java
rename to java/com/google/gerrit/server/index/project/ProjectIndexRewriter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexer.java b/java/com/google/gerrit/server/index/project/ProjectIndexer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexer.java
rename to java/com/google/gerrit/server/index/project/ProjectIndexer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexerImpl.java b/java/com/google/gerrit/server/index/project/ProjectIndexerImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectIndexerImpl.java
rename to java/com/google/gerrit/server/index/project/ProjectIndexerImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectSchemaDefinitions.java b/java/com/google/gerrit/server/index/project/ProjectSchemaDefinitions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/index/project/ProjectSchemaDefinitions.java
rename to java/com/google/gerrit/server/index/project/ProjectSchemaDefinitions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java b/java/com/google/gerrit/server/ioutil/BasicSerialization.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ioutil/BasicSerialization.java
rename to java/com/google/gerrit/server/ioutil/BasicSerialization.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java b/java/com/google/gerrit/server/ioutil/ColumnFormatter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ioutil/ColumnFormatter.java
rename to java/com/google/gerrit/server/ioutil/ColumnFormatter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java b/java/com/google/gerrit/server/mail/Address.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/Address.java
rename to java/com/google/gerrit/server/mail/Address.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailModule.java b/java/com/google/gerrit/server/mail/EmailModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailModule.java
rename to java/com/google/gerrit/server/mail/EmailModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailSettings.java b/java/com/google/gerrit/server/mail/EmailSettings.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailSettings.java
rename to java/com/google/gerrit/server/mail/EmailSettings.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailTokenVerifier.java b/java/com/google/gerrit/server/mail/EmailTokenVerifier.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailTokenVerifier.java
rename to java/com/google/gerrit/server/mail/EmailTokenVerifier.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/Encryption.java b/java/com/google/gerrit/server/mail/Encryption.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/Encryption.java
rename to java/com/google/gerrit/server/mail/Encryption.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/ListMailFilter.java b/java/com/google/gerrit/server/mail/ListMailFilter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/ListMailFilter.java
rename to java/com/google/gerrit/server/mail/ListMailFilter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailFilter.java b/java/com/google/gerrit/server/mail/MailFilter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/MailFilter.java
rename to java/com/google/gerrit/server/mail/MailFilter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java b/java/com/google/gerrit/server/mail/MailUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/MailUtil.java
rename to java/com/google/gerrit/server/mail/MailUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/MetadataName.java b/java/com/google/gerrit/server/mail/MetadataName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/MetadataName.java
rename to java/com/google/gerrit/server/mail/MetadataName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/SignedTokenEmailTokenVerifier.java b/java/com/google/gerrit/server/mail/SignedTokenEmailTokenVerifier.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/SignedTokenEmailTokenVerifier.java
rename to java/com/google/gerrit/server/mail/SignedTokenEmailTokenVerifier.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/HtmlParser.java b/java/com/google/gerrit/server/mail/receive/HtmlParser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/HtmlParser.java
rename to java/com/google/gerrit/server/mail/receive/HtmlParser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/ImapMailReceiver.java b/java/com/google/gerrit/server/mail/receive/ImapMailReceiver.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/ImapMailReceiver.java
rename to java/com/google/gerrit/server/mail/receive/ImapMailReceiver.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailComment.java b/java/com/google/gerrit/server/mail/receive/MailComment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailComment.java
rename to java/com/google/gerrit/server/mail/receive/MailComment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailMessage.java b/java/com/google/gerrit/server/mail/receive/MailMessage.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailMessage.java
rename to java/com/google/gerrit/server/mail/receive/MailMessage.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailMetadata.java b/java/com/google/gerrit/server/mail/receive/MailMetadata.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailMetadata.java
rename to java/com/google/gerrit/server/mail/receive/MailMetadata.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailParsingException.java b/java/com/google/gerrit/server/mail/receive/MailParsingException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailParsingException.java
rename to java/com/google/gerrit/server/mail/receive/MailParsingException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/java/com/google/gerrit/server/mail/receive/MailProcessor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailProcessor.java
rename to java/com/google/gerrit/server/mail/receive/MailProcessor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailReceiver.java b/java/com/google/gerrit/server/mail/receive/MailReceiver.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailReceiver.java
rename to java/com/google/gerrit/server/mail/receive/MailReceiver.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailTransferException.java b/java/com/google/gerrit/server/mail/receive/MailTransferException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MailTransferException.java
rename to java/com/google/gerrit/server/mail/receive/MailTransferException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MetadataParser.java b/java/com/google/gerrit/server/mail/receive/MetadataParser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/MetadataParser.java
rename to java/com/google/gerrit/server/mail/receive/MetadataParser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/ParserUtil.java b/java/com/google/gerrit/server/mail/receive/ParserUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/ParserUtil.java
rename to java/com/google/gerrit/server/mail/receive/ParserUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/Pop3MailReceiver.java b/java/com/google/gerrit/server/mail/receive/Pop3MailReceiver.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/Pop3MailReceiver.java
rename to java/com/google/gerrit/server/mail/receive/Pop3MailReceiver.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/Protocol.java b/java/com/google/gerrit/server/mail/receive/Protocol.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/Protocol.java
rename to java/com/google/gerrit/server/mail/receive/Protocol.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java b/java/com/google/gerrit/server/mail/receive/RawMailParser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/RawMailParser.java
rename to java/com/google/gerrit/server/mail/receive/RawMailParser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/TextParser.java b/java/com/google/gerrit/server/mail/receive/TextParser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/receive/TextParser.java
rename to java/com/google/gerrit/server/mail/receive/TextParser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/AbandonedSender.java b/java/com/google/gerrit/server/mail/send/AbandonedSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/AbandonedSender.java
rename to java/com/google/gerrit/server/mail/send/AbandonedSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/AddKeySender.java b/java/com/google/gerrit/server/mail/send/AddKeySender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/AddKeySender.java
rename to java/com/google/gerrit/server/mail/send/AddKeySender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/AddReviewerSender.java b/java/com/google/gerrit/server/mail/send/AddReviewerSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/AddReviewerSender.java
rename to java/com/google/gerrit/server/mail/send/AddReviewerSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java b/java/com/google/gerrit/server/mail/send/ChangeEmail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ChangeEmail.java
rename to java/com/google/gerrit/server/mail/send/ChangeEmail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentFormatter.java b/java/com/google/gerrit/server/mail/send/CommentFormatter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentFormatter.java
rename to java/com/google/gerrit/server/mail/send/CommentFormatter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java b/java/com/google/gerrit/server/mail/send/CommentSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CommentSender.java
rename to java/com/google/gerrit/server/mail/send/CommentSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CreateChangeSender.java b/java/com/google/gerrit/server/mail/send/CreateChangeSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/CreateChangeSender.java
rename to java/com/google/gerrit/server/mail/send/CreateChangeSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/DeleteReviewerSender.java b/java/com/google/gerrit/server/mail/send/DeleteReviewerSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/DeleteReviewerSender.java
rename to java/com/google/gerrit/server/mail/send/DeleteReviewerSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/DeleteVoteSender.java b/java/com/google/gerrit/server/mail/send/DeleteVoteSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/DeleteVoteSender.java
rename to java/com/google/gerrit/server/mail/send/DeleteVoteSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailArguments.java b/java/com/google/gerrit/server/mail/send/EmailArguments.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailArguments.java
rename to java/com/google/gerrit/server/mail/send/EmailArguments.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java b/java/com/google/gerrit/server/mail/send/EmailHeader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailHeader.java
rename to java/com/google/gerrit/server/mail/send/EmailHeader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailSender.java b/java/com/google/gerrit/server/mail/send/EmailSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/EmailSender.java
rename to java/com/google/gerrit/server/mail/send/EmailSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGenerator.java b/java/com/google/gerrit/server/mail/send/FromAddressGenerator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGenerator.java
rename to java/com/google/gerrit/server/mail/send/FromAddressGenerator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java b/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java
rename to java/com/google/gerrit/server/mail/send/FromAddressGeneratorProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MailSoyTofuProvider.java b/java/com/google/gerrit/server/mail/send/MailSoyTofuProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MailSoyTofuProvider.java
rename to java/com/google/gerrit/server/mail/send/MailSoyTofuProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MailTemplates.java b/java/com/google/gerrit/server/mail/send/MailTemplates.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MailTemplates.java
rename to java/com/google/gerrit/server/mail/send/MailTemplates.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MergedSender.java b/java/com/google/gerrit/server/mail/send/MergedSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/MergedSender.java
rename to java/com/google/gerrit/server/mail/send/MergedSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/NewChangeSender.java b/java/com/google/gerrit/server/mail/send/NewChangeSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/NewChangeSender.java
rename to java/com/google/gerrit/server/mail/send/NewChangeSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/NotificationEmail.java b/java/com/google/gerrit/server/mail/send/NotificationEmail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/NotificationEmail.java
rename to java/com/google/gerrit/server/mail/send/NotificationEmail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java b/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmail.java
rename to java/com/google/gerrit/server/mail/send/OutgoingEmail.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmailValidator.java b/java/com/google/gerrit/server/mail/send/OutgoingEmailValidator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/OutgoingEmailValidator.java
rename to java/com/google/gerrit/server/mail/send/OutgoingEmailValidator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java b/java/com/google/gerrit/server/mail/send/ProjectWatch.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ProjectWatch.java
rename to java/com/google/gerrit/server/mail/send/ProjectWatch.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java b/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
rename to java/com/google/gerrit/server/mail/send/RegisterNewEmailSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java b/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java
rename to java/com/google/gerrit/server/mail/send/ReplacePatchSetSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplyToChangeSender.java b/java/com/google/gerrit/server/mail/send/ReplyToChangeSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/ReplyToChangeSender.java
rename to java/com/google/gerrit/server/mail/send/ReplyToChangeSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/RestoredSender.java b/java/com/google/gerrit/server/mail/send/RestoredSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/RestoredSender.java
rename to java/com/google/gerrit/server/mail/send/RestoredSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/RevertedSender.java b/java/com/google/gerrit/server/mail/send/RevertedSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/RevertedSender.java
rename to java/com/google/gerrit/server/mail/send/RevertedSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SetAssigneeSender.java b/java/com/google/gerrit/server/mail/send/SetAssigneeSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SetAssigneeSender.java
rename to java/com/google/gerrit/server/mail/send/SetAssigneeSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java b/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mail/send/SmtpEmailSender.java
rename to java/com/google/gerrit/server/mail/send/SmtpEmailSender.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mime/DefaultFileExtensionRegistry.java b/java/com/google/gerrit/server/mime/DefaultFileExtensionRegistry.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mime/DefaultFileExtensionRegistry.java
rename to java/com/google/gerrit/server/mime/DefaultFileExtensionRegistry.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mime/FileTypeRegistry.java b/java/com/google/gerrit/server/mime/FileTypeRegistry.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mime/FileTypeRegistry.java
rename to java/com/google/gerrit/server/mime/FileTypeRegistry.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtil2Module.java b/java/com/google/gerrit/server/mime/MimeUtil2Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtil2Module.java
rename to java/com/google/gerrit/server/mime/MimeUtil2Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java b/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java
rename to java/com/google/gerrit/server/mime/MimeUtilFileTypeRegistry.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/AbstractChangeNotes.java b/java/com/google/gerrit/server/notedb/AbstractChangeNotes.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/AbstractChangeNotes.java
rename to java/com/google/gerrit/server/notedb/AbstractChangeNotes.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java b/java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java
rename to java/com/google/gerrit/server/notedb/AbstractChangeUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java b/java/com/google/gerrit/server/notedb/ChangeBundle.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundle.java
rename to java/com/google/gerrit/server/notedb/ChangeBundle.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundleReader.java b/java/com/google/gerrit/server/notedb/ChangeBundleReader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeBundleReader.java
rename to java/com/google/gerrit/server/notedb/ChangeBundleReader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeDraftUpdate.java b/java/com/google/gerrit/server/notedb/ChangeDraftUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeDraftUpdate.java
rename to java/com/google/gerrit/server/notedb/ChangeDraftUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNoteUtil.java b/java/com/google/gerrit/server/notedb/ChangeNoteUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNoteUtil.java
rename to java/com/google/gerrit/server/notedb/ChangeNoteUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java b/java/com/google/gerrit/server/notedb/ChangeNotes.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotes.java
rename to java/com/google/gerrit/server/notedb/ChangeNotes.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesCache.java b/java/com/google/gerrit/server/notedb/ChangeNotesCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesCache.java
rename to java/com/google/gerrit/server/notedb/ChangeNotesCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java b/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesCommit.java
rename to java/com/google/gerrit/server/notedb/ChangeNotesCommit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java b/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesParser.java
rename to java/com/google/gerrit/server/notedb/ChangeNotesParser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesState.java b/java/com/google/gerrit/server/notedb/ChangeNotesState.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeNotesState.java
rename to java/com/google/gerrit/server/notedb/ChangeNotesState.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRevisionNote.java b/java/com/google/gerrit/server/notedb/ChangeRevisionNote.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeRevisionNote.java
rename to java/com/google/gerrit/server/notedb/ChangeRevisionNote.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java b/java/com/google/gerrit/server/notedb/ChangeUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ChangeUpdate.java
rename to java/com/google/gerrit/server/notedb/ChangeUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentTimestampAdapter.java b/java/com/google/gerrit/server/notedb/CommentTimestampAdapter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/CommentTimestampAdapter.java
rename to java/com/google/gerrit/server/notedb/CommentTimestampAdapter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java b/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java
rename to java/com/google/gerrit/server/notedb/DeleteCommentRewriter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java b/java/com/google/gerrit/server/notedb/DraftCommentNotes.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/DraftCommentNotes.java
rename to java/com/google/gerrit/server/notedb/DraftCommentNotes.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/GwtormChangeBundleReader.java b/java/com/google/gerrit/server/notedb/GwtormChangeBundleReader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/GwtormChangeBundleReader.java
rename to java/com/google/gerrit/server/notedb/GwtormChangeBundleReader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/MutableNotesMigration.java b/java/com/google/gerrit/server/notedb/MutableNotesMigration.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/MutableNotesMigration.java
rename to java/com/google/gerrit/server/notedb/MutableNotesMigration.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbChangeState.java b/java/com/google/gerrit/server/notedb/NoteDbChangeState.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbChangeState.java
rename to java/com/google/gerrit/server/notedb/NoteDbChangeState.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbMetrics.java b/java/com/google/gerrit/server/notedb/NoteDbMetrics.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbMetrics.java
rename to java/com/google/gerrit/server/notedb/NoteDbMetrics.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbModule.java b/java/com/google/gerrit/server/notedb/NoteDbModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbModule.java
rename to java/com/google/gerrit/server/notedb/NoteDbModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbRewriter.java b/java/com/google/gerrit/server/notedb/NoteDbRewriter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbRewriter.java
rename to java/com/google/gerrit/server/notedb/NoteDbRewriter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbTable.java b/java/com/google/gerrit/server/notedb/NoteDbTable.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbTable.java
rename to java/com/google/gerrit/server/notedb/NoteDbTable.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java b/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
rename to java/com/google/gerrit/server/notedb/NoteDbUpdateManager.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java b/java/com/google/gerrit/server/notedb/NotesMigration.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigration.java
rename to java/com/google/gerrit/server/notedb/NotesMigration.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigrationState.java b/java/com/google/gerrit/server/notedb/NotesMigrationState.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/NotesMigrationState.java
rename to java/com/google/gerrit/server/notedb/NotesMigrationState.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/PatchSetState.java b/java/com/google/gerrit/server/notedb/PatchSetState.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/PatchSetState.java
rename to java/com/google/gerrit/server/notedb/PatchSetState.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/PrimaryStorageMigrator.java b/java/com/google/gerrit/server/notedb/PrimaryStorageMigrator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/PrimaryStorageMigrator.java
rename to java/com/google/gerrit/server/notedb/PrimaryStorageMigrator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RepoSequence.java b/java/com/google/gerrit/server/notedb/RepoSequence.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/RepoSequence.java
rename to java/com/google/gerrit/server/notedb/RepoSequence.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/ReviewerStateInternal.java b/java/com/google/gerrit/server/notedb/ReviewerStateInternal.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/ReviewerStateInternal.java
rename to java/com/google/gerrit/server/notedb/ReviewerStateInternal.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNote.java b/java/com/google/gerrit/server/notedb/RevisionNote.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNote.java
rename to java/com/google/gerrit/server/notedb/RevisionNote.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteBuilder.java b/java/com/google/gerrit/server/notedb/RevisionNoteBuilder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteBuilder.java
rename to java/com/google/gerrit/server/notedb/RevisionNoteBuilder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteData.java b/java/com/google/gerrit/server/notedb/RevisionNoteData.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteData.java
rename to java/com/google/gerrit/server/notedb/RevisionNoteData.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteMap.java b/java/com/google/gerrit/server/notedb/RevisionNoteMap.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/RevisionNoteMap.java
rename to java/com/google/gerrit/server/notedb/RevisionNoteMap.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentNotes.java b/java/com/google/gerrit/server/notedb/RobotCommentNotes.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentNotes.java
rename to java/com/google/gerrit/server/notedb/RobotCommentNotes.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentUpdate.java b/java/com/google/gerrit/server/notedb/RobotCommentUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentUpdate.java
rename to java/com/google/gerrit/server/notedb/RobotCommentUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNote.java b/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNote.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNote.java
rename to java/com/google/gerrit/server/notedb/RobotCommentsRevisionNote.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNoteData.java b/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNoteData.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/RobotCommentsRevisionNoteData.java
rename to java/com/google/gerrit/server/notedb/RobotCommentsRevisionNoteData.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/TestChangeRebuilderWrapper.java b/java/com/google/gerrit/server/notedb/TestChangeRebuilderWrapper.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/TestChangeRebuilderWrapper.java
rename to java/com/google/gerrit/server/notedb/TestChangeRebuilderWrapper.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/AbortUpdateException.java b/java/com/google/gerrit/server/notedb/rebuild/AbortUpdateException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/AbortUpdateException.java
rename to java/com/google/gerrit/server/notedb/rebuild/AbortUpdateException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ApprovalEvent.java b/java/com/google/gerrit/server/notedb/rebuild/ApprovalEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ApprovalEvent.java
rename to java/com/google/gerrit/server/notedb/rebuild/ApprovalEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeMessageEvent.java b/java/com/google/gerrit/server/notedb/rebuild/ChangeMessageEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeMessageEvent.java
rename to java/com/google/gerrit/server/notedb/rebuild/ChangeMessageEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilder.java b/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilder.java
rename to java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java b/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java
rename to java/com/google/gerrit/server/notedb/rebuild/ChangeRebuilderImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/CommentEvent.java b/java/com/google/gerrit/server/notedb/rebuild/CommentEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/CommentEvent.java
rename to java/com/google/gerrit/server/notedb/rebuild/CommentEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java b/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java
rename to java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateRuntimeException.java b/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateRuntimeException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateRuntimeException.java
rename to java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateRuntimeException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/CreateChangeEvent.java b/java/com/google/gerrit/server/notedb/rebuild/CreateChangeEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/CreateChangeEvent.java
rename to java/com/google/gerrit/server/notedb/rebuild/CreateChangeEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java b/java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java
rename to java/com/google/gerrit/server/notedb/rebuild/DraftCommentEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/Event.java b/java/com/google/gerrit/server/notedb/rebuild/Event.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/Event.java
rename to java/com/google/gerrit/server/notedb/rebuild/Event.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/EventList.java b/java/com/google/gerrit/server/notedb/rebuild/EventList.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/EventList.java
rename to java/com/google/gerrit/server/notedb/rebuild/EventList.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/EventSorter.java b/java/com/google/gerrit/server/notedb/rebuild/EventSorter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/EventSorter.java
rename to java/com/google/gerrit/server/notedb/rebuild/EventSorter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/FinalUpdatesEvent.java b/java/com/google/gerrit/server/notedb/rebuild/FinalUpdatesEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/FinalUpdatesEvent.java
rename to java/com/google/gerrit/server/notedb/rebuild/FinalUpdatesEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/HashtagsEvent.java b/java/com/google/gerrit/server/notedb/rebuild/HashtagsEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/HashtagsEvent.java
rename to java/com/google/gerrit/server/notedb/rebuild/HashtagsEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/MigrationException.java b/java/com/google/gerrit/server/notedb/rebuild/MigrationException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/MigrationException.java
rename to java/com/google/gerrit/server/notedb/rebuild/MigrationException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
rename to java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NotesMigrationStateListener.java b/java/com/google/gerrit/server/notedb/rebuild/NotesMigrationStateListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/NotesMigrationStateListener.java
rename to java/com/google/gerrit/server/notedb/rebuild/NotesMigrationStateListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/OnlineNoteDbMigrator.java b/java/com/google/gerrit/server/notedb/rebuild/OnlineNoteDbMigrator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/OnlineNoteDbMigrator.java
rename to java/com/google/gerrit/server/notedb/rebuild/OnlineNoteDbMigrator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/PatchSetEvent.java b/java/com/google/gerrit/server/notedb/rebuild/PatchSetEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/PatchSetEvent.java
rename to java/com/google/gerrit/server/notedb/rebuild/PatchSetEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ReviewerEvent.java b/java/com/google/gerrit/server/notedb/rebuild/ReviewerEvent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ReviewerEvent.java
rename to java/com/google/gerrit/server/notedb/rebuild/ReviewerEvent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/AutoMerger.java b/java/com/google/gerrit/server/patch/AutoMerger.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/AutoMerger.java
rename to java/com/google/gerrit/server/patch/AutoMerger.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/CharText.java b/java/com/google/gerrit/server/patch/CharText.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/CharText.java
rename to java/com/google/gerrit/server/patch/CharText.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/CharTextComparator.java b/java/com/google/gerrit/server/patch/CharTextComparator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/CharTextComparator.java
rename to java/com/google/gerrit/server/patch/CharTextComparator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/ComparisonType.java b/java/com/google/gerrit/server/patch/ComparisonType.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/ComparisonType.java
rename to java/com/google/gerrit/server/patch/ComparisonType.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffExecutor.java b/java/com/google/gerrit/server/patch/DiffExecutor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffExecutor.java
rename to java/com/google/gerrit/server/patch/DiffExecutor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffExecutorModule.java b/java/com/google/gerrit/server/patch/DiffExecutorModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffExecutorModule.java
rename to java/com/google/gerrit/server/patch/DiffExecutorModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummary.java b/java/com/google/gerrit/server/patch/DiffSummary.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummary.java
rename to java/com/google/gerrit/server/patch/DiffSummary.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryKey.java b/java/com/google/gerrit/server/patch/DiffSummaryKey.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryKey.java
rename to java/com/google/gerrit/server/patch/DiffSummaryKey.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryLoader.java b/java/com/google/gerrit/server/patch/DiffSummaryLoader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryLoader.java
rename to java/com/google/gerrit/server/patch/DiffSummaryLoader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryWeigher.java b/java/com/google/gerrit/server/patch/DiffSummaryWeigher.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/DiffSummaryWeigher.java
rename to java/com/google/gerrit/server/patch/DiffSummaryWeigher.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/EditTransformer.java b/java/com/google/gerrit/server/patch/EditTransformer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/EditTransformer.java
rename to java/com/google/gerrit/server/patch/EditTransformer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java b/java/com/google/gerrit/server/patch/IntraLineDiff.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiff.java
rename to java/com/google/gerrit/server/patch/IntraLineDiff.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiffArgs.java b/java/com/google/gerrit/server/patch/IntraLineDiffArgs.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiffArgs.java
rename to java/com/google/gerrit/server/patch/IntraLineDiffArgs.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiffKey.java b/java/com/google/gerrit/server/patch/IntraLineDiffKey.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineDiffKey.java
rename to java/com/google/gerrit/server/patch/IntraLineDiffKey.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java b/java/com/google/gerrit/server/patch/IntraLineLoader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineLoader.java
rename to java/com/google/gerrit/server/patch/IntraLineLoader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineWeigher.java b/java/com/google/gerrit/server/patch/IntraLineWeigher.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/IntraLineWeigher.java
rename to java/com/google/gerrit/server/patch/IntraLineWeigher.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/MergeListBuilder.java b/java/com/google/gerrit/server/patch/MergeListBuilder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/MergeListBuilder.java
rename to java/com/google/gerrit/server/patch/MergeListBuilder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java b/java/com/google/gerrit/server/patch/PatchFile.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchFile.java
rename to java/com/google/gerrit/server/patch/PatchFile.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java b/java/com/google/gerrit/server/patch/PatchList.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchList.java
rename to java/com/google/gerrit/server/patch/PatchList.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java b/java/com/google/gerrit/server/patch/PatchListCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java
rename to java/com/google/gerrit/server/patch/PatchListCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java b/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
rename to java/com/google/gerrit/server/patch/PatchListCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java b/java/com/google/gerrit/server/patch/PatchListEntry.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListEntry.java
rename to java/com/google/gerrit/server/patch/PatchListEntry.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java b/java/com/google/gerrit/server/patch/PatchListKey.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListKey.java
rename to java/com/google/gerrit/server/patch/PatchListKey.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java b/java/com/google/gerrit/server/patch/PatchListLoader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
rename to java/com/google/gerrit/server/patch/PatchListLoader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListNotAvailableException.java b/java/com/google/gerrit/server/patch/PatchListNotAvailableException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListNotAvailableException.java
rename to java/com/google/gerrit/server/patch/PatchListNotAvailableException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListObjectTooLargeException.java b/java/com/google/gerrit/server/patch/PatchListObjectTooLargeException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListObjectTooLargeException.java
rename to java/com/google/gerrit/server/patch/PatchListObjectTooLargeException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListWeigher.java b/java/com/google/gerrit/server/patch/PatchListWeigher.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListWeigher.java
rename to java/com/google/gerrit/server/patch/PatchListWeigher.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java b/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptBuilder.java
rename to java/com/google/gerrit/server/patch/PatchScriptBuilder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java b/java/com/google/gerrit/server/patch/PatchScriptFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchScriptFactory.java
rename to java/com/google/gerrit/server/patch/PatchScriptFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java b/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoFactory.java
rename to java/com/google/gerrit/server/patch/PatchSetInfoFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoNotAvailableException.java b/java/com/google/gerrit/server/patch/PatchSetInfoNotAvailableException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchSetInfoNotAvailableException.java
rename to java/com/google/gerrit/server/patch/PatchSetInfoNotAvailableException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java b/java/com/google/gerrit/server/patch/Text.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/patch/Text.java
rename to java/com/google/gerrit/server/patch/Text.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/ChangePermission.java b/java/com/google/gerrit/server/permissions/ChangePermission.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/ChangePermission.java
rename to java/com/google/gerrit/server/permissions/ChangePermission.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/ChangePermissionOrLabel.java b/java/com/google/gerrit/server/permissions/ChangePermissionOrLabel.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/ChangePermissionOrLabel.java
rename to java/com/google/gerrit/server/permissions/ChangePermissionOrLabel.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/FailedPermissionBackend.java b/java/com/google/gerrit/server/permissions/FailedPermissionBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/FailedPermissionBackend.java
rename to java/com/google/gerrit/server/permissions/FailedPermissionBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/GlobalPermission.java b/java/com/google/gerrit/server/permissions/GlobalPermission.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/GlobalPermission.java
rename to java/com/google/gerrit/server/permissions/GlobalPermission.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/LabelPermission.java b/java/com/google/gerrit/server/permissions/LabelPermission.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/LabelPermission.java
rename to java/com/google/gerrit/server/permissions/LabelPermission.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackend.java b/java/com/google/gerrit/server/permissions/PermissionBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackend.java
rename to java/com/google/gerrit/server/permissions/PermissionBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackendCondition.java b/java/com/google/gerrit/server/permissions/PermissionBackendCondition.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackendCondition.java
rename to java/com/google/gerrit/server/permissions/PermissionBackendCondition.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackendException.java b/java/com/google/gerrit/server/permissions/PermissionBackendException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/PermissionBackendException.java
rename to java/com/google/gerrit/server/permissions/PermissionBackendException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/ProjectPermission.java b/java/com/google/gerrit/server/permissions/ProjectPermission.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/ProjectPermission.java
rename to java/com/google/gerrit/server/permissions/ProjectPermission.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/permissions/RefPermission.java b/java/com/google/gerrit/server/permissions/RefPermission.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/permissions/RefPermission.java
rename to java/com/google/gerrit/server/permissions/RefPermission.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java b/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java
rename to java/com/google/gerrit/server/plugins/AbstractPreloadedPluginScanner.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java b/java/com/google/gerrit/server/plugins/AutoRegisterModules.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterModules.java
rename to java/com/google/gerrit/server/plugins/AutoRegisterModules.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterUtil.java b/java/com/google/gerrit/server/plugins/AutoRegisterUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/AutoRegisterUtil.java
rename to java/com/google/gerrit/server/plugins/AutoRegisterUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/CleanupHandle.java b/java/com/google/gerrit/server/plugins/CleanupHandle.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/CleanupHandle.java
rename to java/com/google/gerrit/server/plugins/CleanupHandle.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/CopyConfigModule.java b/java/com/google/gerrit/server/plugins/CopyConfigModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/CopyConfigModule.java
rename to java/com/google/gerrit/server/plugins/CopyConfigModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java b/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
rename to java/com/google/gerrit/server/plugins/DelegatingClassLoader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/DisablePlugin.java b/java/com/google/gerrit/server/plugins/DisablePlugin.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/DisablePlugin.java
rename to java/com/google/gerrit/server/plugins/DisablePlugin.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/EnablePlugin.java b/java/com/google/gerrit/server/plugins/EnablePlugin.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/EnablePlugin.java
rename to java/com/google/gerrit/server/plugins/EnablePlugin.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/GetStatus.java b/java/com/google/gerrit/server/plugins/GetStatus.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/GetStatus.java
rename to java/com/google/gerrit/server/plugins/GetStatus.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/InstallPlugin.java b/java/com/google/gerrit/server/plugins/InstallPlugin.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/InstallPlugin.java
rename to java/com/google/gerrit/server/plugins/InstallPlugin.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/InvalidPluginException.java b/java/com/google/gerrit/server/plugins/InvalidPluginException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/InvalidPluginException.java
rename to java/com/google/gerrit/server/plugins/InvalidPluginException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java b/java/com/google/gerrit/server/plugins/JarPluginProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarPluginProvider.java
rename to java/com/google/gerrit/server/plugins/JarPluginProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarScanner.java b/java/com/google/gerrit/server/plugins/JarScanner.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/JarScanner.java
rename to java/com/google/gerrit/server/plugins/JarScanner.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/JsPlugin.java b/java/com/google/gerrit/server/plugins/JsPlugin.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/JsPlugin.java
rename to java/com/google/gerrit/server/plugins/JsPlugin.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java b/java/com/google/gerrit/server/plugins/ListPlugins.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java
rename to java/com/google/gerrit/server/plugins/ListPlugins.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ModuleGenerator.java b/java/com/google/gerrit/server/plugins/ModuleGenerator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/ModuleGenerator.java
rename to java/com/google/gerrit/server/plugins/ModuleGenerator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/MultipleProvidersForPluginException.java b/java/com/google/gerrit/server/plugins/MultipleProvidersForPluginException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/MultipleProvidersForPluginException.java
rename to java/com/google/gerrit/server/plugins/MultipleProvidersForPluginException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/Plugin.java b/java/com/google/gerrit/server/plugins/Plugin.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/Plugin.java
rename to java/com/google/gerrit/server/plugins/Plugin.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginCleanerTask.java b/java/com/google/gerrit/server/plugins/PluginCleanerTask.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginCleanerTask.java
rename to java/com/google/gerrit/server/plugins/PluginCleanerTask.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java b/java/com/google/gerrit/server/plugins/PluginContentScanner.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java
rename to java/com/google/gerrit/server/plugins/PluginContentScanner.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginEntry.java b/java/com/google/gerrit/server/plugins/PluginEntry.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginEntry.java
rename to java/com/google/gerrit/server/plugins/PluginEntry.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java b/java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java
rename to java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginInstallException.java b/java/com/google/gerrit/server/plugins/PluginInstallException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginInstallException.java
rename to java/com/google/gerrit/server/plugins/PluginInstallException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java b/java/com/google/gerrit/server/plugins/PluginLoader.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginLoader.java
rename to java/com/google/gerrit/server/plugins/PluginLoader.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginMetricMaker.java b/java/com/google/gerrit/server/plugins/PluginMetricMaker.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginMetricMaker.java
rename to java/com/google/gerrit/server/plugins/PluginMetricMaker.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginModule.java b/java/com/google/gerrit/server/plugins/PluginModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginModule.java
rename to java/com/google/gerrit/server/plugins/PluginModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginResource.java b/java/com/google/gerrit/server/plugins/PluginResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginResource.java
rename to java/com/google/gerrit/server/plugins/PluginResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginRestApiModule.java b/java/com/google/gerrit/server/plugins/PluginRestApiModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginRestApiModule.java
rename to java/com/google/gerrit/server/plugins/PluginRestApiModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginScannerThread.java b/java/com/google/gerrit/server/plugins/PluginScannerThread.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginScannerThread.java
rename to java/com/google/gerrit/server/plugins/PluginScannerThread.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginUtil.java b/java/com/google/gerrit/server/plugins/PluginUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginUtil.java
rename to java/com/google/gerrit/server/plugins/PluginUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginsCollection.java b/java/com/google/gerrit/server/plugins/PluginsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginsCollection.java
rename to java/com/google/gerrit/server/plugins/PluginsCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ReloadPlugin.java b/java/com/google/gerrit/server/plugins/ReloadPlugin.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/ReloadPlugin.java
rename to java/com/google/gerrit/server/plugins/ReloadPlugin.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ReloadPluginListener.java b/java/com/google/gerrit/server/plugins/ReloadPluginListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/ReloadPluginListener.java
rename to java/com/google/gerrit/server/plugins/ReloadPluginListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerInformationImpl.java b/java/com/google/gerrit/server/plugins/ServerInformationImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerInformationImpl.java
rename to java/com/google/gerrit/server/plugins/ServerInformationImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java b/java/com/google/gerrit/server/plugins/ServerPlugin.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPlugin.java
rename to java/com/google/gerrit/server/plugins/ServerPlugin.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPluginInfoModule.java b/java/com/google/gerrit/server/plugins/ServerPluginInfoModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPluginInfoModule.java
rename to java/com/google/gerrit/server/plugins/ServerPluginInfoModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPluginProvider.java b/java/com/google/gerrit/server/plugins/ServerPluginProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPluginProvider.java
rename to java/com/google/gerrit/server/plugins/ServerPluginProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/StartPluginListener.java b/java/com/google/gerrit/server/plugins/StartPluginListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/StartPluginListener.java
rename to java/com/google/gerrit/server/plugins/StartPluginListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/StopPluginListener.java b/java/com/google/gerrit/server/plugins/StopPluginListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/StopPluginListener.java
rename to java/com/google/gerrit/server/plugins/StopPluginListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/TestServerPlugin.java b/java/com/google/gerrit/server/plugins/TestServerPlugin.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/TestServerPlugin.java
rename to java/com/google/gerrit/server/plugins/TestServerPlugin.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java b/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java
rename to java/com/google/gerrit/server/plugins/UniversalServerPluginProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/AccessControlModule.java b/java/com/google/gerrit/server/project/AccessControlModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/AccessControlModule.java
rename to java/com/google/gerrit/server/project/AccessControlModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/BanCommit.java b/java/com/google/gerrit/server/project/BanCommit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/BanCommit.java
rename to java/com/google/gerrit/server/project/BanCommit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java b/java/com/google/gerrit/server/project/BranchResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java
rename to java/com/google/gerrit/server/project/BranchResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchesCollection.java b/java/com/google/gerrit/server/project/BranchesCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/BranchesCollection.java
rename to java/com/google/gerrit/server/project/BranchesCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java b/java/com/google/gerrit/server/project/ChangeControl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ChangeControl.java
rename to java/com/google/gerrit/server/project/ChangeControl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CheckAccess.java b/java/com/google/gerrit/server/project/CheckAccess.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CheckAccess.java
rename to java/com/google/gerrit/server/project/CheckAccess.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CheckMergeability.java b/java/com/google/gerrit/server/project/CheckMergeability.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CheckMergeability.java
rename to java/com/google/gerrit/server/project/CheckMergeability.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java b/java/com/google/gerrit/server/project/ChildProjectResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectResource.java
rename to java/com/google/gerrit/server/project/ChildProjectResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectsCollection.java b/java/com/google/gerrit/server/project/ChildProjectsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ChildProjectsCollection.java
rename to java/com/google/gerrit/server/project/ChildProjectsCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommentLinkInfoImpl.java b/java/com/google/gerrit/server/project/CommentLinkInfoImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CommentLinkInfoImpl.java
rename to java/com/google/gerrit/server/project/CommentLinkInfoImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommentLinkProvider.java b/java/com/google/gerrit/server/project/CommentLinkProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CommentLinkProvider.java
rename to java/com/google/gerrit/server/project/CommentLinkProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitIncludedIn.java b/java/com/google/gerrit/server/project/CommitIncludedIn.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CommitIncludedIn.java
rename to java/com/google/gerrit/server/project/CommitIncludedIn.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitResource.java b/java/com/google/gerrit/server/project/CommitResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CommitResource.java
rename to java/com/google/gerrit/server/project/CommitResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java b/java/com/google/gerrit/server/project/CommitsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CommitsCollection.java
rename to java/com/google/gerrit/server/project/CommitsCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ConfigInfoImpl.java b/java/com/google/gerrit/server/project/ConfigInfoImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ConfigInfoImpl.java
rename to java/com/google/gerrit/server/project/ConfigInfoImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ContributorAgreementsChecker.java b/java/com/google/gerrit/server/project/ContributorAgreementsChecker.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ContributorAgreementsChecker.java
rename to java/com/google/gerrit/server/project/ContributorAgreementsChecker.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateAccessChange.java b/java/com/google/gerrit/server/project/CreateAccessChange.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CreateAccessChange.java
rename to java/com/google/gerrit/server/project/CreateAccessChange.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java b/java/com/google/gerrit/server/project/CreateBranch.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CreateBranch.java
rename to java/com/google/gerrit/server/project/CreateBranch.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java b/java/com/google/gerrit/server/project/CreateProject.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProject.java
rename to java/com/google/gerrit/server/project/CreateProject.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProjectArgs.java b/java/com/google/gerrit/server/project/CreateProjectArgs.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CreateProjectArgs.java
rename to java/com/google/gerrit/server/project/CreateProjectArgs.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateRefControl.java b/java/com/google/gerrit/server/project/CreateRefControl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CreateRefControl.java
rename to java/com/google/gerrit/server/project/CreateRefControl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CreateTag.java b/java/com/google/gerrit/server/project/CreateTag.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/CreateTag.java
rename to java/com/google/gerrit/server/project/CreateTag.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardResource.java b/java/com/google/gerrit/server/project/DashboardResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardResource.java
rename to java/com/google/gerrit/server/project/DashboardResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java b/java/com/google/gerrit/server/project/DashboardsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DashboardsCollection.java
rename to java/com/google/gerrit/server/project/DashboardsCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultPermissionBackend.java b/java/com/google/gerrit/server/project/DefaultPermissionBackend.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultPermissionBackend.java
rename to java/com/google/gerrit/server/project/DefaultPermissionBackend.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultPermissionBackendModule.java b/java/com/google/gerrit/server/project/DefaultPermissionBackendModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultPermissionBackendModule.java
rename to java/com/google/gerrit/server/project/DefaultPermissionBackendModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultProjectNameLockManager.java b/java/com/google/gerrit/server/project/DefaultProjectNameLockManager.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DefaultProjectNameLockManager.java
rename to java/com/google/gerrit/server/project/DefaultProjectNameLockManager.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java b/java/com/google/gerrit/server/project/DeleteBranch.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranch.java
rename to java/com/google/gerrit/server/project/DeleteBranch.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranches.java b/java/com/google/gerrit/server/project/DeleteBranches.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteBranches.java
rename to java/com/google/gerrit/server/project/DeleteBranches.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteDashboard.java b/java/com/google/gerrit/server/project/DeleteDashboard.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteDashboard.java
rename to java/com/google/gerrit/server/project/DeleteDashboard.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java b/java/com/google/gerrit/server/project/DeleteRef.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteRef.java
rename to java/com/google/gerrit/server/project/DeleteRef.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteTag.java b/java/com/google/gerrit/server/project/DeleteTag.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteTag.java
rename to java/com/google/gerrit/server/project/DeleteTag.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteTags.java b/java/com/google/gerrit/server/project/DeleteTags.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/DeleteTags.java
rename to java/com/google/gerrit/server/project/DeleteTags.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/FileResource.java b/java/com/google/gerrit/server/project/FileResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/FileResource.java
rename to java/com/google/gerrit/server/project/FileResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java b/java/com/google/gerrit/server/project/FilesCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/FilesCollection.java
rename to java/com/google/gerrit/server/project/FilesCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/FilesInCommitCollection.java b/java/com/google/gerrit/server/project/FilesInCommitCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/FilesInCommitCollection.java
rename to java/com/google/gerrit/server/project/FilesInCommitCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java b/java/com/google/gerrit/server/project/GarbageCollect.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GarbageCollect.java
rename to java/com/google/gerrit/server/project/GarbageCollect.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java b/java/com/google/gerrit/server/project/GetAccess.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetAccess.java
rename to java/com/google/gerrit/server/project/GetAccess.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetBranch.java b/java/com/google/gerrit/server/project/GetBranch.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetBranch.java
rename to java/com/google/gerrit/server/project/GetBranch.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetChildProject.java b/java/com/google/gerrit/server/project/GetChildProject.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetChildProject.java
rename to java/com/google/gerrit/server/project/GetChildProject.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetCommit.java b/java/com/google/gerrit/server/project/GetCommit.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetCommit.java
rename to java/com/google/gerrit/server/project/GetCommit.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetConfig.java b/java/com/google/gerrit/server/project/GetConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetConfig.java
rename to java/com/google/gerrit/server/project/GetConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetContent.java b/java/com/google/gerrit/server/project/GetContent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetContent.java
rename to java/com/google/gerrit/server/project/GetContent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetDashboard.java b/java/com/google/gerrit/server/project/GetDashboard.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetDashboard.java
rename to java/com/google/gerrit/server/project/GetDashboard.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetDescription.java b/java/com/google/gerrit/server/project/GetDescription.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetDescription.java
rename to java/com/google/gerrit/server/project/GetDescription.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java b/java/com/google/gerrit/server/project/GetHead.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetHead.java
rename to java/com/google/gerrit/server/project/GetHead.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetParent.java b/java/com/google/gerrit/server/project/GetParent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetParent.java
rename to java/com/google/gerrit/server/project/GetParent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetProject.java b/java/com/google/gerrit/server/project/GetProject.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetProject.java
rename to java/com/google/gerrit/server/project/GetProject.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java b/java/com/google/gerrit/server/project/GetReflog.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java
rename to java/com/google/gerrit/server/project/GetReflog.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java b/java/com/google/gerrit/server/project/GetStatistics.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetStatistics.java
rename to java/com/google/gerrit/server/project/GetStatistics.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetTag.java b/java/com/google/gerrit/server/project/GetTag.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/GetTag.java
rename to java/com/google/gerrit/server/project/GetTag.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/Index.java b/java/com/google/gerrit/server/project/Index.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/Index.java
rename to java/com/google/gerrit/server/project/Index.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/InvalidChangeOperationException.java b/java/com/google/gerrit/server/project/InvalidChangeOperationException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/InvalidChangeOperationException.java
rename to java/com/google/gerrit/server/project/InvalidChangeOperationException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java b/java/com/google/gerrit/server/project/ListBranches.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
rename to java/com/google/gerrit/server/project/ListBranches.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java b/java/com/google/gerrit/server/project/ListChildProjects.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ListChildProjects.java
rename to java/com/google/gerrit/server/project/ListChildProjects.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java b/java/com/google/gerrit/server/project/ListDashboards.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ListDashboards.java
rename to java/com/google/gerrit/server/project/ListDashboards.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java b/java/com/google/gerrit/server/project/ListProjects.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
rename to java/com/google/gerrit/server/project/ListProjects.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java b/java/com/google/gerrit/server/project/ListTags.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java
rename to java/com/google/gerrit/server/project/ListTags.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/Module.java b/java/com/google/gerrit/server/project/Module.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/Module.java
rename to java/com/google/gerrit/server/project/Module.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchChangeException.java b/java/com/google/gerrit/server/project/NoSuchChangeException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchChangeException.java
rename to java/com/google/gerrit/server/project/NoSuchChangeException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java b/java/com/google/gerrit/server/project/NoSuchProjectException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java
rename to java/com/google/gerrit/server/project/NoSuchProjectException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java b/java/com/google/gerrit/server/project/NoSuchRefException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchRefException.java
rename to java/com/google/gerrit/server/project/NoSuchRefException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PerRequestProjectControlCache.java b/java/com/google/gerrit/server/project/PerRequestProjectControlCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/PerRequestProjectControlCache.java
rename to java/com/google/gerrit/server/project/PerRequestProjectControlCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java b/java/com/google/gerrit/server/project/PermissionCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java
rename to java/com/google/gerrit/server/project/PermissionCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java b/java/com/google/gerrit/server/project/ProjectCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCache.java
rename to java/com/google/gerrit/server/project/ProjectCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheClock.java b/java/com/google/gerrit/server/project/ProjectCacheClock.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheClock.java
rename to java/com/google/gerrit/server/project/ProjectCacheClock.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java b/java/com/google/gerrit/server/project/ProjectCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheImpl.java
rename to java/com/google/gerrit/server/project/ProjectCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java b/java/com/google/gerrit/server/project/ProjectCacheWarmer.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectCacheWarmer.java
rename to java/com/google/gerrit/server/project/ProjectCacheWarmer.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/java/com/google/gerrit/server/project/ProjectControl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java
rename to java/com/google/gerrit/server/project/ProjectControl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectData.java b/java/com/google/gerrit/server/project/ProjectData.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectData.java
rename to java/com/google/gerrit/server/project/ProjectData.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectHierarchyIterator.java b/java/com/google/gerrit/server/project/ProjectHierarchyIterator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectHierarchyIterator.java
rename to java/com/google/gerrit/server/project/ProjectHierarchyIterator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java b/java/com/google/gerrit/server/project/ProjectJson.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectJson.java
rename to java/com/google/gerrit/server/project/ProjectJson.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNameLockManager.java b/java/com/google/gerrit/server/project/ProjectNameLockManager.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNameLockManager.java
rename to java/com/google/gerrit/server/project/ProjectNameLockManager.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java b/java/com/google/gerrit/server/project/ProjectNode.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectNode.java
rename to java/com/google/gerrit/server/project/ProjectNode.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectRef.java b/java/com/google/gerrit/server/project/ProjectRef.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectRef.java
rename to java/com/google/gerrit/server/project/ProjectRef.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectResource.java b/java/com/google/gerrit/server/project/ProjectResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectResource.java
rename to java/com/google/gerrit/server/project/ProjectResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java b/java/com/google/gerrit/server/project/ProjectState.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectState.java
rename to java/com/google/gerrit/server/project/ProjectState.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectsCollection.java b/java/com/google/gerrit/server/project/ProjectsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectsCollection.java
rename to java/com/google/gerrit/server/project/ProjectsCollection.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutBranch.java b/java/com/google/gerrit/server/project/PutBranch.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/PutBranch.java
rename to java/com/google/gerrit/server/project/PutBranch.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java b/java/com/google/gerrit/server/project/PutConfig.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/PutConfig.java
rename to java/com/google/gerrit/server/project/PutConfig.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutDescription.java b/java/com/google/gerrit/server/project/PutDescription.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/PutDescription.java
rename to java/com/google/gerrit/server/project/PutDescription.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutProject.java b/java/com/google/gerrit/server/project/PutProject.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/PutProject.java
rename to java/com/google/gerrit/server/project/PutProject.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PutTag.java b/java/com/google/gerrit/server/project/PutTag.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/PutTag.java
rename to java/com/google/gerrit/server/project/PutTag.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/QueryProjects.java b/java/com/google/gerrit/server/project/QueryProjects.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/QueryProjects.java
rename to java/com/google/gerrit/server/project/QueryProjects.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java b/java/com/google/gerrit/server/project/RefControl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RefControl.java
rename to java/com/google/gerrit/server/project/RefControl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefFilter.java b/java/com/google/gerrit/server/project/RefFilter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RefFilter.java
rename to java/com/google/gerrit/server/project/RefFilter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefPattern.java b/java/com/google/gerrit/server/project/RefPattern.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RefPattern.java
rename to java/com/google/gerrit/server/project/RefPattern.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefPatternMatcher.java b/java/com/google/gerrit/server/project/RefPatternMatcher.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RefPatternMatcher.java
rename to java/com/google/gerrit/server/project/RefPatternMatcher.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefResource.java b/java/com/google/gerrit/server/project/RefResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RefResource.java
rename to java/com/google/gerrit/server/project/RefResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefUtil.java b/java/com/google/gerrit/server/project/RefUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RefUtil.java
rename to java/com/google/gerrit/server/project/RefUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefValidationHelper.java b/java/com/google/gerrit/server/project/RefValidationHelper.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RefValidationHelper.java
rename to java/com/google/gerrit/server/project/RefValidationHelper.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RemoveReviewerControl.java b/java/com/google/gerrit/server/project/RemoveReviewerControl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RemoveReviewerControl.java
rename to java/com/google/gerrit/server/project/RemoveReviewerControl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RepositoryStatistics.java b/java/com/google/gerrit/server/project/RepositoryStatistics.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RepositoryStatistics.java
rename to java/com/google/gerrit/server/project/RepositoryStatistics.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RuleEvalException.java b/java/com/google/gerrit/server/project/RuleEvalException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/RuleEvalException.java
rename to java/com/google/gerrit/server/project/RuleEvalException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SectionMatcher.java b/java/com/google/gerrit/server/project/SectionMatcher.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SectionMatcher.java
rename to java/com/google/gerrit/server/project/SectionMatcher.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SectionSortCache.java b/java/com/google/gerrit/server/project/SectionSortCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SectionSortCache.java
rename to java/com/google/gerrit/server/project/SectionSortCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccess.java b/java/com/google/gerrit/server/project/SetAccess.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccess.java
rename to java/com/google/gerrit/server/project/SetAccess.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccessUtil.java b/java/com/google/gerrit/server/project/SetAccessUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SetAccessUtil.java
rename to java/com/google/gerrit/server/project/SetAccessUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDashboard.java b/java/com/google/gerrit/server/project/SetDashboard.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SetDashboard.java
rename to java/com/google/gerrit/server/project/SetDashboard.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetDefaultDashboard.java b/java/com/google/gerrit/server/project/SetDefaultDashboard.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SetDefaultDashboard.java
rename to java/com/google/gerrit/server/project/SetDefaultDashboard.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java b/java/com/google/gerrit/server/project/SetHead.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SetHead.java
rename to java/com/google/gerrit/server/project/SetHead.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java b/java/com/google/gerrit/server/project/SetParent.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SetParent.java
rename to java/com/google/gerrit/server/project/SetParent.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java b/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
rename to java/com/google/gerrit/server/project/SubmitRuleEvaluator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleOptions.java b/java/com/google/gerrit/server/project/SubmitRuleOptions.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SubmitRuleOptions.java
rename to java/com/google/gerrit/server/project/SubmitRuleOptions.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/SuggestParentCandidates.java b/java/com/google/gerrit/server/project/SuggestParentCandidates.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/SuggestParentCandidates.java
rename to java/com/google/gerrit/server/project/SuggestParentCandidates.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/TagResource.java b/java/com/google/gerrit/server/project/TagResource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/TagResource.java
rename to java/com/google/gerrit/server/project/TagResource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/TagsCollection.java b/java/com/google/gerrit/server/project/TagsCollection.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/project/TagsCollection.java
rename to java/com/google/gerrit/server/project/TagsCollection.java
diff --git a/java/com/google/gerrit/server/project/testing/BUILD b/java/com/google/gerrit/server/project/testing/BUILD
index 089856a..683e678 100644
--- a/java/com/google/gerrit/server/project/testing/BUILD
+++ b/java/com/google/gerrit/server/project/testing/BUILD
@@ -4,7 +4,7 @@
     srcs = glob(["*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/reviewdb:server",
     ],
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountIsVisibleToPredicate.java b/java/com/google/gerrit/server/query/account/AccountIsVisibleToPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountIsVisibleToPredicate.java
rename to java/com/google/gerrit/server/query/account/AccountIsVisibleToPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountPredicates.java b/java/com/google/gerrit/server/query/account/AccountPredicates.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountPredicates.java
rename to java/com/google/gerrit/server/query/account/AccountPredicates.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryBuilder.java b/java/com/google/gerrit/server/query/account/AccountQueryBuilder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryBuilder.java
rename to java/com/google/gerrit/server/query/account/AccountQueryBuilder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryProcessor.java b/java/com/google/gerrit/server/query/account/AccountQueryProcessor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/account/AccountQueryProcessor.java
rename to java/com/google/gerrit/server/query/account/AccountQueryProcessor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java b/java/com/google/gerrit/server/query/account/InternalAccountQuery.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/account/InternalAccountQuery.java
rename to java/com/google/gerrit/server/query/account/InternalAccountQuery.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AddedPredicate.java b/java/com/google/gerrit/server/query/change/AddedPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/AddedPredicate.java
rename to java/com/google/gerrit/server/query/change/AddedPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AfterPredicate.java b/java/com/google/gerrit/server/query/change/AfterPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/AfterPredicate.java
rename to java/com/google/gerrit/server/query/change/AfterPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AgePredicate.java b/java/com/google/gerrit/server/query/change/AgePredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/AgePredicate.java
rename to java/com/google/gerrit/server/query/change/AgePredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AndChangeSource.java b/java/com/google/gerrit/server/query/change/AndChangeSource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/AndChangeSource.java
rename to java/com/google/gerrit/server/query/change/AndChangeSource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AssigneePredicate.java b/java/com/google/gerrit/server/query/change/AssigneePredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/AssigneePredicate.java
rename to java/com/google/gerrit/server/query/change/AssigneePredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/AuthorPredicate.java b/java/com/google/gerrit/server/query/change/AuthorPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/AuthorPredicate.java
rename to java/com/google/gerrit/server/query/change/AuthorPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BeforePredicate.java b/java/com/google/gerrit/server/query/change/BeforePredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/BeforePredicate.java
rename to java/com/google/gerrit/server/query/change/BeforePredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/BooleanPredicate.java b/java/com/google/gerrit/server/query/change/BooleanPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/BooleanPredicate.java
rename to java/com/google/gerrit/server/query/change/BooleanPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeData.java
rename to java/com/google/gerrit/server/query/change/ChangeData.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeDataSource.java b/java/com/google/gerrit/server/query/change/ChangeDataSource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeDataSource.java
rename to java/com/google/gerrit/server/query/change/ChangeDataSource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIdPredicate.java b/java/com/google/gerrit/server/query/change/ChangeIdPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIdPredicate.java
rename to java/com/google/gerrit/server/query/change/ChangeIdPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIndexPredicate.java b/java/com/google/gerrit/server/query/change/ChangeIndexPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIndexPredicate.java
rename to java/com/google/gerrit/server/query/change/ChangeIndexPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java b/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java
rename to java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeOperatorPredicate.java b/java/com/google/gerrit/server/query/change/ChangeOperatorPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeOperatorPredicate.java
rename to java/com/google/gerrit/server/query/change/ChangeOperatorPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java b/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
rename to java/com/google/gerrit/server/query/change/ChangeQueryBuilder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryProcessor.java b/java/com/google/gerrit/server/query/change/ChangeQueryProcessor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeQueryProcessor.java
rename to java/com/google/gerrit/server/query/change/ChangeQueryProcessor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeRegexPredicate.java b/java/com/google/gerrit/server/query/change/ChangeRegexPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeRegexPredicate.java
rename to java/com/google/gerrit/server/query/change/ChangeRegexPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java b/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java
rename to java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommentByPredicate.java b/java/com/google/gerrit/server/query/change/CommentByPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommentByPredicate.java
rename to java/com/google/gerrit/server/query/change/CommentByPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommentPredicate.java b/java/com/google/gerrit/server/query/change/CommentPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommentPredicate.java
rename to java/com/google/gerrit/server/query/change/CommentPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java b/java/com/google/gerrit/server/query/change/CommitPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitPredicate.java
rename to java/com/google/gerrit/server/query/change/CommitPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitterPredicate.java b/java/com/google/gerrit/server/query/change/CommitterPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/CommitterPredicate.java
rename to java/com/google/gerrit/server/query/change/CommitterPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictKey.java b/java/com/google/gerrit/server/query/change/ConflictKey.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictKey.java
rename to java/com/google/gerrit/server/query/change/ConflictKey.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsCache.java b/java/com/google/gerrit/server/query/change/ConflictsCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsCache.java
rename to java/com/google/gerrit/server/query/change/ConflictsCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java b/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java
rename to java/com/google/gerrit/server/query/change/ConflictsCacheImpl.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java b/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ConflictsPredicate.java
rename to java/com/google/gerrit/server/query/change/ConflictsPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/DeletedPredicate.java b/java/com/google/gerrit/server/query/change/DeletedPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/DeletedPredicate.java
rename to java/com/google/gerrit/server/query/change/DeletedPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/DeltaPredicate.java b/java/com/google/gerrit/server/query/change/DeltaPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/DeltaPredicate.java
rename to java/com/google/gerrit/server/query/change/DeltaPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/DestinationPredicate.java b/java/com/google/gerrit/server/query/change/DestinationPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/DestinationPredicate.java
rename to java/com/google/gerrit/server/query/change/DestinationPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EditByPredicate.java b/java/com/google/gerrit/server/query/change/EditByPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/EditByPredicate.java
rename to java/com/google/gerrit/server/query/change/EditByPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsFilePredicate.java b/java/com/google/gerrit/server/query/change/EqualsFilePredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsFilePredicate.java
rename to java/com/google/gerrit/server/query/change/EqualsFilePredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java b/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java
rename to java/com/google/gerrit/server/query/change/EqualsLabelPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsPathPredicate.java b/java/com/google/gerrit/server/query/change/EqualsPathPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/EqualsPathPredicate.java
rename to java/com/google/gerrit/server/query/change/EqualsPathPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactAuthorPredicate.java b/java/com/google/gerrit/server/query/change/ExactAuthorPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactAuthorPredicate.java
rename to java/com/google/gerrit/server/query/change/ExactAuthorPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactCommitterPredicate.java b/java/com/google/gerrit/server/query/change/ExactCommitterPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactCommitterPredicate.java
rename to java/com/google/gerrit/server/query/change/ExactCommitterPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactTopicPredicate.java b/java/com/google/gerrit/server/query/change/ExactTopicPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ExactTopicPredicate.java
rename to java/com/google/gerrit/server/query/change/ExactTopicPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java b/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java
rename to java/com/google/gerrit/server/query/change/FuzzyTopicPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/GroupPredicate.java b/java/com/google/gerrit/server/query/change/GroupPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/GroupPredicate.java
rename to java/com/google/gerrit/server/query/change/GroupPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HasDraftByPredicate.java b/java/com/google/gerrit/server/query/change/HasDraftByPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/HasDraftByPredicate.java
rename to java/com/google/gerrit/server/query/change/HasDraftByPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HasStarsPredicate.java b/java/com/google/gerrit/server/query/change/HasStarsPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/HasStarsPredicate.java
rename to java/com/google/gerrit/server/query/change/HasStarsPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java b/java/com/google/gerrit/server/query/change/HashtagPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/HashtagPredicate.java
rename to java/com/google/gerrit/server/query/change/HashtagPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IntegerRangeChangePredicate.java b/java/com/google/gerrit/server/query/change/IntegerRangeChangePredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/IntegerRangeChangePredicate.java
rename to java/com/google/gerrit/server/query/change/IntegerRangeChangePredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java b/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/InternalChangeQuery.java
rename to java/com/google/gerrit/server/query/change/InternalChangeQuery.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsReviewedPredicate.java b/java/com/google/gerrit/server/query/change/IsReviewedPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsReviewedPredicate.java
rename to java/com/google/gerrit/server/query/change/IsReviewedPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsUnresolvedPredicate.java b/java/com/google/gerrit/server/query/change/IsUnresolvedPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsUnresolvedPredicate.java
rename to java/com/google/gerrit/server/query/change/IsUnresolvedPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsWatchedByPredicate.java b/java/com/google/gerrit/server/query/change/IsWatchedByPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsWatchedByPredicate.java
rename to java/com/google/gerrit/server/query/change/IsWatchedByPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java b/java/com/google/gerrit/server/query/change/LabelPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/LabelPredicate.java
rename to java/com/google/gerrit/server/query/change/LabelPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java b/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java
rename to java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/MessagePredicate.java b/java/com/google/gerrit/server/query/change/MessagePredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/MessagePredicate.java
rename to java/com/google/gerrit/server/query/change/MessagePredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OrSource.java b/java/com/google/gerrit/server/query/change/OrSource.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/OrSource.java
rename to java/com/google/gerrit/server/query/change/OrSource.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
rename to java/com/google/gerrit/server/query/change/OutputStreamQuery.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerPredicate.java b/java/com/google/gerrit/server/query/change/OwnerPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerPredicate.java
rename to java/com/google/gerrit/server/query/change/OwnerPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java b/java/com/google/gerrit/server/query/change/OwnerinPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/OwnerinPredicate.java
rename to java/com/google/gerrit/server/query/change/OwnerinPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java b/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ParentProjectPredicate.java
rename to java/com/google/gerrit/server/query/change/ParentProjectPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/PluginDefinedAttributesFactory.java b/java/com/google/gerrit/server/query/change/PluginDefinedAttributesFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/PluginDefinedAttributesFactory.java
rename to java/com/google/gerrit/server/query/change/PluginDefinedAttributesFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/PredicateArgs.java b/java/com/google/gerrit/server/query/change/PredicateArgs.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/PredicateArgs.java
rename to java/com/google/gerrit/server/query/change/PredicateArgs.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ProjectPredicate.java b/java/com/google/gerrit/server/query/change/ProjectPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ProjectPredicate.java
rename to java/com/google/gerrit/server/query/change/ProjectPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ProjectPrefixPredicate.java b/java/com/google/gerrit/server/query/change/ProjectPrefixPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ProjectPrefixPredicate.java
rename to java/com/google/gerrit/server/query/change/ProjectPrefixPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java b/java/com/google/gerrit/server/query/change/QueryChanges.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java
rename to java/com/google/gerrit/server/query/change/QueryChanges.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RefPredicate.java b/java/com/google/gerrit/server/query/change/RefPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/RefPredicate.java
rename to java/com/google/gerrit/server/query/change/RefPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexPathPredicate.java b/java/com/google/gerrit/server/query/change/RegexPathPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexPathPredicate.java
rename to java/com/google/gerrit/server/query/change/RegexPathPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java b/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexProjectPredicate.java
rename to java/com/google/gerrit/server/query/change/RegexProjectPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexRefPredicate.java b/java/com/google/gerrit/server/query/change/RegexRefPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexRefPredicate.java
rename to java/com/google/gerrit/server/query/change/RegexRefPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexTopicPredicate.java b/java/com/google/gerrit/server/query/change/RegexTopicPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/RegexTopicPredicate.java
rename to java/com/google/gerrit/server/query/change/RegexTopicPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/RevertOfPredicate.java b/java/com/google/gerrit/server/query/change/RevertOfPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/RevertOfPredicate.java
rename to java/com/google/gerrit/server/query/change/RevertOfPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerByEmailPredicate.java b/java/com/google/gerrit/server/query/change/ReviewerByEmailPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerByEmailPredicate.java
rename to java/com/google/gerrit/server/query/change/ReviewerByEmailPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerPredicate.java b/java/com/google/gerrit/server/query/change/ReviewerPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerPredicate.java
rename to java/com/google/gerrit/server/query/change/ReviewerPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerinPredicate.java b/java/com/google/gerrit/server/query/change/ReviewerinPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerinPredicate.java
rename to java/com/google/gerrit/server/query/change/ReviewerinPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SingleGroupUser.java b/java/com/google/gerrit/server/query/change/SingleGroupUser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/SingleGroupUser.java
rename to java/com/google/gerrit/server/query/change/SingleGroupUser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/StarPredicate.java b/java/com/google/gerrit/server/query/change/StarPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/StarPredicate.java
rename to java/com/google/gerrit/server/query/change/StarPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmissionIdPredicate.java b/java/com/google/gerrit/server/query/change/SubmissionIdPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmissionIdPredicate.java
rename to java/com/google/gerrit/server/query/change/SubmissionIdPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java b/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java
rename to java/com/google/gerrit/server/query/change/SubmitRecordPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmittablePredicate.java b/java/com/google/gerrit/server/query/change/SubmittablePredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/SubmittablePredicate.java
rename to java/com/google/gerrit/server/query/change/SubmittablePredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/TimestampRangeChangePredicate.java b/java/com/google/gerrit/server/query/change/TimestampRangeChangePredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/TimestampRangeChangePredicate.java
rename to java/com/google/gerrit/server/query/change/TimestampRangeChangePredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/TrackingIdPredicate.java b/java/com/google/gerrit/server/query/change/TrackingIdPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/change/TrackingIdPredicate.java
rename to java/com/google/gerrit/server/query/change/TrackingIdPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupIsVisibleToPredicate.java b/java/com/google/gerrit/server/query/group/GroupIsVisibleToPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupIsVisibleToPredicate.java
rename to java/com/google/gerrit/server/query/group/GroupIsVisibleToPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java b/java/com/google/gerrit/server/query/group/GroupPredicates.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupPredicates.java
rename to java/com/google/gerrit/server/query/group/GroupPredicates.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java b/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryBuilder.java
rename to java/com/google/gerrit/server/query/group/GroupQueryBuilder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryProcessor.java b/java/com/google/gerrit/server/query/group/GroupQueryProcessor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/group/GroupQueryProcessor.java
rename to java/com/google/gerrit/server/query/group/GroupQueryProcessor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/group/InternalGroupQuery.java b/java/com/google/gerrit/server/query/group/InternalGroupQuery.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/group/InternalGroupQuery.java
rename to java/com/google/gerrit/server/query/group/InternalGroupQuery.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectIsVisibleToPredicate.java b/java/com/google/gerrit/server/query/project/ProjectIsVisibleToPredicate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectIsVisibleToPredicate.java
rename to java/com/google/gerrit/server/query/project/ProjectIsVisibleToPredicate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectPredicates.java b/java/com/google/gerrit/server/query/project/ProjectPredicates.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectPredicates.java
rename to java/com/google/gerrit/server/query/project/ProjectPredicates.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectQueryBuilder.java b/java/com/google/gerrit/server/query/project/ProjectQueryBuilder.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectQueryBuilder.java
rename to java/com/google/gerrit/server/query/project/ProjectQueryBuilder.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectQueryProcessor.java b/java/com/google/gerrit/server/query/project/ProjectQueryProcessor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/query/project/ProjectQueryProcessor.java
rename to java/com/google/gerrit/server/query/project/ProjectQueryProcessor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AclUtil.java b/java/com/google/gerrit/server/schema/AclUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/AclUtil.java
rename to java/com/google/gerrit/server/schema/AclUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java b/java/com/google/gerrit/server/schema/AllProjectsCreator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/AllProjectsCreator.java
rename to java/com/google/gerrit/server/schema/AllProjectsCreator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java b/java/com/google/gerrit/server/schema/AllUsersCreator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/AllUsersCreator.java
rename to java/com/google/gerrit/server/schema/AllUsersCreator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/BaseDataSourceType.java b/java/com/google/gerrit/server/schema/BaseDataSourceType.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/BaseDataSourceType.java
rename to java/com/google/gerrit/server/schema/BaseDataSourceType.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DB2.java b/java/com/google/gerrit/server/schema/DB2.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/DB2.java
rename to java/com/google/gerrit/server/schema/DB2.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceModule.java b/java/com/google/gerrit/server/schema/DataSourceModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceModule.java
rename to java/com/google/gerrit/server/schema/DataSourceModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java b/java/com/google/gerrit/server/schema/DataSourceProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceProvider.java
rename to java/com/google/gerrit/server/schema/DataSourceProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceType.java b/java/com/google/gerrit/server/schema/DataSourceType.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/DataSourceType.java
rename to java/com/google/gerrit/server/schema/DataSourceType.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/DatabaseModule.java b/java/com/google/gerrit/server/schema/DatabaseModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/DatabaseModule.java
rename to java/com/google/gerrit/server/schema/DatabaseModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Derby.java b/java/com/google/gerrit/server/schema/Derby.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Derby.java
rename to java/com/google/gerrit/server/schema/Derby.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java b/java/com/google/gerrit/server/schema/H2.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/H2.java
rename to java/com/google/gerrit/server/schema/H2.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/H2AccountPatchReviewStore.java b/java/com/google/gerrit/server/schema/H2AccountPatchReviewStore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/H2AccountPatchReviewStore.java
rename to java/com/google/gerrit/server/schema/H2AccountPatchReviewStore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java b/java/com/google/gerrit/server/schema/HANA.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/HANA.java
rename to java/com/google/gerrit/server/schema/HANA.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/InMemoryAccountPatchReviewStore.java b/java/com/google/gerrit/server/schema/InMemoryAccountPatchReviewStore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/InMemoryAccountPatchReviewStore.java
rename to java/com/google/gerrit/server/schema/InMemoryAccountPatchReviewStore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java b/java/com/google/gerrit/server/schema/JDBC.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/JDBC.java
rename to java/com/google/gerrit/server/schema/JDBC.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java b/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
rename to java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcUtil.java b/java/com/google/gerrit/server/schema/JdbcUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/JdbcUtil.java
rename to java/com/google/gerrit/server/schema/JdbcUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MariaDBAccountPatchReviewStore.java b/java/com/google/gerrit/server/schema/MariaDBAccountPatchReviewStore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/MariaDBAccountPatchReviewStore.java
rename to java/com/google/gerrit/server/schema/MariaDBAccountPatchReviewStore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MariaDb.java b/java/com/google/gerrit/server/schema/MariaDb.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/MariaDb.java
rename to java/com/google/gerrit/server/schema/MariaDb.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java b/java/com/google/gerrit/server/schema/MaxDb.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/MaxDb.java
rename to java/com/google/gerrit/server/schema/MaxDb.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java b/java/com/google/gerrit/server/schema/MySql.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/MySql.java
rename to java/com/google/gerrit/server/schema/MySql.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java b/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java
rename to java/com/google/gerrit/server/schema/MysqlAccountPatchReviewStore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/NoChangesReviewDbWrapper.java b/java/com/google/gerrit/server/schema/NoChangesReviewDbWrapper.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/NoChangesReviewDbWrapper.java
rename to java/com/google/gerrit/server/schema/NoChangesReviewDbWrapper.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/NotesMigrationSchemaFactory.java b/java/com/google/gerrit/server/schema/NotesMigrationSchemaFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/NotesMigrationSchemaFactory.java
rename to java/com/google/gerrit/server/schema/NotesMigrationSchemaFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java b/java/com/google/gerrit/server/schema/Oracle.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Oracle.java
rename to java/com/google/gerrit/server/schema/Oracle.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java b/java/com/google/gerrit/server/schema/PostgreSQL.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgreSQL.java
rename to java/com/google/gerrit/server/schema/PostgreSQL.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgresqlAccountPatchReviewStore.java b/java/com/google/gerrit/server/schema/PostgresqlAccountPatchReviewStore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/PostgresqlAccountPatchReviewStore.java
rename to java/com/google/gerrit/server/schema/PostgresqlAccountPatchReviewStore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ProjectConfigSchemaUpdate.java b/java/com/google/gerrit/server/schema/ProjectConfigSchemaUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/ProjectConfigSchemaUpdate.java
rename to java/com/google/gerrit/server/schema/ProjectConfigSchemaUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ReviewDbDatabaseProvider.java b/java/com/google/gerrit/server/schema/ReviewDbDatabaseProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/ReviewDbDatabaseProvider.java
rename to java/com/google/gerrit/server/schema/ReviewDbDatabaseProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ReviewDbFactory.java b/java/com/google/gerrit/server/schema/ReviewDbFactory.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/ReviewDbFactory.java
rename to java/com/google/gerrit/server/schema/ReviewDbFactory.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java b/java/com/google/gerrit/server/schema/SchemaCreator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaCreator.java
rename to java/com/google/gerrit/server/schema/SchemaCreator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaModule.java b/java/com/google/gerrit/server/schema/SchemaModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaModule.java
rename to java/com/google/gerrit/server/schema/SchemaModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java b/java/com/google/gerrit/server/schema/SchemaUpdater.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaUpdater.java
rename to java/com/google/gerrit/server/schema/SchemaUpdater.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java b/java/com/google/gerrit/server/schema/SchemaVersion.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersion.java
rename to java/com/google/gerrit/server/schema/SchemaVersion.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java b/java/com/google/gerrit/server/schema/SchemaVersionCheck.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/SchemaVersionCheck.java
rename to java/com/google/gerrit/server/schema/SchemaVersionCheck.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_100.java b/java/com/google/gerrit/server/schema/Schema_100.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_100.java
rename to java/com/google/gerrit/server/schema/Schema_100.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_101.java b/java/com/google/gerrit/server/schema/Schema_101.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_101.java
rename to java/com/google/gerrit/server/schema/Schema_101.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_102.java b/java/com/google/gerrit/server/schema/Schema_102.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_102.java
rename to java/com/google/gerrit/server/schema/Schema_102.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_103.java b/java/com/google/gerrit/server/schema/Schema_103.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_103.java
rename to java/com/google/gerrit/server/schema/Schema_103.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_104.java b/java/com/google/gerrit/server/schema/Schema_104.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_104.java
rename to java/com/google/gerrit/server/schema/Schema_104.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_105.java b/java/com/google/gerrit/server/schema/Schema_105.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_105.java
rename to java/com/google/gerrit/server/schema/Schema_105.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_106.java b/java/com/google/gerrit/server/schema/Schema_106.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_106.java
rename to java/com/google/gerrit/server/schema/Schema_106.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_107.java b/java/com/google/gerrit/server/schema/Schema_107.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_107.java
rename to java/com/google/gerrit/server/schema/Schema_107.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_108.java b/java/com/google/gerrit/server/schema/Schema_108.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_108.java
rename to java/com/google/gerrit/server/schema/Schema_108.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_109.java b/java/com/google/gerrit/server/schema/Schema_109.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_109.java
rename to java/com/google/gerrit/server/schema/Schema_109.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_110.java b/java/com/google/gerrit/server/schema/Schema_110.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_110.java
rename to java/com/google/gerrit/server/schema/Schema_110.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_111.java b/java/com/google/gerrit/server/schema/Schema_111.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_111.java
rename to java/com/google/gerrit/server/schema/Schema_111.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_112.java b/java/com/google/gerrit/server/schema/Schema_112.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_112.java
rename to java/com/google/gerrit/server/schema/Schema_112.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_113.java b/java/com/google/gerrit/server/schema/Schema_113.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_113.java
rename to java/com/google/gerrit/server/schema/Schema_113.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_114.java b/java/com/google/gerrit/server/schema/Schema_114.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_114.java
rename to java/com/google/gerrit/server/schema/Schema_114.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_115.java b/java/com/google/gerrit/server/schema/Schema_115.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_115.java
rename to java/com/google/gerrit/server/schema/Schema_115.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_116.java b/java/com/google/gerrit/server/schema/Schema_116.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_116.java
rename to java/com/google/gerrit/server/schema/Schema_116.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_117.java b/java/com/google/gerrit/server/schema/Schema_117.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_117.java
rename to java/com/google/gerrit/server/schema/Schema_117.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_118.java b/java/com/google/gerrit/server/schema/Schema_118.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_118.java
rename to java/com/google/gerrit/server/schema/Schema_118.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_119.java b/java/com/google/gerrit/server/schema/Schema_119.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_119.java
rename to java/com/google/gerrit/server/schema/Schema_119.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_120.java b/java/com/google/gerrit/server/schema/Schema_120.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_120.java
rename to java/com/google/gerrit/server/schema/Schema_120.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_121.java b/java/com/google/gerrit/server/schema/Schema_121.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_121.java
rename to java/com/google/gerrit/server/schema/Schema_121.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_122.java b/java/com/google/gerrit/server/schema/Schema_122.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_122.java
rename to java/com/google/gerrit/server/schema/Schema_122.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_123.java b/java/com/google/gerrit/server/schema/Schema_123.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_123.java
rename to java/com/google/gerrit/server/schema/Schema_123.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_124.java b/java/com/google/gerrit/server/schema/Schema_124.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_124.java
rename to java/com/google/gerrit/server/schema/Schema_124.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_125.java b/java/com/google/gerrit/server/schema/Schema_125.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_125.java
rename to java/com/google/gerrit/server/schema/Schema_125.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_126.java b/java/com/google/gerrit/server/schema/Schema_126.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_126.java
rename to java/com/google/gerrit/server/schema/Schema_126.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_127.java b/java/com/google/gerrit/server/schema/Schema_127.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_127.java
rename to java/com/google/gerrit/server/schema/Schema_127.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_128.java b/java/com/google/gerrit/server/schema/Schema_128.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_128.java
rename to java/com/google/gerrit/server/schema/Schema_128.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_129.java b/java/com/google/gerrit/server/schema/Schema_129.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_129.java
rename to java/com/google/gerrit/server/schema/Schema_129.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_130.java b/java/com/google/gerrit/server/schema/Schema_130.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_130.java
rename to java/com/google/gerrit/server/schema/Schema_130.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_131.java b/java/com/google/gerrit/server/schema/Schema_131.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_131.java
rename to java/com/google/gerrit/server/schema/Schema_131.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_132.java b/java/com/google/gerrit/server/schema/Schema_132.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_132.java
rename to java/com/google/gerrit/server/schema/Schema_132.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_133.java b/java/com/google/gerrit/server/schema/Schema_133.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_133.java
rename to java/com/google/gerrit/server/schema/Schema_133.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_134.java b/java/com/google/gerrit/server/schema/Schema_134.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_134.java
rename to java/com/google/gerrit/server/schema/Schema_134.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_135.java b/java/com/google/gerrit/server/schema/Schema_135.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_135.java
rename to java/com/google/gerrit/server/schema/Schema_135.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_136.java b/java/com/google/gerrit/server/schema/Schema_136.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_136.java
rename to java/com/google/gerrit/server/schema/Schema_136.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_137.java b/java/com/google/gerrit/server/schema/Schema_137.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_137.java
rename to java/com/google/gerrit/server/schema/Schema_137.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_138.java b/java/com/google/gerrit/server/schema/Schema_138.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_138.java
rename to java/com/google/gerrit/server/schema/Schema_138.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_139.java b/java/com/google/gerrit/server/schema/Schema_139.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_139.java
rename to java/com/google/gerrit/server/schema/Schema_139.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_140.java b/java/com/google/gerrit/server/schema/Schema_140.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_140.java
rename to java/com/google/gerrit/server/schema/Schema_140.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_141.java b/java/com/google/gerrit/server/schema/Schema_141.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_141.java
rename to java/com/google/gerrit/server/schema/Schema_141.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_142.java b/java/com/google/gerrit/server/schema/Schema_142.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_142.java
rename to java/com/google/gerrit/server/schema/Schema_142.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_143.java b/java/com/google/gerrit/server/schema/Schema_143.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_143.java
rename to java/com/google/gerrit/server/schema/Schema_143.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_144.java b/java/com/google/gerrit/server/schema/Schema_144.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_144.java
rename to java/com/google/gerrit/server/schema/Schema_144.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_145.java b/java/com/google/gerrit/server/schema/Schema_145.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_145.java
rename to java/com/google/gerrit/server/schema/Schema_145.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_146.java b/java/com/google/gerrit/server/schema/Schema_146.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_146.java
rename to java/com/google/gerrit/server/schema/Schema_146.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_147.java b/java/com/google/gerrit/server/schema/Schema_147.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_147.java
rename to java/com/google/gerrit/server/schema/Schema_147.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_148.java b/java/com/google/gerrit/server/schema/Schema_148.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_148.java
rename to java/com/google/gerrit/server/schema/Schema_148.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_149.java b/java/com/google/gerrit/server/schema/Schema_149.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_149.java
rename to java/com/google/gerrit/server/schema/Schema_149.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_150.java b/java/com/google/gerrit/server/schema/Schema_150.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_150.java
rename to java/com/google/gerrit/server/schema/Schema_150.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_151.java b/java/com/google/gerrit/server/schema/Schema_151.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_151.java
rename to java/com/google/gerrit/server/schema/Schema_151.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_152.java b/java/com/google/gerrit/server/schema/Schema_152.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_152.java
rename to java/com/google/gerrit/server/schema/Schema_152.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_153.java b/java/com/google/gerrit/server/schema/Schema_153.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_153.java
rename to java/com/google/gerrit/server/schema/Schema_153.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_154.java b/java/com/google/gerrit/server/schema/Schema_154.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_154.java
rename to java/com/google/gerrit/server/schema/Schema_154.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_155.java b/java/com/google/gerrit/server/schema/Schema_155.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_155.java
rename to java/com/google/gerrit/server/schema/Schema_155.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_156.java b/java/com/google/gerrit/server/schema/Schema_156.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_156.java
rename to java/com/google/gerrit/server/schema/Schema_156.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_157.java b/java/com/google/gerrit/server/schema/Schema_157.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_157.java
rename to java/com/google/gerrit/server/schema/Schema_157.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_158.java b/java/com/google/gerrit/server/schema/Schema_158.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_158.java
rename to java/com/google/gerrit/server/schema/Schema_158.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_159.java b/java/com/google/gerrit/server/schema/Schema_159.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_159.java
rename to java/com/google/gerrit/server/schema/Schema_159.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_160.java b/java/com/google/gerrit/server/schema/Schema_160.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_160.java
rename to java/com/google/gerrit/server/schema/Schema_160.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_161.java b/java/com/google/gerrit/server/schema/Schema_161.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_161.java
rename to java/com/google/gerrit/server/schema/Schema_161.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_83.java b/java/com/google/gerrit/server/schema/Schema_83.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_83.java
rename to java/com/google/gerrit/server/schema/Schema_83.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_84.java b/java/com/google/gerrit/server/schema/Schema_84.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_84.java
rename to java/com/google/gerrit/server/schema/Schema_84.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_85.java b/java/com/google/gerrit/server/schema/Schema_85.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_85.java
rename to java/com/google/gerrit/server/schema/Schema_85.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java b/java/com/google/gerrit/server/schema/Schema_86.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_86.java
rename to java/com/google/gerrit/server/schema/Schema_86.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_87.java b/java/com/google/gerrit/server/schema/Schema_87.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_87.java
rename to java/com/google/gerrit/server/schema/Schema_87.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_88.java b/java/com/google/gerrit/server/schema/Schema_88.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_88.java
rename to java/com/google/gerrit/server/schema/Schema_88.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_89.java b/java/com/google/gerrit/server/schema/Schema_89.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_89.java
rename to java/com/google/gerrit/server/schema/Schema_89.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_90.java b/java/com/google/gerrit/server/schema/Schema_90.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_90.java
rename to java/com/google/gerrit/server/schema/Schema_90.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_91.java b/java/com/google/gerrit/server/schema/Schema_91.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_91.java
rename to java/com/google/gerrit/server/schema/Schema_91.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_92.java b/java/com/google/gerrit/server/schema/Schema_92.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_92.java
rename to java/com/google/gerrit/server/schema/Schema_92.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_93.java b/java/com/google/gerrit/server/schema/Schema_93.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_93.java
rename to java/com/google/gerrit/server/schema/Schema_93.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java b/java/com/google/gerrit/server/schema/Schema_94.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_94.java
rename to java/com/google/gerrit/server/schema/Schema_94.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_95.java b/java/com/google/gerrit/server/schema/Schema_95.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_95.java
rename to java/com/google/gerrit/server/schema/Schema_95.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_96.java b/java/com/google/gerrit/server/schema/Schema_96.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_96.java
rename to java/com/google/gerrit/server/schema/Schema_96.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_97.java b/java/com/google/gerrit/server/schema/Schema_97.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_97.java
rename to java/com/google/gerrit/server/schema/Schema_97.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_98.java b/java/com/google/gerrit/server/schema/Schema_98.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_98.java
rename to java/com/google/gerrit/server/schema/Schema_98.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_99.java b/java/com/google/gerrit/server/schema/Schema_99.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/Schema_99.java
rename to java/com/google/gerrit/server/schema/Schema_99.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java b/java/com/google/gerrit/server/schema/ScriptRunner.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/ScriptRunner.java
rename to java/com/google/gerrit/server/schema/ScriptRunner.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/schema/UpdateUI.java b/java/com/google/gerrit/server/schema/UpdateUI.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/schema/UpdateUI.java
rename to java/com/google/gerrit/server/schema/UpdateUI.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java b/java/com/google/gerrit/server/securestore/DefaultSecureStore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/securestore/DefaultSecureStore.java
rename to java/com/google/gerrit/server/securestore/DefaultSecureStore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStore.java b/java/com/google/gerrit/server/securestore/SecureStore.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStore.java
rename to java/com/google/gerrit/server/securestore/SecureStore.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStoreClassName.java b/java/com/google/gerrit/server/securestore/SecureStoreClassName.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStoreClassName.java
rename to java/com/google/gerrit/server/securestore/SecureStoreClassName.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStoreProvider.java b/java/com/google/gerrit/server/securestore/SecureStoreProvider.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/securestore/SecureStoreProvider.java
rename to java/com/google/gerrit/server/securestore/SecureStoreProvider.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshInfo.java b/java/com/google/gerrit/server/ssh/NoSshInfo.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshInfo.java
rename to java/com/google/gerrit/server/ssh/NoSshInfo.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshKeyCache.java b/java/com/google/gerrit/server/ssh/NoSshKeyCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshKeyCache.java
rename to java/com/google/gerrit/server/ssh/NoSshKeyCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshModule.java b/java/com/google/gerrit/server/ssh/NoSshModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ssh/NoSshModule.java
rename to java/com/google/gerrit/server/ssh/NoSshModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java b/java/com/google/gerrit/server/ssh/SshAddressesModule.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAddressesModule.java
rename to java/com/google/gerrit/server/ssh/SshAddressesModule.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAdvertisedAddresses.java b/java/com/google/gerrit/server/ssh/SshAdvertisedAddresses.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshAdvertisedAddresses.java
rename to java/com/google/gerrit/server/ssh/SshAdvertisedAddresses.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshInfo.java b/java/com/google/gerrit/server/ssh/SshInfo.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshInfo.java
rename to java/com/google/gerrit/server/ssh/SshInfo.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshKeyCache.java b/java/com/google/gerrit/server/ssh/SshKeyCache.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshKeyCache.java
rename to java/com/google/gerrit/server/ssh/SshKeyCache.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshKeyCreator.java b/java/com/google/gerrit/server/ssh/SshKeyCreator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshKeyCreator.java
rename to java/com/google/gerrit/server/ssh/SshKeyCreator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshListenAddresses.java b/java/com/google/gerrit/server/ssh/SshListenAddresses.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/ssh/SshListenAddresses.java
rename to java/com/google/gerrit/server/ssh/SshListenAddresses.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/tools/ToolsCatalog.java b/java/com/google/gerrit/server/tools/ToolsCatalog.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/tools/ToolsCatalog.java
rename to java/com/google/gerrit/server/tools/ToolsCatalog.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/BatchUpdate.java b/java/com/google/gerrit/server/update/BatchUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/BatchUpdate.java
rename to java/com/google/gerrit/server/update/BatchUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/BatchUpdateListener.java b/java/com/google/gerrit/server/update/BatchUpdateListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/BatchUpdateListener.java
rename to java/com/google/gerrit/server/update/BatchUpdateListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/BatchUpdateOp.java b/java/com/google/gerrit/server/update/BatchUpdateOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/BatchUpdateOp.java
rename to java/com/google/gerrit/server/update/BatchUpdateOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/BatchUpdateReviewDb.java b/java/com/google/gerrit/server/update/BatchUpdateReviewDb.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/BatchUpdateReviewDb.java
rename to java/com/google/gerrit/server/update/BatchUpdateReviewDb.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/ChainedReceiveCommands.java b/java/com/google/gerrit/server/update/ChainedReceiveCommands.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/ChainedReceiveCommands.java
rename to java/com/google/gerrit/server/update/ChainedReceiveCommands.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/ChangeContext.java b/java/com/google/gerrit/server/update/ChangeContext.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/ChangeContext.java
rename to java/com/google/gerrit/server/update/ChangeContext.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/ChangeUpdateExecutor.java b/java/com/google/gerrit/server/update/ChangeUpdateExecutor.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/ChangeUpdateExecutor.java
rename to java/com/google/gerrit/server/update/ChangeUpdateExecutor.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/Context.java b/java/com/google/gerrit/server/update/Context.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/Context.java
rename to java/com/google/gerrit/server/update/Context.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/InsertChangeOp.java b/java/com/google/gerrit/server/update/InsertChangeOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/InsertChangeOp.java
rename to java/com/google/gerrit/server/update/InsertChangeOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/NoteDbBatchUpdate.java b/java/com/google/gerrit/server/update/NoteDbBatchUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/NoteDbBatchUpdate.java
rename to java/com/google/gerrit/server/update/NoteDbBatchUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/Order.java b/java/com/google/gerrit/server/update/Order.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/Order.java
rename to java/com/google/gerrit/server/update/Order.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/RefUpdateUtil.java b/java/com/google/gerrit/server/update/RefUpdateUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/RefUpdateUtil.java
rename to java/com/google/gerrit/server/update/RefUpdateUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/RepoContext.java b/java/com/google/gerrit/server/update/RepoContext.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/RepoContext.java
rename to java/com/google/gerrit/server/update/RepoContext.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/RepoOnlyOp.java b/java/com/google/gerrit/server/update/RepoOnlyOp.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/RepoOnlyOp.java
rename to java/com/google/gerrit/server/update/RepoOnlyOp.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/RepoView.java b/java/com/google/gerrit/server/update/RepoView.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/RepoView.java
rename to java/com/google/gerrit/server/update/RepoView.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/RetryHelper.java b/java/com/google/gerrit/server/update/RetryHelper.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/RetryHelper.java
rename to java/com/google/gerrit/server/update/RetryHelper.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/RetryingRestModifyView.java b/java/com/google/gerrit/server/update/RetryingRestModifyView.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/RetryingRestModifyView.java
rename to java/com/google/gerrit/server/update/RetryingRestModifyView.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java b/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java
rename to java/com/google/gerrit/server/update/ReviewDbBatchUpdate.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/update/UpdateException.java b/java/com/google/gerrit/server/update/UpdateException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/update/UpdateException.java
rename to java/com/google/gerrit/server/update/UpdateException.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/CommitMessageUtil.java b/java/com/google/gerrit/server/util/CommitMessageUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/CommitMessageUtil.java
rename to java/com/google/gerrit/server/util/CommitMessageUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/FallbackRequestContext.java b/java/com/google/gerrit/server/util/FallbackRequestContext.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/FallbackRequestContext.java
rename to java/com/google/gerrit/server/util/FallbackRequestContext.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java b/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java
rename to java/com/google/gerrit/server/util/GuiceRequestScopePropagator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/HostPlatform.java b/java/com/google/gerrit/server/util/HostPlatform.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/HostPlatform.java
rename to java/com/google/gerrit/server/util/HostPlatform.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java b/java/com/google/gerrit/server/util/IdGenerator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/IdGenerator.java
rename to java/com/google/gerrit/server/util/IdGenerator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/LabelVote.java b/java/com/google/gerrit/server/util/LabelVote.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/LabelVote.java
rename to java/com/google/gerrit/server/util/LabelVote.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/MagicBranch.java b/java/com/google/gerrit/server/util/MagicBranch.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/MagicBranch.java
rename to java/com/google/gerrit/server/util/MagicBranch.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/ManualRequestContext.java b/java/com/google/gerrit/server/util/ManualRequestContext.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/ManualRequestContext.java
rename to java/com/google/gerrit/server/util/ManualRequestContext.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java b/java/com/google/gerrit/server/util/MostSpecificComparator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/MostSpecificComparator.java
rename to java/com/google/gerrit/server/util/MostSpecificComparator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/OneOffRequestContext.java b/java/com/google/gerrit/server/util/OneOffRequestContext.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/OneOffRequestContext.java
rename to java/com/google/gerrit/server/util/OneOffRequestContext.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/PluginLogFile.java b/java/com/google/gerrit/server/util/PluginLogFile.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/PluginLogFile.java
rename to java/com/google/gerrit/server/util/PluginLogFile.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/PluginRequestContext.java b/java/com/google/gerrit/server/util/PluginRequestContext.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/PluginRequestContext.java
rename to java/com/google/gerrit/server/util/PluginRequestContext.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/RegexListSearcher.java b/java/com/google/gerrit/server/util/RegexListSearcher.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/RegexListSearcher.java
rename to java/com/google/gerrit/server/util/RegexListSearcher.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestContext.java b/java/com/google/gerrit/server/util/RequestContext.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/RequestContext.java
rename to java/com/google/gerrit/server/util/RequestContext.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestId.java b/java/com/google/gerrit/server/util/RequestId.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/RequestId.java
rename to java/com/google/gerrit/server/util/RequestId.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java b/java/com/google/gerrit/server/util/RequestScopePropagator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/RequestScopePropagator.java
rename to java/com/google/gerrit/server/util/RequestScopePropagator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java b/java/com/google/gerrit/server/util/ServerRequestContext.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/ServerRequestContext.java
rename to java/com/google/gerrit/server/util/ServerRequestContext.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java b/java/com/google/gerrit/server/util/SocketUtil.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/SocketUtil.java
rename to java/com/google/gerrit/server/util/SocketUtil.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java b/java/com/google/gerrit/server/util/SubmoduleSectionParser.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/SubmoduleSectionParser.java
rename to java/com/google/gerrit/server/util/SubmoduleSectionParser.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java b/java/com/google/gerrit/server/util/SystemLog.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/SystemLog.java
rename to java/com/google/gerrit/server/util/SystemLog.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java b/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestContext.java
rename to java/com/google/gerrit/server/util/ThreadLocalRequestContext.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java b/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java
rename to java/com/google/gerrit/server/util/ThreadLocalRequestScopePropagator.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java b/java/com/google/gerrit/server/util/TreeFormatter.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/util/TreeFormatter.java
rename to java/com/google/gerrit/server/util/TreeFormatter.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/validators/AssigneeValidationListener.java b/java/com/google/gerrit/server/validators/AssigneeValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/validators/AssigneeValidationListener.java
rename to java/com/google/gerrit/server/validators/AssigneeValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/validators/GroupCreationValidationListener.java b/java/com/google/gerrit/server/validators/GroupCreationValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/validators/GroupCreationValidationListener.java
rename to java/com/google/gerrit/server/validators/GroupCreationValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/validators/HashtagValidationListener.java b/java/com/google/gerrit/server/validators/HashtagValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/validators/HashtagValidationListener.java
rename to java/com/google/gerrit/server/validators/HashtagValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/validators/OutgoingEmailValidationListener.java b/java/com/google/gerrit/server/validators/OutgoingEmailValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/validators/OutgoingEmailValidationListener.java
rename to java/com/google/gerrit/server/validators/OutgoingEmailValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/validators/ProjectCreationValidationListener.java b/java/com/google/gerrit/server/validators/ProjectCreationValidationListener.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/validators/ProjectCreationValidationListener.java
rename to java/com/google/gerrit/server/validators/ProjectCreationValidationListener.java
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/validators/ValidationException.java b/java/com/google/gerrit/server/validators/ValidationException.java
similarity index 100%
rename from gerrit-server/src/main/java/com/google/gerrit/server/validators/ValidationException.java
rename to java/com/google/gerrit/server/validators/ValidationException.java
diff --git a/java/com/google/gerrit/sshd/BUILD b/java/com/google/gerrit/sshd/BUILD
index a7dea9e..0538872 100644
--- a/java/com/google/gerrit/sshd/BUILD
+++ b/java/com/google/gerrit/sshd/BUILD
@@ -3,8 +3,7 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:receive",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
@@ -13,6 +12,7 @@
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",
+        "//java/com/google/gerrit/server/git/receive",
         "//java/com/google/gerrit/util/cli",
         "//java/org/eclipse/jgit:server",
         "//lib:args4j",
diff --git a/java/com/google/gerrit/testing/BUILD b/java/com/google/gerrit/testing/BUILD
index 6ec86f8..6457770 100644
--- a/java/com/google/gerrit/testing/BUILD
+++ b/java/com/google/gerrit/testing/BUILD
@@ -12,8 +12,8 @@
         "//lib/powermock:powermock-module-junit4-common",
     ],
     deps = [
-        "//gerrit-server:module",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:module",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
diff --git a/java/gerrit/BUILD b/java/gerrit/BUILD
index a9c1012..be41406 100644
--- a/java/gerrit/BUILD
+++ b/java/gerrit/BUILD
@@ -3,7 +3,7 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/reviewdb:server",
diff --git a/gerrit-server/src/main/java/gerrit/PRED_pure_revert_1.java b/java/gerrit/PRED_pure_revert_1.java
similarity index 100%
rename from gerrit-server/src/main/java/gerrit/PRED_pure_revert_1.java
rename to java/gerrit/PRED_pure_revert_1.java
diff --git a/javatests/com/google/gerrit/BUILD b/javatests/com/google/gerrit/BUILD
new file mode 100644
index 0000000..115ada8
--- /dev/null
+++ b/javatests/com/google/gerrit/BUILD
@@ -0,0 +1,142 @@
+load("//tools/bzl:junit.bzl", "junit_tests")
+
+TESTUTIL_DEPS = [
+    "//java/com/google/gerrit:module",
+    "//java/com/google/gerrit:server",
+    "//java/com/google/gerrit/common:annotations",
+    "//java/com/google/gerrit/common:server",
+    "//java/com/google/gerrit/extensions:api",
+    "//java/com/google/gerrit/gpg",
+    "//java/com/google/gerrit/lifecycle",
+    "//java/com/google/gerrit/metrics",
+    "//java/com/google/gerrit/reviewdb:server",
+    "//java/com/google/gerrit/server/cache/h2",
+    "//java/com/google/gerrit/index",
+    "//java/com/google/gerrit/lucene",
+    "//lib:gwtorm",
+    "//lib:h2",
+    "//lib:truth",
+    "//lib/guice:guice",
+    "//lib/guice:guice-servlet",
+    "//lib/jgit/org.eclipse.jgit:jgit",
+    "//lib/jgit/org.eclipse.jgit.junit:junit",
+    "//lib/log:api",
+    "//lib/log:impl_log4j",
+    "//lib/log:log4j",
+]
+
+CUSTOM_TRUTH_SUBJECTS = glob([
+    "server/**/*Subject.java",
+])
+
+java_library(
+    name = "custom-truth-subjects",
+    testonly = 1,
+    srcs = CUSTOM_TRUTH_SUBJECTS,
+    deps = [
+        "//java/com/google/gerrit:server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/truth",
+        "//lib:truth",
+    ],
+)
+
+PROLOG_TEST_CASE = [
+    "rules/PrologTestCase.java",
+]
+
+PROLOG_TESTS = glob(
+    ["rules/**/*.java"],
+    exclude = PROLOG_TEST_CASE,
+)
+
+java_library(
+    name = "prolog_test_case",
+    testonly = 1,
+    srcs = PROLOG_TEST_CASE,
+    deps = [
+        "//java/com/google/gerrit:server",
+        "//java/com/google/gerrit/common:server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/testing:gerrit-test-util",
+        "//lib:guava",
+        "//lib:junit",
+        "//lib:truth",
+        "//lib/guice",
+        "//lib/prolog:runtime",
+    ],
+)
+
+junit_tests(
+    name = "prolog_tests",
+    srcs = PROLOG_TESTS,
+    resource_strip_prefix = "prologtests",
+    resources = ["//prologtests:gerrit_common_test"],
+    deps = TESTUTIL_DEPS + [
+        "//java/com/google/gerrit/testing:gerrit-test-util",
+        "//java/com/google/gerrit/server/project/testing:project-test-util",
+        "//prolog:gerrit-prolog-common",
+        ":prolog_test_case",
+        "//lib/prolog:runtime",
+    ],
+)
+
+QUERY_TESTS = glob(
+    ["server/query/**/*.java"],
+)
+
+java_library(
+    name = "query_tests_code",
+    testonly = 1,
+    srcs = QUERY_TESTS,
+    visibility = ["//visibility:public"],
+    deps = TESTUTIL_DEPS + [
+        "//java/com/google/gerrit/testing:gerrit-test-util",
+        "//prolog:gerrit-prolog-common",
+    ],
+)
+
+junit_tests(
+    name = "query_tests",
+    size = "large",
+    srcs = QUERY_TESTS,
+    visibility = ["//visibility:public"],
+    deps = TESTUTIL_DEPS + [
+        "//java/com/google/gerrit/testing:gerrit-test-util",
+        "//prolog:gerrit-prolog-common",
+    ],
+)
+
+junit_tests(
+    name = "server_tests",
+    size = "large",
+    srcs = glob(
+        ["**/*.java"],
+        exclude = CUSTOM_TRUTH_SUBJECTS + PROLOG_TESTS + PROLOG_TEST_CASE + QUERY_TESTS,
+    ),
+    resource_strip_prefix = "resources",
+    resources = ["//resources/com/google/gerrit:server"],
+    visibility = ["//visibility:public"],
+    deps = TESTUTIL_DEPS + [
+        ":custom-truth-subjects",
+        "//java/com/google/gerrit/extensions/client/testing:client-test-util",
+        "//java/com/google/gerrit/index:query_exception",
+        "//java/com/google/gerrit/server/project/testing:project-test-util",
+        "//java/com/google/gerrit/testing:gerrit-test-util",
+        "//java/org/eclipse/jgit:server",
+        "//java/com/google/gerrit/extensions/common/testing:common-test-util",
+        "//lib:args4j",
+        "//lib:grappa",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:guava-retrying",
+        "//lib:protobuf",
+        "//lib:truth-java8-extension",
+        "//lib/bouncycastle:bcprov",
+        "//lib/bouncycastle:bcpkix",
+        "//lib/guice:guice-assistedinject",
+        "//lib/prolog:runtime",
+        "//lib/commons:codec",
+        "//prolog:gerrit-prolog-common",
+    ],
+)
diff --git a/javatests/com/google/gerrit/acceptance/api/group/BUILD b/javatests/com/google/gerrit/acceptance/api/group/BUILD
index 4302a29..67412e8 100644
--- a/javatests/com/google/gerrit/acceptance/api/group/BUILD
+++ b/javatests/com/google/gerrit/acceptance/api/group/BUILD
@@ -14,7 +14,7 @@
     name = "util",
     srcs = ["GroupAssert.java"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:gwtorm",
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/BUILD b/javatests/com/google/gerrit/acceptance/rest/project/BUILD
index a602f99..7d43a60 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/BUILD
+++ b/javatests/com/google/gerrit/acceptance/rest/project/BUILD
@@ -17,7 +17,7 @@
         "RefAssert.java",
     ],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/extensions:api",
         "//lib:truth",
     ],
@@ -29,7 +29,7 @@
         "ProjectAssert.java",
     ],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:gwtorm",
diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD
index a7a5a8c..546d464 100644
--- a/javatests/com/google/gerrit/elasticsearch/BUILD
+++ b/javatests/com/google/gerrit/elasticsearch/BUILD
@@ -5,7 +5,7 @@
     testonly = 1,
     srcs = ["ElasticTestUtils.java"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/elasticsearch",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/index",
@@ -29,11 +29,11 @@
     ],
     deps = [
         ":elasticsearch_test_utils",
-        "//gerrit-server:query_tests_code",
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/elasticsearch",
         "//java/com/google/gerrit/server/project/testing:project-test-util",
         "//java/com/google/gerrit/testing:gerrit-test-util",
+        "//javatests/com/google/gerrit:query_tests_code",
         "//lib/guice",
         "//lib/jgit/org.eclipse.jgit:jgit",
         "//lib/jgit/org.eclipse.jgit.junit:junit",
diff --git a/javatests/com/google/gerrit/gpg/BUILD b/javatests/com/google/gerrit/gpg/BUILD
index f5bca2b..1c5c5a9 100644
--- a/javatests/com/google/gerrit/gpg/BUILD
+++ b/javatests/com/google/gerrit/gpg/BUILD
@@ -5,7 +5,7 @@
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/gpg",
diff --git a/javatests/com/google/gerrit/httpd/BUILD b/javatests/com/google/gerrit/httpd/BUILD
index 7617187..e6dc71c 100644
--- a/javatests/com/google/gerrit/httpd/BUILD
+++ b/javatests/com/google/gerrit/httpd/BUILD
@@ -4,7 +4,7 @@
     name = "httpd_tests",
     srcs = glob(["**/*.java"]),
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
diff --git a/javatests/com/google/gerrit/pgm/BUILD b/javatests/com/google/gerrit/pgm/BUILD
index 98b3914..aad8b14 100644
--- a/javatests/com/google/gerrit/pgm/BUILD
+++ b/javatests/com/google/gerrit/pgm/BUILD
@@ -5,7 +5,7 @@
     name = "pgm_tests",
     srcs = glob(["**/*.java"]),
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/pgm",
         "//java/com/google/gerrit/pgm/http",
diff --git a/gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java b/javatests/com/google/gerrit/rules/GerritCommonTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java
rename to javatests/com/google/gerrit/rules/GerritCommonTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/rules/PrologTestCase.java b/javatests/com/google/gerrit/rules/PrologTestCase.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/rules/PrologTestCase.java
rename to javatests/com/google/gerrit/rules/PrologTestCase.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/ChangeUtilTest.java b/javatests/com/google/gerrit/server/ChangeUtilTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/ChangeUtilTest.java
rename to javatests/com/google/gerrit/server/ChangeUtilTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java b/javatests/com/google/gerrit/server/IdentifiedUserTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java
rename to javatests/com/google/gerrit/server/IdentifiedUserTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java b/javatests/com/google/gerrit/server/StringUtilTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java
rename to javatests/com/google/gerrit/server/StringUtilTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/account/AuthorizedKeysTest.java b/javatests/com/google/gerrit/server/account/AuthorizedKeysTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/account/AuthorizedKeysTest.java
rename to javatests/com/google/gerrit/server/account/AuthorizedKeysTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/account/HashedPasswordTest.java b/javatests/com/google/gerrit/server/account/HashedPasswordTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/account/HashedPasswordTest.java
rename to javatests/com/google/gerrit/server/account/HashedPasswordTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java b/javatests/com/google/gerrit/server/account/UniversalGroupBackendTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java
rename to javatests/com/google/gerrit/server/account/UniversalGroupBackendTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/account/WatchConfigTest.java b/javatests/com/google/gerrit/server/account/WatchConfigTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/account/WatchConfigTest.java
rename to javatests/com/google/gerrit/server/account/WatchConfigTest.java
diff --git a/javatests/com/google/gerrit/server/cache/h2/BUILD b/javatests/com/google/gerrit/server/cache/h2/BUILD
index 41f0eca..117e8fa 100644
--- a/javatests/com/google/gerrit/server/cache/h2/BUILD
+++ b/javatests/com/google/gerrit/server/cache/h2/BUILD
@@ -4,7 +4,7 @@
     name = "tests",
     srcs = glob(["**/*.java"]),
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/server/cache/h2",
         "//lib:guava",
         "//lib:h2",
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/change/HashtagsTest.java b/javatests/com/google/gerrit/server/change/HashtagsTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/change/HashtagsTest.java
rename to javatests/com/google/gerrit/server/change/HashtagsTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/change/IncludedInResolverTest.java b/javatests/com/google/gerrit/server/change/IncludedInResolverTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/change/IncludedInResolverTest.java
rename to javatests/com/google/gerrit/server/change/IncludedInResolverTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/change/WalkSorterTest.java b/javatests/com/google/gerrit/server/change/WalkSorterTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/change/WalkSorterTest.java
rename to javatests/com/google/gerrit/server/change/WalkSorterTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java b/javatests/com/google/gerrit/server/config/ConfigUtilTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java
rename to javatests/com/google/gerrit/server/config/ConfigUtilTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/GitwebConfigTest.java b/javatests/com/google/gerrit/server/config/GitwebConfigTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/config/GitwebConfigTest.java
rename to javatests/com/google/gerrit/server/config/GitwebConfigTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/ListCapabilitiesTest.java b/javatests/com/google/gerrit/server/config/ListCapabilitiesTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/config/ListCapabilitiesTest.java
rename to javatests/com/google/gerrit/server/config/ListCapabilitiesTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/RepositoryConfigTest.java b/javatests/com/google/gerrit/server/config/RepositoryConfigTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/config/RepositoryConfigTest.java
rename to javatests/com/google/gerrit/server/config/RepositoryConfigTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/ScheduleConfigTest.java b/javatests/com/google/gerrit/server/config/ScheduleConfigTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/config/ScheduleConfigTest.java
rename to javatests/com/google/gerrit/server/config/ScheduleConfigTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java b/javatests/com/google/gerrit/server/config/SitePathsTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java
rename to javatests/com/google/gerrit/server/config/SitePathsTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/edit/ChangeEditTest.java b/javatests/com/google/gerrit/server/edit/ChangeEditTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/edit/ChangeEditTest.java
rename to javatests/com/google/gerrit/server/edit/ChangeEditTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/edit/tree/ChangeFileContentModificationSubject.java b/javatests/com/google/gerrit/server/edit/tree/ChangeFileContentModificationSubject.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/edit/tree/ChangeFileContentModificationSubject.java
rename to javatests/com/google/gerrit/server/edit/tree/ChangeFileContentModificationSubject.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/edit/tree/TreeModificationSubject.java b/javatests/com/google/gerrit/server/edit/tree/TreeModificationSubject.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/edit/tree/TreeModificationSubject.java
rename to javatests/com/google/gerrit/server/edit/tree/TreeModificationSubject.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java b/javatests/com/google/gerrit/server/events/EventDeserializerTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java
rename to javatests/com/google/gerrit/server/events/EventDeserializerTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventTypesTest.java b/javatests/com/google/gerrit/server/events/EventTypesTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/events/EventTypesTest.java
rename to javatests/com/google/gerrit/server/events/EventTypesTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/fixes/FixReplacementInterpreterTest.java b/javatests/com/google/gerrit/server/fixes/FixReplacementInterpreterTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/fixes/FixReplacementInterpreterTest.java
rename to javatests/com/google/gerrit/server/fixes/FixReplacementInterpreterTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/fixes/LineIdentifierTest.java b/javatests/com/google/gerrit/server/fixes/LineIdentifierTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/fixes/LineIdentifierTest.java
rename to javatests/com/google/gerrit/server/fixes/LineIdentifierTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/fixes/StringModifierTest.java b/javatests/com/google/gerrit/server/fixes/StringModifierTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/fixes/StringModifierTest.java
rename to javatests/com/google/gerrit/server/fixes/StringModifierTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/DestinationListTest.java b/javatests/com/google/gerrit/server/git/DestinationListTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/git/DestinationListTest.java
rename to javatests/com/google/gerrit/server/git/DestinationListTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/GroupCollectorTest.java b/javatests/com/google/gerrit/server/git/GroupCollectorTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/git/GroupCollectorTest.java
rename to javatests/com/google/gerrit/server/git/GroupCollectorTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/GroupListTest.java b/javatests/com/google/gerrit/server/git/GroupListTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/git/GroupListTest.java
rename to javatests/com/google/gerrit/server/git/GroupListTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/LabelNormalizerTest.java b/javatests/com/google/gerrit/server/git/LabelNormalizerTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/git/LabelNormalizerTest.java
rename to javatests/com/google/gerrit/server/git/LabelNormalizerTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java b/javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java
rename to javatests/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java b/javatests/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
rename to javatests/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/ProjectConfigTest.java b/javatests/com/google/gerrit/server/git/ProjectConfigTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/git/ProjectConfigTest.java
rename to javatests/com/google/gerrit/server/git/ProjectConfigTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/QueryListTest.java b/javatests/com/google/gerrit/server/git/QueryListTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/git/QueryListTest.java
rename to javatests/com/google/gerrit/server/git/QueryListTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/account/AccountFieldTest.java b/javatests/com/google/gerrit/server/index/account/AccountFieldTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/index/account/AccountFieldTest.java
rename to javatests/com/google/gerrit/server/index/account/AccountFieldTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeFieldTest.java b/javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeFieldTest.java
rename to javatests/com/google/gerrit/server/index/change/ChangeFieldTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java b/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java
rename to javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeChangeIndex.java b/javatests/com/google/gerrit/server/index/change/FakeChangeIndex.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeChangeIndex.java
rename to javatests/com/google/gerrit/server/index/change/FakeChangeIndex.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeQueryBuilder.java b/javatests/com/google/gerrit/server/index/change/FakeQueryBuilder.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/index/change/FakeQueryBuilder.java
rename to javatests/com/google/gerrit/server/index/change/FakeQueryBuilder.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/StalenessCheckerTest.java b/javatests/com/google/gerrit/server/index/change/StalenessCheckerTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/index/change/StalenessCheckerTest.java
rename to javatests/com/google/gerrit/server/index/change/StalenessCheckerTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java b/javatests/com/google/gerrit/server/ioutil/BasicSerializationTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/ioutil/BasicSerializationTest.java
rename to javatests/com/google/gerrit/server/ioutil/BasicSerializationTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/ColumnFormatterTest.java b/javatests/com/google/gerrit/server/ioutil/ColumnFormatterTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/ioutil/ColumnFormatterTest.java
rename to javatests/com/google/gerrit/server/ioutil/ColumnFormatterTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java b/javatests/com/google/gerrit/server/mail/AddressTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
rename to javatests/com/google/gerrit/server/mail/AddressTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/AbstractParserTest.java b/javatests/com/google/gerrit/server/mail/receive/AbstractParserTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/AbstractParserTest.java
rename to javatests/com/google/gerrit/server/mail/receive/AbstractParserTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GenericHtmlParserTest.java b/javatests/com/google/gerrit/server/mail/receive/GenericHtmlParserTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GenericHtmlParserTest.java
rename to javatests/com/google/gerrit/server/mail/receive/GenericHtmlParserTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GmailHtmlParserTest.java b/javatests/com/google/gerrit/server/mail/receive/GmailHtmlParserTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/GmailHtmlParserTest.java
rename to javatests/com/google/gerrit/server/mail/receive/GmailHtmlParserTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/HtmlParserTest.java b/javatests/com/google/gerrit/server/mail/receive/HtmlParserTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/HtmlParserTest.java
rename to javatests/com/google/gerrit/server/mail/receive/HtmlParserTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/MetadataParserTest.java b/javatests/com/google/gerrit/server/mail/receive/MetadataParserTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/MetadataParserTest.java
rename to javatests/com/google/gerrit/server/mail/receive/MetadataParserTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/ParserUtilTest.java b/javatests/com/google/gerrit/server/mail/receive/ParserUtilTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/ParserUtilTest.java
rename to javatests/com/google/gerrit/server/mail/receive/ParserUtilTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/RawMailParserTest.java b/javatests/com/google/gerrit/server/mail/receive/RawMailParserTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/RawMailParserTest.java
rename to javatests/com/google/gerrit/server/mail/receive/RawMailParserTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java b/javatests/com/google/gerrit/server/mail/receive/TextParserTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/TextParserTest.java
rename to javatests/com/google/gerrit/server/mail/receive/TextParserTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/AttachmentMessage.java b/javatests/com/google/gerrit/server/mail/receive/data/AttachmentMessage.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/AttachmentMessage.java
rename to javatests/com/google/gerrit/server/mail/receive/data/AttachmentMessage.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/Base64HeaderMessage.java b/javatests/com/google/gerrit/server/mail/receive/data/Base64HeaderMessage.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/Base64HeaderMessage.java
rename to javatests/com/google/gerrit/server/mail/receive/data/Base64HeaderMessage.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/HtmlMimeMessage.java b/javatests/com/google/gerrit/server/mail/receive/data/HtmlMimeMessage.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/HtmlMimeMessage.java
rename to javatests/com/google/gerrit/server/mail/receive/data/HtmlMimeMessage.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/NonUTF8Message.java b/javatests/com/google/gerrit/server/mail/receive/data/NonUTF8Message.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/NonUTF8Message.java
rename to javatests/com/google/gerrit/server/mail/receive/data/NonUTF8Message.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/QuotedPrintableHeaderMessage.java b/javatests/com/google/gerrit/server/mail/receive/data/QuotedPrintableHeaderMessage.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/QuotedPrintableHeaderMessage.java
rename to javatests/com/google/gerrit/server/mail/receive/data/QuotedPrintableHeaderMessage.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/RawMailMessage.java b/javatests/com/google/gerrit/server/mail/receive/data/RawMailMessage.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/RawMailMessage.java
rename to javatests/com/google/gerrit/server/mail/receive/data/RawMailMessage.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/SimpleTextMessage.java b/javatests/com/google/gerrit/server/mail/receive/data/SimpleTextMessage.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/data/SimpleTextMessage.java
rename to javatests/com/google/gerrit/server/mail/receive/data/SimpleTextMessage.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java b/javatests/com/google/gerrit/server/mail/send/CommentFormatterTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java
rename to javatests/com/google/gerrit/server/mail/send/CommentFormatterTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentSenderTest.java b/javatests/com/google/gerrit/server/mail/send/CommentSenderTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentSenderTest.java
rename to javatests/com/google/gerrit/server/mail/send/CommentSenderTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java b/javatests/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java
rename to javatests/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java
rename to javatests/com/google/gerrit/server/notedb/AbstractChangeNotesTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java b/javatests/com/google/gerrit/server/notedb/ChangeBundleTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeBundleTest.java
rename to javatests/com/google/gerrit/server/notedb/ChangeBundleTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesParserTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesParserTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesParserTest.java
rename to javatests/com/google/gerrit/server/notedb/ChangeNotesParserTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java b/javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/notedb/ChangeNotesTest.java
rename to javatests/com/google/gerrit/server/notedb/ChangeNotesTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/CommentTimestampAdapterTest.java b/javatests/com/google/gerrit/server/notedb/CommentTimestampAdapterTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/notedb/CommentTimestampAdapterTest.java
rename to javatests/com/google/gerrit/server/notedb/CommentTimestampAdapterTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/CommitMessageOutputTest.java b/javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/notedb/CommitMessageOutputTest.java
rename to javatests/com/google/gerrit/server/notedb/CommitMessageOutputTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/NoteDbChangeStateTest.java b/javatests/com/google/gerrit/server/notedb/NoteDbChangeStateTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/notedb/NoteDbChangeStateTest.java
rename to javatests/com/google/gerrit/server/notedb/NoteDbChangeStateTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/RepoSequenceTest.java b/javatests/com/google/gerrit/server/notedb/RepoSequenceTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/notedb/RepoSequenceTest.java
rename to javatests/com/google/gerrit/server/notedb/RepoSequenceTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/notedb/rebuild/EventSorterTest.java b/javatests/com/google/gerrit/server/notedb/rebuild/EventSorterTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/notedb/rebuild/EventSorterTest.java
rename to javatests/com/google/gerrit/server/notedb/rebuild/EventSorterTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/patch/IntraLineLoaderTest.java b/javatests/com/google/gerrit/server/patch/IntraLineLoaderTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/patch/IntraLineLoaderTest.java
rename to javatests/com/google/gerrit/server/patch/IntraLineLoaderTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java b/javatests/com/google/gerrit/server/patch/PatchListEntryTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java
rename to javatests/com/google/gerrit/server/patch/PatchListEntryTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListTest.java b/javatests/com/google/gerrit/server/patch/PatchListTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListTest.java
rename to javatests/com/google/gerrit/server/patch/PatchListTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/project/CommitsCollectionTest.java b/javatests/com/google/gerrit/server/project/CommitsCollectionTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/project/CommitsCollectionTest.java
rename to javatests/com/google/gerrit/server/project/CommitsCollectionTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java b/javatests/com/google/gerrit/server/project/RefControlTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java
rename to javatests/com/google/gerrit/server/project/RefControlTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java b/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
rename to javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/account/LuceneQueryAccountsTest.java b/javatests/com/google/gerrit/server/query/account/LuceneQueryAccountsTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/account/LuceneQueryAccountsTest.java
rename to javatests/com/google/gerrit/server/query/account/LuceneQueryAccountsTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
rename to javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/ChangeDataTest.java b/javatests/com/google/gerrit/server/query/change/ChangeDataTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/change/ChangeDataTest.java
rename to javatests/com/google/gerrit/server/query/change/ChangeDataTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java
rename to javatests/com/google/gerrit/server/query/change/LuceneQueryChangesTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/RegexPathPredicateTest.java b/javatests/com/google/gerrit/server/query/change/RegexPathPredicateTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/change/RegexPathPredicateTest.java
rename to javatests/com/google/gerrit/server/query/change/RegexPathPredicateTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java b/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
rename to javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/group/LuceneQueryGroupsTest.java b/javatests/com/google/gerrit/server/query/group/LuceneQueryGroupsTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/group/LuceneQueryGroupsTest.java
rename to javatests/com/google/gerrit/server/query/group/LuceneQueryGroupsTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java b/javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java
rename to javatests/com/google/gerrit/server/query/project/AbstractQueryProjectsTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/project/LuceneQueryProjectsTest.java b/javatests/com/google/gerrit/server/query/project/LuceneQueryProjectsTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/query/project/LuceneQueryProjectsTest.java
rename to javatests/com/google/gerrit/server/query/project/LuceneQueryProjectsTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/HANATest.java b/javatests/com/google/gerrit/server/schema/HANATest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/schema/HANATest.java
rename to javatests/com/google/gerrit/server/schema/HANATest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java b/javatests/com/google/gerrit/server/schema/SchemaCreatorTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java
rename to javatests/com/google/gerrit/server/schema/SchemaCreatorTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java b/javatests/com/google/gerrit/server/schema/SchemaUpdaterTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java
rename to javatests/com/google/gerrit/server/schema/SchemaUpdaterTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_150_to_151_Test.java b/javatests/com/google/gerrit/server/schema/Schema_150_to_151_Test.java
similarity index 98%
rename from gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_150_to_151_Test.java
rename to javatests/com/google/gerrit/server/schema/Schema_150_to_151_Test.java
index db8db0d..dc685fd 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_150_to_151_Test.java
+++ b/javatests/com/google/gerrit/server/schema/Schema_150_to_151_Test.java
@@ -28,7 +28,6 @@
 import com.google.gerrit.testing.SchemaUpgradeTestEnvironment;
 import com.google.gerrit.testing.TestUpdateUI;
 import com.google.gwtorm.jdbc.JdbcSchema;
-import com.google.gwtorm.server.ResultSet;
 import com.google.inject.Inject;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java b/javatests/com/google/gerrit/server/schema/Schema_159_to_160_Test.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/schema/Schema_159_to_160_Test.java
rename to javatests/com/google/gerrit/server/schema/Schema_159_to_160_Test.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java b/javatests/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
rename to javatests/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java b/javatests/com/google/gerrit/server/tools/hooks/HookTestCase.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/HookTestCase.java
rename to javatests/com/google/gerrit/server/tools/hooks/HookTestCase.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/update/BatchUpdateTest.java b/javatests/com/google/gerrit/server/update/BatchUpdateTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/update/BatchUpdateTest.java
rename to javatests/com/google/gerrit/server/update/BatchUpdateTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/update/RefUpdateUtilTest.java b/javatests/com/google/gerrit/server/update/RefUpdateUtilTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/update/RefUpdateUtilTest.java
rename to javatests/com/google/gerrit/server/update/RefUpdateUtilTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/update/RepoViewTest.java b/javatests/com/google/gerrit/server/update/RepoViewTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/update/RepoViewTest.java
rename to javatests/com/google/gerrit/server/update/RepoViewTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java b/javatests/com/google/gerrit/server/util/IdGeneratorTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java
rename to javatests/com/google/gerrit/server/util/IdGeneratorTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/LabelVoteTest.java b/javatests/com/google/gerrit/server/util/LabelVoteTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/util/LabelVoteTest.java
rename to javatests/com/google/gerrit/server/util/LabelVoteTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/MostSpecificComparatorTest.java b/javatests/com/google/gerrit/server/util/MostSpecificComparatorTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/util/MostSpecificComparatorTest.java
rename to javatests/com/google/gerrit/server/util/MostSpecificComparatorTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/ParboiledTest.java b/javatests/com/google/gerrit/server/util/ParboiledTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/util/ParboiledTest.java
rename to javatests/com/google/gerrit/server/util/ParboiledTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/RegexListSearcherTest.java b/javatests/com/google/gerrit/server/util/RegexListSearcherTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/util/RegexListSearcherTest.java
rename to javatests/com/google/gerrit/server/util/RegexListSearcherTest.java
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/SocketUtilTest.java b/javatests/com/google/gerrit/server/util/SocketUtilTest.java
similarity index 100%
rename from gerrit-server/src/test/java/com/google/gerrit/server/util/SocketUtilTest.java
rename to javatests/com/google/gerrit/server/util/SocketUtilTest.java
diff --git a/javatests/com/google/gerrit/sshd/BUILD b/javatests/com/google/gerrit/sshd/BUILD
index fb8c615..ee757e1 100644
--- a/javatests/com/google/gerrit/sshd/BUILD
+++ b/javatests/com/google/gerrit/sshd/BUILD
@@ -4,7 +4,7 @@
     name = "sshd_tests",
     srcs = glob(["**/*.java"]),
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/sshd",
         "//lib:truth",
diff --git a/javatests/com/google/gerrit/testing/BUILD b/javatests/com/google/gerrit/testing/BUILD
index 5829453..9c3d6a2 100644
--- a/javatests/com/google/gerrit/testing/BUILD
+++ b/javatests/com/google/gerrit/testing/BUILD
@@ -5,7 +5,7 @@
     size = "small",
     srcs = glob(["*.java"]),
     deps = [
-        "//gerrit-server:server",
+        "//java/com/google/gerrit:server",
         "//java/com/google/gerrit/testing:gerrit-test-util",
         "//lib:truth",
     ],
diff --git a/lib/asciidoctor/BUILD b/lib/asciidoctor/BUILD
index c7567d9..611a40c 100644
--- a/lib/asciidoctor/BUILD
+++ b/lib/asciidoctor/BUILD
@@ -31,7 +31,7 @@
     visibility = ["//visibility:public"],
     deps = [
         ":asciidoc_lib",
-        "//gerrit-server:constants",
+        "//java/com/google/gerrit:constants",
         "//lib:args4j",
         "//lib:guava",
         "//lib/lucene:lucene-analyzers-common",
diff --git a/plugins/BUILD b/plugins/BUILD
index fb29c0f..14de69a 100644
--- a/plugins/BUILD
+++ b/plugins/BUILD
@@ -18,8 +18,8 @@
 )
 
 PLUGIN_API = [
+    "//java/com/google/gerrit:server",
     "//java/com/google/gerrit/pgm/init/api",
-    "//gerrit-server:server",
     "//java/com/google/gerrit/httpd",
     "//java/com/google/gerrit/sshd",
 ]
@@ -96,7 +96,7 @@
     main_class = "Dummy",
     visibility = ["//visibility:public"],
     runtime_deps = [
-        "//gerrit-server:libserver-src.jar",
+        "//java/com/google/gerrit:libserver-src.jar",
         "//java/com/google/gerrit/common:libannotations-src.jar",
         "//java/com/google/gerrit/common:libserver-src.jar",
         "//java/com/google/gerrit/extensions:libapi-src.jar",
diff --git a/resources/com/google/gerrit/BUILD b/resources/com/google/gerrit/BUILD
new file mode 100644
index 0000000..688474e
--- /dev/null
+++ b/resources/com/google/gerrit/BUILD
@@ -0,0 +1,8 @@
+filegroup(
+    name = "server",
+    srcs = glob(
+        ["**/*"],
+        exclude = ["BUILD"],
+    ),
+    visibility = ["//visibility:public"],
+)
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/change/ChangeMessages.properties b/resources/com/google/gerrit/server/change/ChangeMessages.properties
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/change/ChangeMessages.properties
rename to resources/com/google/gerrit/server/change/ChangeMessages.properties
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/config/CapabilityConstants.properties b/resources/com/google/gerrit/server/config/CapabilityConstants.properties
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/config/CapabilityConstants.properties
rename to resources/com/google/gerrit/server/config/CapabilityConstants.properties
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/documentation/pegdown.css b/resources/com/google/gerrit/server/documentation/pegdown.css
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/documentation/pegdown.css
rename to resources/com/google/gerrit/server/documentation/pegdown.css
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Abandoned.soy b/resources/com/google/gerrit/server/mail/Abandoned.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/Abandoned.soy
rename to resources/com/google/gerrit/server/mail/Abandoned.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy b/resources/com/google/gerrit/server/mail/AbandonedHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/AbandonedHtml.soy
rename to resources/com/google/gerrit/server/mail/AbandonedHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AddKey.soy b/resources/com/google/gerrit/server/mail/AddKey.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/AddKey.soy
rename to resources/com/google/gerrit/server/mail/AddKey.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/AddKeyHtml.soy b/resources/com/google/gerrit/server/mail/AddKeyHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/AddKeyHtml.soy
rename to resources/com/google/gerrit/server/mail/AddKeyHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooter.soy b/resources/com/google/gerrit/server/mail/ChangeFooter.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooter.soy
rename to resources/com/google/gerrit/server/mail/ChangeFooter.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy b/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy
rename to resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeSubject.soy b/resources/com/google/gerrit/server/mail/ChangeSubject.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/ChangeSubject.soy
rename to resources/com/google/gerrit/server/mail/ChangeSubject.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Comment.soy b/resources/com/google/gerrit/server/mail/Comment.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/Comment.soy
rename to resources/com/google/gerrit/server/mail/Comment.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentFooter.soy b/resources/com/google/gerrit/server/mail/CommentFooter.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentFooter.soy
rename to resources/com/google/gerrit/server/mail/CommentFooter.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentFooterHtml.soy b/resources/com/google/gerrit/server/mail/CommentFooterHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentFooterHtml.soy
rename to resources/com/google/gerrit/server/mail/CommentFooterHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy b/resources/com/google/gerrit/server/mail/CommentHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/CommentHtml.soy
rename to resources/com/google/gerrit/server/mail/CommentHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewer.soy b/resources/com/google/gerrit/server/mail/DeleteReviewer.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewer.soy
rename to resources/com/google/gerrit/server/mail/DeleteReviewer.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy b/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy
rename to resources/com/google/gerrit/server/mail/DeleteReviewerHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVote.soy b/resources/com/google/gerrit/server/mail/DeleteVote.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVote.soy
rename to resources/com/google/gerrit/server/mail/DeleteVote.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy b/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy
rename to resources/com/google/gerrit/server/mail/DeleteVoteHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Footer.soy b/resources/com/google/gerrit/server/mail/Footer.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/Footer.soy
rename to resources/com/google/gerrit/server/mail/Footer.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/FooterHtml.soy b/resources/com/google/gerrit/server/mail/FooterHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/FooterHtml.soy
rename to resources/com/google/gerrit/server/mail/FooterHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/HeaderHtml.soy b/resources/com/google/gerrit/server/mail/HeaderHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/HeaderHtml.soy
rename to resources/com/google/gerrit/server/mail/HeaderHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Merged.soy b/resources/com/google/gerrit/server/mail/Merged.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/Merged.soy
rename to resources/com/google/gerrit/server/mail/Merged.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy b/resources/com/google/gerrit/server/mail/MergedHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/MergedHtml.soy
rename to resources/com/google/gerrit/server/mail/MergedHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChange.soy b/resources/com/google/gerrit/server/mail/NewChange.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChange.soy
rename to resources/com/google/gerrit/server/mail/NewChange.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy b/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
rename to resources/com/google/gerrit/server/mail/NewChangeHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Private.soy b/resources/com/google/gerrit/server/mail/Private.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/Private.soy
rename to resources/com/google/gerrit/server/mail/Private.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RegisterNewEmail.soy b/resources/com/google/gerrit/server/mail/RegisterNewEmail.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/RegisterNewEmail.soy
rename to resources/com/google/gerrit/server/mail/RegisterNewEmail.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy b/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy
rename to resources/com/google/gerrit/server/mail/ReplacePatchSet.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy b/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
rename to resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Restored.soy b/resources/com/google/gerrit/server/mail/Restored.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/Restored.soy
rename to resources/com/google/gerrit/server/mail/Restored.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy b/resources/com/google/gerrit/server/mail/RestoredHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/RestoredHtml.soy
rename to resources/com/google/gerrit/server/mail/RestoredHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/Reverted.soy b/resources/com/google/gerrit/server/mail/Reverted.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/Reverted.soy
rename to resources/com/google/gerrit/server/mail/Reverted.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy b/resources/com/google/gerrit/server/mail/RevertedHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/RevertedHtml.soy
rename to resources/com/google/gerrit/server/mail/RevertedHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/SetAssignee.soy b/resources/com/google/gerrit/server/mail/SetAssignee.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/SetAssignee.soy
rename to resources/com/google/gerrit/server/mail/SetAssignee.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mail/SetAssigneeHtml.soy b/resources/com/google/gerrit/server/mail/SetAssigneeHtml.soy
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mail/SetAssigneeHtml.soy
rename to resources/com/google/gerrit/server/mail/SetAssigneeHtml.soy
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/mime/mime-types.properties b/resources/com/google/gerrit/server/mime/mime-types.properties
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/mime/mime-types.properties
rename to resources/com/google/gerrit/server/mime/mime-types.properties
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/TOC b/resources/com/google/gerrit/server/tools/root/TOC
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/TOC
rename to resources/com/google/gerrit/server/tools/root/TOC
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/bin/gerrit-cherry-pick b/resources/com/google/gerrit/server/tools/root/bin/gerrit-cherry-pick
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/bin/gerrit-cherry-pick
rename to resources/com/google/gerrit/server/tools/root/bin/gerrit-cherry-pick
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/hooks/commit-msg b/resources/com/google/gerrit/server/tools/root/hooks/commit-msg
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/hooks/commit-msg
rename to resources/com/google/gerrit/server/tools/root/hooks/commit-msg
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/scripts/preview_submit_test.sh b/resources/com/google/gerrit/server/tools/root/scripts/preview_submit_test.sh
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/scripts/preview_submit_test.sh
rename to resources/com/google/gerrit/server/tools/root/scripts/preview_submit_test.sh
diff --git a/gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/scripts/reposize.sh b/resources/com/google/gerrit/server/tools/root/scripts/reposize.sh
similarity index 100%
rename from gerrit-server/src/main/resources/com/google/gerrit/server/tools/root/scripts/reposize.sh
rename to resources/com/google/gerrit/server/tools/root/scripts/reposize.sh
diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index 1982914..7ad0323 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -9,15 +9,15 @@
 
 TEST_DEPS = [
     "//gerrit-gwtui:ui_tests",
-    "//gerrit-server:server_tests",
+    "//javatests/com/google/gerrit:server_tests",
 ]
 
 DEPS = [
     "//gerrit-gwtdebug:gwtdebug",
     "//gerrit-gwtui:ui_module",
     "//gerrit-plugin-gwtui:gwtui-api-lib",
-    "//gerrit-server:server",
     "//java/com/google/gerrit/acceptance:lib",
+    "//java/com/google/gerrit:server",
     "//lib/asciidoctor:asciidoc_lib",
     "//lib/asciidoctor:doc_indexer_lib",
     "//lib/auto:auto-value",