Reorganize BUILD files.

--
MOS_MIGRATED_REVID=108985661

src/BUILD

@@ -19,7 +19,7 @@ filegroup(
 [genrule(
     name = "install_base_key-file" + suffix,
     srcs = [
-        "//src/main/java/com/google/devtools/build/lib:bazel-main_deploy.jar",
+        "//src/main/java/com/google/devtools/build/lib:bazel/BazelServer_deploy.jar",
         "//src/main/cpp:client",
         ":libunix",
         "//src/main/tools:build-runfiles",
@@ -93,7 +93,7 @@ genrule(
         # The script assumes that the embedded tools zip (if exists) is the
         # first item here, the deploy jar the second and install base key is the
         # third
-        "//src/main/java/com/google/devtools/build/lib:bazel-main_deploy.jar",
+        "//src/main/java/com/google/devtools/build/lib:bazel/BazelServer_deploy.jar",
         "install_base_key" + suffix,
         "//src/main/cpp:client",
         ":libunix",

src/main/java/com/google/devtools/build/docgen/BUILD

@@ -1,41 +1,17 @@
-package(default_visibility = ["//src:__subpackages__"])
-
-java_library(
-    name = "docgen",
-    srcs = glob([
-        "**/*.java",
-    ]),
-    deps = [
-        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
-        "//src/main/java/com/google/devtools/build/lib:common",
-        "//src/main/java/com/google/devtools/build/lib:concurrent",
-        "//src/main/java/com/google/devtools/build/lib:packages",
-        "//src/main/java/com/google/devtools/build/lib:util",
-        "//third_party:apache_velocity",
-        "//third_party:guava",
-    ],
+# Description:
+#   Documentation generator for Bazel
+package(
+    default_visibility = ["//src:__subpackages__"],
 )
 
 java_library(
     name = "docgen_javalib",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = [
-            "BuildEncyclopediaGenerator.java",
-            "SkylarkDocumentationGenerator.java",
-        ],
-    ),
-    resources = [":be-template_files"],
-    exports = [
-        "//src/main/java/com/google/devtools/build/lib:bazel-core",
-    ],
+    srcs = glob(["**/*.java"]),
+    resources = [":template_files"],
     deps = [
-        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
-        "//src/main/java/com/google/devtools/build/lib:bazel-core",
+        "//src/main/java/com/google/devtools/build/lib:build-base",
         "//src/main/java/com/google/devtools/build/lib:common",
-        "//src/main/java/com/google/devtools/build/lib:concurrent",
         "//src/main/java/com/google/devtools/build/lib:packages",
-        "//src/main/java/com/google/devtools/build/lib:util",
         "//third_party:apache_velocity",
         "//third_party:guava",
         "//third_party:jsr305",
@@ -48,13 +24,21 @@ java_binary(
     main_class = "com.google.devtools.build.docgen.BuildEncyclopediaGenerator",
     deps = [
         ":docgen_javalib",
-        "//src/main/java/com/google/devtools/build/lib:analysis-exec-rules-skyframe",
+        "//src/main/java/com/google/devtools/build/lib:bazel-rules",
+        "//src/main/java/com/google/devtools/build/lib:build-base",
         "//src/main/java/com/google/devtools/build/lib:common",
     ],
 )
 
+java_binary(
+    name = "skydoc_bin",
+    srcs = ["SkylarkDocumentationGenerator.java"],
+    main_class = "com.google.devtools.build.docgen.SkylarkDocumentationGenerator",
+    deps = [":docgen_javalib"],
+)
+
 filegroup(
-    name = "be-template_files",
+    name = "template_files",
     srcs = glob([
         "templates/**/*.html",
         "templates/**/*.vm",
@@ -65,10 +49,3 @@ filegroup(
     name = "srcs",
     srcs = glob(["**"]),
 )
-
-java_binary(
-    name = "skydoc_bin",
-    srcs = ["SkylarkDocumentationGenerator.java"],
-    main_class = "com.google.devtools.build.docgen.SkylarkDocumentationGenerator",
-    deps = [":docgen_javalib"],
-)