diff --git a/java/google/registry/dns/BUILD b/java/google/registry/dns/BUILD
index fcb7ce0c1..75c5c3244 100644
--- a/java/google/registry/dns/BUILD
+++ b/java/google/registry/dns/BUILD
@@ -38,7 +38,6 @@ java_library(
         "//third_party/java/objectify:objectify-v4_1",
         "//third_party/java/servlet/servlet_api",
         "//java/google/registry/config",
-        "//java/google/registry/dns/writer/api",
         "//java/google/registry/model",
         "//java/google/registry/request",
         "//java/google/registry/util",
diff --git a/java/google/registry/dns/DnsModule.java b/java/google/registry/dns/DnsModule.java
index 12ad4fa43..d5aaf491b 100644
--- a/java/google/registry/dns/DnsModule.java
+++ b/java/google/registry/dns/DnsModule.java
@@ -30,7 +30,7 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import google.registry.dns.DnsConstants.TargetType;
-import google.registry.dns.writer.api.DnsWriterZone;
+import google.registry.model.dns.DnsWriterZone;
 import google.registry.request.Parameter;
 import google.registry.request.RequestParameters;
 import java.util.Set;
diff --git a/java/google/registry/dns/PublishDnsUpdatesAction.java b/java/google/registry/dns/PublishDnsUpdatesAction.java
index 111c86543..2ea2d045f 100644
--- a/java/google/registry/dns/PublishDnsUpdatesAction.java
+++ b/java/google/registry/dns/PublishDnsUpdatesAction.java
@@ -20,7 +20,7 @@ import static google.registry.util.CollectionUtils.nullToEmpty;
 
 import com.google.common.net.InternetDomainName;
 import google.registry.config.ConfigModule.Config;
-import google.registry.dns.writer.api.DnsWriter;
+import google.registry.model.dns.DnsWriter;
 import google.registry.request.Action;
 import google.registry.request.HttpException.ServiceUnavailableException;
 import google.registry.request.Parameter;
diff --git a/java/google/registry/dns/writer/api/BUILD b/java/google/registry/dns/writer/BUILD
similarity index 82%
rename from java/google/registry/dns/writer/api/BUILD
rename to java/google/registry/dns/writer/BUILD
index 24f7e44dc..8ddc01bf8 100644
--- a/java/google/registry/dns/writer/api/BUILD
+++ b/java/google/registry/dns/writer/BUILD
@@ -6,13 +6,13 @@ licenses(["notice"])  # Apache 2.0
 
 
 java_library(
-    name = "api",
+    name = "writer",
     srcs = glob(["*.java"]),
-    compatible_with = ["//buildenv/target:appengine"],
     deps = [
         "//java/com/google/common/base",
         "//third_party/java/dagger",
         "//third_party/java/jsr305_annotations",
         "//third_party/java/jsr330_inject",
+        "//java/google/registry/model",
     ],
 )
diff --git a/java/google/registry/dns/writer/api/VoidDnsWriter.java b/java/google/registry/dns/writer/VoidDnsWriter.java
similarity index 94%
rename from java/google/registry/dns/writer/api/VoidDnsWriter.java
rename to java/google/registry/dns/writer/VoidDnsWriter.java
index 2cc0788b6..88d9895a5 100644
--- a/java/google/registry/dns/writer/api/VoidDnsWriter.java
+++ b/java/google/registry/dns/writer/VoidDnsWriter.java
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package google.registry.dns.writer.api;
+package google.registry.dns.writer;
 
 import com.google.common.base.Joiner;
+import google.registry.model.dns.DnsWriter;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Logger;
diff --git a/java/google/registry/dns/writer/api/VoidDnsWriterModule.java b/java/google/registry/dns/writer/VoidDnsWriterModule.java
similarity index 91%
rename from java/google/registry/dns/writer/api/VoidDnsWriterModule.java
rename to java/google/registry/dns/writer/VoidDnsWriterModule.java
index dd29f1935..7e1698c0b 100644
--- a/java/google/registry/dns/writer/api/VoidDnsWriterModule.java
+++ b/java/google/registry/dns/writer/VoidDnsWriterModule.java
@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package google.registry.dns.writer.api;
+package google.registry.dns.writer;
 
 import dagger.Module;
 import dagger.Provides;
+import google.registry.model.dns.DnsWriter;
 
 /** Dagger module that disables DNS updates. */
 @Module
diff --git a/java/google/registry/dns/writer/dnsupdate/BUILD b/java/google/registry/dns/writer/dnsupdate/BUILD
index 90da96322..5e7edb066 100644
--- a/java/google/registry/dns/writer/dnsupdate/BUILD
+++ b/java/google/registry/dns/writer/dnsupdate/BUILD
@@ -21,7 +21,6 @@ java_library(
         "//third_party/java/jsr305_annotations",
         "//third_party/java/jsr330_inject",
         "//java/google/registry/config",
-        "//java/google/registry/dns/writer/api",
         "//java/google/registry/model",
         "//java/google/registry/util",
     ],
diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
index 5345c3109..30b688870 100644
--- a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
+++ b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriter.java
@@ -19,7 +19,7 @@ import static google.registry.model.EppResourceUtils.loadByUniqueId;
 
 import com.google.common.net.InternetDomainName;
 import google.registry.config.ConfigModule.Config;
-import google.registry.dns.writer.api.DnsWriter;
+import google.registry.model.dns.DnsWriter;
 import google.registry.model.domain.DomainResource;
 import google.registry.model.domain.secdns.DelegationSignerData;
 import google.registry.model.host.HostResource;
diff --git a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java
index 66992f32c..f3df1b7af 100644
--- a/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java
+++ b/java/google/registry/dns/writer/dnsupdate/DnsUpdateWriterModule.java
@@ -17,7 +17,7 @@ package google.registry.dns.writer.dnsupdate;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
-import google.registry.dns.writer.api.DnsWriter;
+import google.registry.model.dns.DnsWriter;
 import javax.net.SocketFactory;
 
 /** Dagger module that provides a DnsUpdateWriter. */
diff --git a/java/google/registry/dns/writer/api/DnsWriter.java b/java/google/registry/model/dns/DnsWriter.java
similarity index 98%
rename from java/google/registry/dns/writer/api/DnsWriter.java
rename to java/google/registry/model/dns/DnsWriter.java
index be24b52cf..a8bb59346 100644
--- a/java/google/registry/dns/writer/api/DnsWriter.java
+++ b/java/google/registry/model/dns/DnsWriter.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package google.registry.dns.writer.api;
+package google.registry.model.dns;
 
 /**
  * Transaction object for sending an atomic batch of updates for a single zone to the DNS server.
diff --git a/java/google/registry/dns/writer/api/DnsWriterZone.java b/java/google/registry/model/dns/DnsWriterZone.java
similarity index 95%
rename from java/google/registry/dns/writer/api/DnsWriterZone.java
rename to java/google/registry/model/dns/DnsWriterZone.java
index 5949d22a0..b96ff4f80 100644
--- a/java/google/registry/dns/writer/api/DnsWriterZone.java
+++ b/java/google/registry/model/dns/DnsWriterZone.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package google.registry.dns.writer.api;
+package google.registry.model.dns;
 
 import java.lang.annotation.Documented;
 import javax.inject.Qualifier;
diff --git a/java/google/registry/module/backend/BUILD b/java/google/registry/module/backend/BUILD
index a5ea3c8b3..3c5dfc2e2 100644
--- a/java/google/registry/module/backend/BUILD
+++ b/java/google/registry/module/backend/BUILD
@@ -19,7 +19,7 @@ java_library(
         "//java/google/registry/config",
         "//java/google/registry/cron",
         "//java/google/registry/dns",
-        "//java/google/registry/dns/writer/api",
+        "//java/google/registry/dns/writer",
         "//java/google/registry/export",
         "//java/google/registry/export/sheet",
         "//java/google/registry/flows",
diff --git a/java/google/registry/module/backend/BackendComponent.java b/java/google/registry/module/backend/BackendComponent.java
index 00d812546..9fb801d35 100644
--- a/java/google/registry/module/backend/BackendComponent.java
+++ b/java/google/registry/module/backend/BackendComponent.java
@@ -17,7 +17,7 @@ package google.registry.module.backend;
 import dagger.Component;
 import google.registry.bigquery.BigqueryModule;
 import google.registry.config.ConfigModule;
-import google.registry.dns.writer.api.VoidDnsWriterModule;
+import google.registry.dns.writer.VoidDnsWriterModule;
 import google.registry.export.DriveModule;
 import google.registry.export.sheet.SpreadsheetServiceModule;
 import google.registry.gcs.GcsServiceModule;
diff --git a/javatests/google/registry/dns/BUILD b/javatests/google/registry/dns/BUILD
index 16c5f93e5..22ffed284 100644
--- a/javatests/google/registry/dns/BUILD
+++ b/javatests/google/registry/dns/BUILD
@@ -32,7 +32,7 @@ java_library(
         "//java/google/registry/cron",
         "//java/google/registry/dns",
         "//java/google/registry/dns:constants",
-        "//java/google/registry/dns/writer/api",
+        "//java/google/registry/dns/writer",
         "//java/google/registry/model",
         "//java/google/registry/module/backend",
         "//java/google/registry/request",
diff --git a/javatests/google/registry/dns/DnsTestComponent.java b/javatests/google/registry/dns/DnsTestComponent.java
index e56d6916f..99f41b20b 100644
--- a/javatests/google/registry/dns/DnsTestComponent.java
+++ b/javatests/google/registry/dns/DnsTestComponent.java
@@ -17,7 +17,7 @@ package google.registry.dns;
 import dagger.Component;
 import google.registry.config.ConfigModule;
 import google.registry.cron.CronModule;
-import google.registry.dns.writer.api.VoidDnsWriterModule;
+import google.registry.dns.writer.VoidDnsWriterModule;
 import google.registry.module.backend.BackendModule;
 import google.registry.request.RequestModule;
 import google.registry.util.SystemClock.SystemClockModule;
diff --git a/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java b/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java
index 6c730a25a..ce73e4869 100644
--- a/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java
+++ b/javatests/google/registry/dns/PublishDnsUpdatesActionTest.java
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 import com.google.common.collect.ImmutableSet;
-import google.registry.dns.writer.api.DnsWriter;
+import google.registry.model.dns.DnsWriter;
 import google.registry.model.domain.DomainResource;
 import google.registry.model.ofy.Ofy;
 import google.registry.testing.AppEngineRule;
diff --git a/javatests/google/registry/dns/writer/api/BUILD b/javatests/google/registry/dns/writer/sample/BUILD
similarity index 100%
rename from javatests/google/registry/dns/writer/api/BUILD
rename to javatests/google/registry/dns/writer/sample/BUILD