diff --git a/java/com/google/domain/registry/module/tools/BUILD b/java/com/google/domain/registry/module/tools/BUILD
index 618dcb064..800d53098 100644
--- a/java/com/google/domain/registry/module/tools/BUILD
+++ b/java/com/google/domain/registry/module/tools/BUILD
@@ -18,7 +18,6 @@ java_library(
         "//java/com/google/domain/registry/mapreduce",
         "//java/com/google/domain/registry/request",
         "//java/com/google/domain/registry/request:modules",
-        "//java/com/google/domain/registry/tools/mapreduce",
         "//java/com/google/domain/registry/tools/server",
         "//java/com/google/domain/registry/util",
         "//third_party/java/bouncycastle",
diff --git a/java/com/google/domain/registry/module/tools/ToolsRequestComponent.java b/java/com/google/domain/registry/module/tools/ToolsRequestComponent.java
index cc6d30e0a..a232907f5 100644
--- a/java/com/google/domain/registry/module/tools/ToolsRequestComponent.java
+++ b/java/com/google/domain/registry/module/tools/ToolsRequestComponent.java
@@ -20,11 +20,10 @@ import com.google.domain.registry.loadtest.LoadTestModule;
 import com.google.domain.registry.mapreduce.MapreduceModule;
 import com.google.domain.registry.request.RequestModule;
 import com.google.domain.registry.request.RequestScope;
-import com.google.domain.registry.tools.mapreduce.DeleteProberDataAction;
-import com.google.domain.registry.tools.mapreduce.ResaveAllEppResourcesAction;
 import com.google.domain.registry.tools.server.CreateGroupsAction;
 import com.google.domain.registry.tools.server.CreatePremiumListAction;
 import com.google.domain.registry.tools.server.DeleteEntityAction;
+import com.google.domain.registry.tools.server.DeleteProberDataAction;
 import com.google.domain.registry.tools.server.GenerateZoneFilesAction;
 import com.google.domain.registry.tools.server.KillAllCommitLogsAction;
 import com.google.domain.registry.tools.server.KillAllEppResourcesAction;
@@ -34,6 +33,7 @@ import com.google.domain.registry.tools.server.ListPremiumListsAction;
 import com.google.domain.registry.tools.server.ListRegistrarsAction;
 import com.google.domain.registry.tools.server.ListReservedListsAction;
 import com.google.domain.registry.tools.server.ListTldsAction;
+import com.google.domain.registry.tools.server.ResaveAllEppResourcesAction;
 import com.google.domain.registry.tools.server.ToolsServerModule;
 import com.google.domain.registry.tools.server.UpdatePremiumListAction;
 import com.google.domain.registry.tools.server.VerifyOteAction;
diff --git a/java/com/google/domain/registry/tools/mapreduce/BUILD b/java/com/google/domain/registry/tools/mapreduce/BUILD
deleted file mode 100644
index 20fd66da2..000000000
--- a/java/com/google/domain/registry/tools/mapreduce/BUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
-)
-
-
-java_library(
-    name = "mapreduce",
-    srcs = glob(["*.java"]),
-    deps = [
-        "//java/com/google/common/annotations",
-        "//java/com/google/common/base",
-        "//java/com/google/common/collect",
-        "//java/com/google/common/net",
-        "//java/com/google/common/primitives",
-        "//java/com/google/common/util/concurrent",
-        "//java/com/google/domain/registry/mapreduce",
-        "//java/com/google/domain/registry/mapreduce/inputs",
-        "//java/com/google/domain/registry/model",
-        "//java/com/google/domain/registry/request",
-        "//java/com/google/domain/registry/util",
-        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
-        "//third_party/java/dagger",
-        "//third_party/java/jcommander",
-        "//third_party/java/joda_money",
-        "//third_party/java/joda_time",
-        "//third_party/java/jsr305_annotations",
-        "//third_party/java/jsr330_inject",
-        "//third_party/java/objectify:objectify-v4_1",
-    ],
-)
diff --git a/java/com/google/domain/registry/tools/server/BUILD b/java/com/google/domain/registry/tools/server/BUILD
index a2f39fb02..52cea9b01 100644
--- a/java/com/google/domain/registry/tools/server/BUILD
+++ b/java/com/google/domain/registry/tools/server/BUILD
@@ -5,11 +5,15 @@ package(
 
 java_library(
     name = "server",
-    srcs = glob(["**/*.java"]),
+    srcs = glob(["*.java"]),
     deps = [
+        "//java/com/google/common/annotations",
         "//java/com/google/common/base",
         "//java/com/google/common/collect",
         "//java/com/google/common/io",
+        "//java/com/google/common/net",
+        "//java/com/google/common/primitives",
+        "//java/com/google/common/util/concurrent",
         "//java/com/google/domain/registry/config",
         "//java/com/google/domain/registry/export",
         "//java/com/google/domain/registry/flows",
@@ -24,6 +28,8 @@ java_library(
         "//third_party/java/appengine_gcs_client",
         "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
         "//third_party/java/dagger",
+        "//third_party/java/jcommander",
+        "//third_party/java/joda_money",
         "//third_party/java/joda_time",
         "//third_party/java/jsr305_annotations",
         "//third_party/java/jsr330_inject",
diff --git a/java/com/google/domain/registry/tools/mapreduce/DeleteProberDataAction.java b/java/com/google/domain/registry/tools/server/DeleteProberDataAction.java
similarity index 99%
rename from java/com/google/domain/registry/tools/mapreduce/DeleteProberDataAction.java
rename to java/com/google/domain/registry/tools/server/DeleteProberDataAction.java
index dcf177eed..505372832 100644
--- a/java/com/google/domain/registry/tools/mapreduce/DeleteProberDataAction.java
+++ b/java/com/google/domain/registry/tools/server/DeleteProberDataAction.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools.mapreduce;
+package com.google.domain.registry.tools.server;
 
 import static com.google.common.base.Verify.verifyNotNull;
 import static com.google.domain.registry.mapreduce.MapreduceRunner.PARAM_DRY_RUN;
diff --git a/java/com/google/domain/registry/tools/mapreduce/ResaveAllEppResourcesAction.java b/java/com/google/domain/registry/tools/server/ResaveAllEppResourcesAction.java
similarity index 98%
rename from java/com/google/domain/registry/tools/mapreduce/ResaveAllEppResourcesAction.java
rename to java/com/google/domain/registry/tools/server/ResaveAllEppResourcesAction.java
index 85be002c7..f6debe7ce 100644
--- a/java/com/google/domain/registry/tools/mapreduce/ResaveAllEppResourcesAction.java
+++ b/java/com/google/domain/registry/tools/server/ResaveAllEppResourcesAction.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools.mapreduce;
+package com.google.domain.registry.tools.server;
 
 import static com.google.domain.registry.mapreduce.inputs.EppResourceInputs.createEntityInput;
 import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
diff --git a/javatests/com/google/domain/registry/tools/mapreduce/BUILD b/javatests/com/google/domain/registry/tools/mapreduce/BUILD
deleted file mode 100644
index 1fd79680d..000000000
--- a/javatests/com/google/domain/registry/tools/mapreduce/BUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
-)
-
-
-java_library(
-    name = "mapreduce",
-    srcs = glob(["*.java"]),
-    deps = [
-        "//java/com/google/common/base",
-        "//java/com/google/common/collect",
-        "//java/com/google/common/io",
-        "//java/com/google/domain/registry/mapreduce",
-        "//java/com/google/domain/registry/model",
-        "//java/com/google/domain/registry/tools/mapreduce",
-        "//java/com/google/domain/registry/util",
-        "//javatests/com/google/domain/registry/testing",
-        "//javatests/com/google/domain/registry/testing/mapreduce",
-        "//third_party/java/appengine:appengine-api",
-        "//third_party/java/appengine_mapreduce2:appengine_mapreduce",
-        "//third_party/java/appengine_pipeline",
-        "//third_party/java/hamcrest",
-        "//third_party/java/jcommander",
-        "//third_party/java/joda_money",
-        "//third_party/java/joda_time",
-        "//third_party/java/junit",
-        "//third_party/java/mockito",
-        "//third_party/java/objectify:objectify-v4_1",
-        "//third_party/java/servlet/servlet_api",
-        "//third_party/java/truth",
-    ],
-)
-
-load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules")
-
-GenTestRules(
-    name = "GeneratedTestRules",
-    test_files = glob(["*Test.java"]),
-    deps = [":mapreduce"],
-)
diff --git a/javatests/com/google/domain/registry/tools/server/BUILD b/javatests/com/google/domain/registry/tools/server/BUILD
index 586b4ea73..c6fbbd072 100644
--- a/javatests/com/google/domain/registry/tools/server/BUILD
+++ b/javatests/com/google/domain/registry/tools/server/BUILD
@@ -7,8 +7,8 @@ load("//java/com/google/testing/builddefs:GenTestRules.bzl", "GenTestRules")
 
 java_library(
     name = "server",
-    srcs = glob(["**/*.java"]),
-    resources = glob(["**/testdata/*"]),
+    srcs = glob(["*.java"]),
+    resources = glob(["testdata/*"]),
     deps = [
         "//java/com/google/common/base",
         "//java/com/google/common/collect",
diff --git a/javatests/com/google/domain/registry/tools/mapreduce/DeleteProberDataActionTest.java b/javatests/com/google/domain/registry/tools/server/DeleteProberDataActionTest.java
similarity index 99%
rename from javatests/com/google/domain/registry/tools/mapreduce/DeleteProberDataActionTest.java
rename to javatests/com/google/domain/registry/tools/server/DeleteProberDataActionTest.java
index 72c44eaf6..badd448fb 100644
--- a/javatests/com/google/domain/registry/tools/mapreduce/DeleteProberDataActionTest.java
+++ b/javatests/com/google/domain/registry/tools/server/DeleteProberDataActionTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools.mapreduce;
+package com.google.domain.registry.tools.server;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
diff --git a/javatests/com/google/domain/registry/tools/mapreduce/ResaveAllEppResourcesActionTest.java b/javatests/com/google/domain/registry/tools/server/ResaveAllEppResourcesActionTest.java
similarity index 97%
rename from javatests/com/google/domain/registry/tools/mapreduce/ResaveAllEppResourcesActionTest.java
rename to javatests/com/google/domain/registry/tools/server/ResaveAllEppResourcesActionTest.java
index 95610c595..e9622a17e 100644
--- a/javatests/com/google/domain/registry/tools/mapreduce/ResaveAllEppResourcesActionTest.java
+++ b/javatests/com/google/domain/registry/tools/server/ResaveAllEppResourcesActionTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools.mapreduce;
+package com.google.domain.registry.tools.server;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;