diff --git a/Documentation/BUILD b/Documentation/BUILD
index 624802ca3a..ca5546e707 100644
--- a/Documentation/BUILD
+++ b/Documentation/BUILD
@@ -19,14 +19,14 @@ filegroup(
 
 genrule(
     name = "prettify_min_css",
-    srcs = ["//gerrit-prettify:src/main/resources/com/google/gerrit/prettify/client/prettify.css"],
+    srcs = ["//resources/com/google/gerrit/prettify:client/prettify.css"],
     outs = ["prettify.min.css"],
     cmd = "cp $< $@",
 )
 
 genrule(
     name = "prettify_min_js",
-    srcs = ["//gerrit-prettify:src/main/resources/com/google/gerrit/prettify/client/prettify.js"],
+    srcs = ["//resources/com/google/gerrit/prettify:client/prettify.js"],
     outs = ["prettify.min.js"],
     cmd = "cp $< $@",
 )
diff --git a/gerrit-common/BUILD b/gerrit-common/BUILD
index 6fae3f0636..23e29b918a 100644
--- a/gerrit-common/BUILD
+++ b/gerrit-common/BUILD
@@ -22,8 +22,8 @@ gwt_module(
     name = "client",
     srcs = glob([SRC + "common/**/*.java"]),
     exported_deps = [
-        "//gerrit-prettify:client",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/prettify:client",
         "//lib:guava",
         "//lib:gwtorm_client",
         "//lib:servlet-api-3_1",
@@ -43,8 +43,8 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         ":annotations",
-        "//gerrit-prettify:server",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/org/eclipse/jgit:server",
         "//lib:guava",
diff --git a/gerrit-httpd/BUILD b/gerrit-httpd/BUILD
index 286cadbe2f..80f66cf034 100644
--- a/gerrit-httpd/BUILD
+++ b/gerrit-httpd/BUILD
@@ -20,13 +20,13 @@ java_library(
         "//gerrit-common:server",
         "//gerrit-index:query_exception",
         "//gerrit-launcher:launcher",
-        "//gerrit-prettify:server",
         "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-util-cli:cli",
         "//gerrit-util-http:http",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gwtexpui/linker:server",
         "//java/com/google/gwtexpui/server",
diff --git a/gerrit-plugin-gwtui/BUILD b/gerrit-plugin-gwtui/BUILD
index 65565ab5c1..14069ba6ef 100644
--- a/gerrit-plugin-gwtui/BUILD
+++ b/gerrit-plugin-gwtui/BUILD
@@ -31,7 +31,7 @@ java_library2(
         "//java/com/google/gwtexpui/safehtml:libsafehtml-src.jar",
         "//java/com/google/gwtexpui/user:libagent-src.jar",
         "//gerrit-gwtui-common:libclient-src.jar",
-        "//gerrit-prettify:libclient-src.jar",
+        "//java/com/google/gerrit/prettify:libclient-src.jar",
         "//java/com/google/gerrit/reviewdb:libclient-src.jar",
         "//lib/gwt:dev-neverlink",
     ],
diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
index 4560f61a66..57e7a6a1ad 100644
--- a/gerrit-server/BUILD
+++ b/gerrit-server/BUILD
@@ -45,10 +45,10 @@ java_library(
         "//gerrit-index:index",
         "//gerrit-index:query_exception",
         "//gerrit-patch-commonsnet:commons-net",
-        "//gerrit-prettify:server",
         "//gerrit-util-cli:cli",
         "//gerrit-util-ssl:ssl",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/org/eclipse/jgit:server",
         "//lib:args4j",
diff --git a/gerrit-prettify/BUILD b/java/com/google/gerrit/prettify/BUILD
similarity index 67%
rename from gerrit-prettify/BUILD
rename to java/com/google/gerrit/prettify/BUILD
index 13f4b89188..366a1a0d19 100644
--- a/gerrit-prettify/BUILD
+++ b/java/com/google/gerrit/prettify/BUILD
@@ -1,12 +1,8 @@
 load("//tools/bzl:gwt.bzl", "gwt_module")
 
-SRC = "src/main/java/com/google/gerrit/prettify/"
-
 gwt_module(
     name = "client",
-    srcs = glob([
-        SRC + "common/**/*.java",
-    ]),
+    srcs = glob(["common/**/*.java"]),
     exported_deps = [
         "//java/com/google/gerrit/extensions:client",
         "//java/com/google/gerrit/reviewdb:client",
@@ -16,14 +12,14 @@ gwt_module(
         "//lib:gwtjsonrpc",
         "//lib:gwtjsonrpc_src",
     ],
-    gwt_xml = SRC + "PrettyFormatter.gwt.xml",
+    gwt_xml = "PrettyFormatter.gwt.xml",
     visibility = ["//visibility:public"],
     deps = ["//lib/gwt:user-neverlink"],
 )
 
 java_library(
     name = "server",
-    srcs = glob([SRC + "common/**/*.java"]),
+    srcs = glob(["common/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/gerrit/reviewdb:server",
@@ -33,8 +29,3 @@ java_library(
         "//lib/jgit/org.eclipse.jgit:jgit",
     ],
 )
-
-exports_files([
-    "src/main/resources/com/google/gerrit/prettify/client/prettify.css",
-    "src/main/resources/com/google/gerrit/prettify/client/prettify.js",
-])
diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/PrettyFormatter.gwt.xml b/java/com/google/gerrit/prettify/PrettyFormatter.gwt.xml
similarity index 100%
rename from gerrit-prettify/src/main/java/com/google/gerrit/prettify/PrettyFormatter.gwt.xml
rename to java/com/google/gerrit/prettify/PrettyFormatter.gwt.xml
diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java b/java/com/google/gerrit/prettify/common/EditList.java
similarity index 100%
rename from gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/EditList.java
rename to java/com/google/gerrit/prettify/common/EditList.java
diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java b/java/com/google/gerrit/prettify/common/SparseFileContent.java
similarity index 100%
rename from gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/SparseFileContent.java
rename to java/com/google/gerrit/prettify/common/SparseFileContent.java
diff --git a/resources/com/google/gerrit/prettify/BUILD b/resources/com/google/gerrit/prettify/BUILD
new file mode 100644
index 0000000000..3bae8adae9
--- /dev/null
+++ b/resources/com/google/gerrit/prettify/BUILD
@@ -0,0 +1,4 @@
+exports_files([
+    "client/prettify.css",
+    "client/prettify.js",
+])
diff --git a/gerrit-prettify/src/main/resources/com/google/gerrit/prettify/client/prettify.css b/resources/com/google/gerrit/prettify/client/prettify.css
similarity index 100%
rename from gerrit-prettify/src/main/resources/com/google/gerrit/prettify/client/prettify.css
rename to resources/com/google/gerrit/prettify/client/prettify.css
diff --git a/gerrit-prettify/src/main/resources/com/google/gerrit/prettify/client/prettify.js b/resources/com/google/gerrit/prettify/client/prettify.js
similarity index 100%
rename from gerrit-prettify/src/main/resources/com/google/gerrit/prettify/client/prettify.js
rename to resources/com/google/gerrit/prettify/client/prettify.js