Rename Java packages to use the .google TLD

The dark lord Gosling designed the Java package naming system so that
ownership flows from the DNS system. Since we own the domain name
registry.google, it seems only appropriate that we should use
google.registry as our package name.

java/google/registry/tools/AllocateDomainCommand.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;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -20,30 +20,15 @@ import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.emptyToNull;
 import static com.google.common.collect.Iterables.transform;
 import static com.google.common.io.BaseEncoding.base16;
-import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.tools.CommandUtilities.addHeader;
+import static google.registry.flows.EppXmlTransformer.unmarshal;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.tools.CommandUtilities.addHeader;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableMap;
-import com.google.domain.registry.flows.EppException;
-import com.google.domain.registry.flows.EppXmlTransformer;
-import com.google.domain.registry.model.domain.DesignatedContact;
-import com.google.domain.registry.model.domain.DomainApplication;
-import com.google.domain.registry.model.domain.DomainCommand;
-import com.google.domain.registry.model.domain.Period;
-import com.google.domain.registry.model.domain.launch.ApplicationStatus;
-import com.google.domain.registry.model.domain.launch.LaunchNotice;
-import com.google.domain.registry.model.domain.secdns.DelegationSignerData;
-import com.google.domain.registry.model.eppinput.EppInput;
-import com.google.domain.registry.model.eppinput.EppInput.ResourceCommandWrapper;
-import com.google.domain.registry.model.host.HostResource;
-import com.google.domain.registry.model.reporting.HistoryEntry;
-import com.google.domain.registry.model.smd.SignedMark;
-import com.google.domain.registry.tools.soy.DomainAllocateSoyInfo;
 import com.google.template.soy.data.SoyMapData;
 
 import com.beust.jcommander.Parameter;
@@ -52,6 +37,22 @@ import com.googlecode.objectify.Key;
 import com.googlecode.objectify.VoidWork;
 import com.googlecode.objectify.Work;
 
+import google.registry.flows.EppException;
+import google.registry.flows.EppXmlTransformer;
+import google.registry.model.domain.DesignatedContact;
+import google.registry.model.domain.DomainApplication;
+import google.registry.model.domain.DomainCommand;
+import google.registry.model.domain.Period;
+import google.registry.model.domain.launch.ApplicationStatus;
+import google.registry.model.domain.launch.LaunchNotice;
+import google.registry.model.domain.secdns.DelegationSignerData;
+import google.registry.model.eppinput.EppInput;
+import google.registry.model.eppinput.EppInput.ResourceCommandWrapper;
+import google.registry.model.host.HostResource;
+import google.registry.model.reporting.HistoryEntry;
+import google.registry.model.smd.SignedMark;
+import google.registry.tools.soy.DomainAllocateSoyInfo;
+
 import java.util.ArrayList;
 import java.util.List;
 

java/google/registry/tools/AppEngineConnection.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Suppliers.memoize;
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
 import static com.google.common.net.HttpHeaders.X_REQUESTED_WITH;
 import static com.google.common.net.MediaType.JSON_UTF_8;
-import static com.google.domain.registry.security.JsonHttp.JSON_SAFETY_PREFIX;
-import static com.google.domain.registry.security.XsrfTokenManager.X_CSRF_TOKEN;
+import static google.registry.security.JsonHttp.JSON_SAFETY_PREFIX;
+import static google.registry.security.XsrfTokenManager.X_CSRF_TOKEN;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Function;
@@ -30,13 +30,14 @@ import com.google.common.collect.Iterables;
 import com.google.common.io.CharStreams;
 import com.google.common.net.HostAndPort;
 import com.google.common.net.MediaType;
-import com.google.domain.registry.config.RegistryEnvironment;
-import com.google.domain.registry.security.XsrfTokenManager;
-import com.google.domain.registry.tools.ServerSideCommand.Connection;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.config.RegistryEnvironment;
+import google.registry.security.XsrfTokenManager;
+import google.registry.tools.ServerSideCommand.Connection;
+
 import org.joda.time.Duration;
 import org.json.simple.JSONValue;
 

java/google/registry/tools/AuctionStatusCommand.java

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.domain.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.model.registry.Registries.findTldForName;
+import static google.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.registry.Registries.findTldForName;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Function;
@@ -30,16 +30,17 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.model.contact.ContactResource;
-import com.google.domain.registry.model.domain.DomainApplication;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.Work;
 
+import google.registry.model.contact.ContactResource;
+import google.registry.model.domain.DomainApplication;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.PathParameter;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;

java/google/registry/tools/BUILD

@@ -1,7 +1,9 @@
 package(
-    default_visibility = ["//java/com/google/domain/registry:registry_project"],
+    default_visibility = ["//java/google/registry:registry_project"],
 )
 
+licenses(["notice"])  # Apache 2.0
+
 
 # Restrict visibility to :tools because :remoteapi-internal (and transitively
 # :appengine-api-link) should never be linked into an App Engine deploy jar,
@@ -9,10 +11,10 @@ package(
 package_group(
     name = "allowed-tools",
     packages = [
-        "//java/com/google/domain/registry/testing",
-        "//java/com/google/domain/registry/tools",
-        "//java/com/google/domain/registry/eclipse",
-        "//javatests/com/google/domain/registry/tools",
+        "//java/google/registry/testing",
+        "//java/google/registry/tools",
+        "//java/google/registry/eclipse",
+        "//javatests/google/registry/tools",
     ],
 )
 
@@ -41,24 +43,24 @@ java_library(
         "//java/com/google/common/io",
         "//java/com/google/common/net",
         "//java/com/google/common/util/concurrent",
-        "//java/com/google/domain/registry/bigquery",
-        "//java/com/google/domain/registry/config",
-        "//java/com/google/domain/registry/export",
-        "//java/com/google/domain/registry/flows",
-        "//java/com/google/domain/registry/keyring/api",
-        "//java/com/google/domain/registry/model",
-        "//java/com/google/domain/registry/rde",
-        "//java/com/google/domain/registry/security",
-        "//java/com/google/domain/registry/request:modules",
-        "//java/com/google/domain/registry/tldconfig/idn",
-        "//java/com/google/domain/registry/tmch",
-        "//java/com/google/domain/registry/tools/params",
-        "//java/com/google/domain/registry/tools/server",
-        "//java/com/google/domain/registry/tools/soy:soy_java_wrappers",
-        "//java/com/google/domain/registry/util",
-        "//java/com/google/domain/registry/whois",
-        "//java/com/google/domain/registry/xjc",
-        "//java/com/google/domain/registry/xml",
+        "//java/google/registry/bigquery",
+        "//java/google/registry/config",
+        "//java/google/registry/export",
+        "//java/google/registry/flows",
+        "//java/google/registry/keyring/api",
+        "//java/google/registry/model",
+        "//java/google/registry/rde",
+        "//java/google/registry/security",
+        "//java/google/registry/request:modules",
+        "//java/google/registry/tldconfig/idn",
+        "//java/google/registry/tmch",
+        "//java/google/registry/tools/params",
+        "//java/google/registry/tools/server",
+        "//java/google/registry/tools/soy:soy_java_wrappers",
+        "//java/google/registry/util",
+        "//java/google/registry/whois",
+        "//java/google/registry/xjc",
+        "//java/google/registry/xml",
         "//third_party/java/appengine:appengine-api",
         "//third_party/java/bouncycastle",
         "//third_party/java/bouncycastle_bcpg",
@@ -81,7 +83,7 @@ java_library(
 java_binary(
     name = "registry_tool",
     create_executable = 1,
-    main_class = "com.google.domain.registry.tools.RegistryTool",
+    main_class = "google.registry.tools.RegistryTool",
     runtime_deps = [
         ":tools",
         "//third_party/java/appengine:appengine-api-link",

java/google/registry/tools/BigqueryCommand.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.bigquery.BigqueryConnection;
+package google.registry.tools;
 
 import com.beust.jcommander.ParametersDelegate;
 
+import google.registry.bigquery.BigqueryConnection;
+
 /** A {@link Command} that uses the bigquery client API. */
 abstract class BigqueryCommand implements Command {
 

java/google/registry/tools/BigqueryCommandUtilities.java

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.domain.registry.bigquery.BigqueryConnection.DestinationTable;
+
+import google.registry.bigquery.BigqueryConnection.DestinationTable;
 
 import java.util.concurrent.ExecutionException;
 

java/google/registry/tools/BigqueryParameters.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;
+package google.registry.tools;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
 import com.google.api.client.http.HttpTransport;
@@ -20,12 +20,13 @@ import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.jackson2.JacksonFactory;
 import com.google.api.services.bigquery.BigqueryScopes;
-import com.google.domain.registry.bigquery.BigqueryConnection;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.bigquery.BigqueryConnection;
+import google.registry.tools.params.PathParameter;
+
 import org.joda.time.Duration;
 
 import java.nio.file.Path;

java/google/registry/tools/CanonicalizeLabelsCommand.java

@@ -12,22 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName;
+import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Joiner;
 import com.google.common.io.CharStreams;
 import com.google.common.io.Files;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.util.DomainNameUtils;
-import com.google.domain.registry.util.Idn;
-import com.google.domain.registry.util.NonFinalForTesting;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+import google.registry.util.DomainNameUtils;
+import google.registry.util.Idn;
+import google.registry.util.NonFinalForTesting;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

java/google/registry/tools/CheckSnapshotCommand.java

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.collect.Iterables;
-import com.google.domain.registry.export.DatastoreBackupInfo;
-import com.google.domain.registry.export.DatastoreBackupService;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.export.DatastoreBackupInfo;
+import google.registry.export.DatastoreBackupService;
+import google.registry.tools.Command.RemoteApiCommand;
+
 /**
  * Command to check the status of a datastore backup, or "snapshot".
  */

java/google/registry/tools/Command.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;
+package google.registry.tools;
 
 /** Interface of all commands. */
 public interface Command {

java/google/registry/tools/CommandUtilities.java

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.flows.EppXmlTransformer.marshalWithLenientRetry;
+import static google.registry.flows.EppXmlTransformer.marshalWithLenientRetry;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Strings;
-import com.google.domain.registry.flows.EppException;
-import com.google.domain.registry.flows.FlowRunner;
-import com.google.domain.registry.flows.FlowRunner.CommitMode;
-import com.google.domain.registry.flows.FlowRunner.UserPrivileges;
+
+import google.registry.flows.EppException;
+import google.registry.flows.FlowRunner;
+import google.registry.flows.FlowRunner.CommitMode;
+import google.registry.flows.FlowRunner.UserPrivileges;
 
 /** Container class for static utility methods. */
 class CommandUtilities {

java/google/registry/tools/ConfirmingCommand.java

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.tools.CommandUtilities.printLineIfNotEmpty;
-import static com.google.domain.registry.tools.CommandUtilities.promptForYes;
+import static google.registry.tools.CommandUtilities.printLineIfNotEmpty;
+import static google.registry.tools.CommandUtilities.promptForYes;
 
 import com.beust.jcommander.Parameter;
 

java/google/registry/tools/ConvertIdnCommand.java

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.util.DomainNameUtils.ACE_PREFIX;
-import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName;
-
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.util.Idn;
+import static google.registry.util.DomainNameUtils.ACE_PREFIX;
+import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+import google.registry.util.Idn;
+
 import java.io.IOException;
 import java.util.List;
 

java/google/registry/tools/CreateAnchorTenantCommand.java

@@ -12,21 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.domain.registry.model.registry.Registries.findTldForNameOrThrow;
+import static google.registry.model.registry.Registries.findTldForNameOrThrow;
 
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.model.registry.Registry;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.soy.CreateAnchorTenantSoyInfo;
 import com.google.template.soy.data.SoyMapData;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registry.Registry;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.soy.CreateAnchorTenantSoyInfo;
+
 import org.joda.money.Money;
 
 import javax.inject.Inject;

java/google/registry/tools/CreateAuctionCreditsCommand.java

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.CaseFormat.UPPER_CAMEL;
 import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
+import static google.registry.model.registry.Registries.assertTldExists;
 import static java.util.Arrays.asList;
 import static org.joda.time.DateTimeZone.UTC;
 
@@ -27,15 +27,16 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Iterables;
-import com.google.domain.registry.model.billing.RegistrarCredit;
-import com.google.domain.registry.model.billing.RegistrarCredit.CreditType;
-import com.google.domain.registry.model.billing.RegistrarCreditBalance;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registry.Registry;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.billing.RegistrarCredit;
+import google.registry.model.billing.RegistrarCredit.CreditType;
+import google.registry.model.billing.RegistrarCreditBalance;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registry.Registry;
+
 import org.joda.money.BigMoney;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;

java/google/registry/tools/CreateContactCommand.java

@@ -12,19 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Strings.isNullOrEmpty;
 
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.params.PhoneNumberParameter;
-import com.google.domain.registry.tools.soy.CreateContactSoyInfo;
 import com.google.template.soy.data.SoyMapData;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.params.PhoneNumberParameter;
+import google.registry.tools.soy.CreateContactSoyInfo;
+
 import java.util.List;
 
 import javax.inject.Inject;

java/google/registry/tools/CreateCreditBalanceCommand.java

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-
-import com.google.domain.registry.model.billing.RegistrarCredit;
-import com.google.domain.registry.model.billing.RegistrarCreditBalance;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.util.SystemClock;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.billing.RegistrarCredit;
+import google.registry.model.billing.RegistrarCreditBalance;
+import google.registry.model.registrar.Registrar;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.util.SystemClock;
+
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 

java/google/registry/tools/CreateCreditCommand.java

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static org.joda.time.DateTimeZone.UTC;
 
-import com.google.domain.registry.model.billing.RegistrarCredit;
-import com.google.domain.registry.model.billing.RegistrarCredit.CreditType;
-import com.google.domain.registry.model.billing.RegistrarCreditBalance;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.tools.Command.GtechCommand;
-
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.billing.RegistrarCredit;
+import google.registry.model.billing.RegistrarCredit.CreditType;
+import google.registry.model.billing.RegistrarCreditBalance;
+import google.registry.model.registrar.Registrar;
+import google.registry.tools.Command.GtechCommand;
+
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 

java/google/registry/tools/CreateOrUpdatePremiumListCommand.java

@@ -12,24 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.domain.registry.security.JsonHttp.JSON_SAFETY_PREFIX;
-import static com.google.domain.registry.tools.server.CreateOrUpdatePremiumListAction.INPUT_PARAM;
-import static com.google.domain.registry.tools.server.CreateOrUpdatePremiumListAction.NAME_PARAM;
-import static com.google.domain.registry.util.ListNamingUtils.convertFilePathToName;
+import static google.registry.security.JsonHttp.JSON_SAFETY_PREFIX;
+import static google.registry.tools.server.CreateOrUpdatePremiumListAction.INPUT_PARAM;
+import static google.registry.tools.server.CreateOrUpdatePremiumListAction.NAME_PARAM;
+import static google.registry.util.ListNamingUtils.convertFilePathToName;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.MediaType;
-import com.google.domain.registry.model.registry.label.PremiumList;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 
+import google.registry.model.registry.label.PremiumList;
+import google.registry.tools.params.PathParameter;
+
 import org.json.simple.JSONValue;
 
 import java.net.URLEncoder;

java/google/registry/tools/CreateOrUpdateRegistrarCommand.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Predicates.isNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName;
-import static com.google.domain.registry.util.RegistrarUtils.normalizeRegistrarName;
+import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
+import static google.registry.util.RegistrarUtils.normalizeRegistrarName;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 import static org.joda.time.DateTimeZone.UTC;
 
@@ -27,18 +27,19 @@ import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-import com.google.domain.registry.model.billing.RegistrarBillingUtils;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registrar.Registrar.BillingMethod;
-import com.google.domain.registry.model.registrar.RegistrarAddress;
-import com.google.domain.registry.tools.params.OptionalLongParameter;
-import com.google.domain.registry.tools.params.OptionalPhoneNumberParameter;
-import com.google.domain.registry.tools.params.OptionalStringParameter;
-import com.google.domain.registry.tools.params.PathParameter;
-import com.google.domain.registry.util.CidrAddressBlock;
 
 import com.beust.jcommander.Parameter;
 
+import google.registry.model.billing.RegistrarBillingUtils;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.Registrar.BillingMethod;
+import google.registry.model.registrar.RegistrarAddress;
+import google.registry.tools.params.OptionalLongParameter;
+import google.registry.tools.params.OptionalPhoneNumberParameter;
+import google.registry.tools.params.OptionalStringParameter;
+import google.registry.tools.params.PathParameter;
+import google.registry.util.CidrAddressBlock;
+
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.joda.time.DateTime;

java/google/registry/tools/CreateOrUpdateReservedListCommand.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.tools.params.PathParameter;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameter;
 
+import google.registry.tools.params.PathParameter;
+
 import java.nio.file.Path;
 
 import javax.annotation.Nullable;

java/google/registry/tools/CreateOrUpdateTldCommand.java

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.collect.Sets.difference;
 import static com.google.common.collect.Sets.intersection;
 import static com.google.common.collect.Sets.union;
-import static com.google.domain.registry.model.RoidSuffixes.isRoidSuffixUsed;
-import static com.google.domain.registry.util.CollectionUtils.findDuplicates;
-import static com.google.domain.registry.util.CollectionUtils.nullToEmpty;
-import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName;
+import static google.registry.model.RoidSuffixes.isRoidSuffixUsed;
+import static google.registry.util.CollectionUtils.findDuplicates;
+import static google.registry.util.CollectionUtils.nullToEmpty;
+import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
 
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Function;
@@ -31,19 +31,20 @@ import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
-import com.google.domain.registry.model.registry.Registries;
-import com.google.domain.registry.model.registry.Registry;
-import com.google.domain.registry.model.registry.Registry.TldState;
-import com.google.domain.registry.model.registry.Registry.TldType;
-import com.google.domain.registry.model.registry.label.PremiumList;
-import com.google.domain.registry.model.registry.label.ReservedList;
-import com.google.domain.registry.tools.params.OptionalStringParameter;
-import com.google.domain.registry.tools.params.TransitionListParameter.BillingCostTransitions;
-import com.google.domain.registry.tools.params.TransitionListParameter.TldStateTransitions;
 
 import com.beust.jcommander.Parameter;
 import com.googlecode.objectify.Key;
 
+import google.registry.model.registry.Registries;
+import google.registry.model.registry.Registry;
+import google.registry.model.registry.Registry.TldState;
+import google.registry.model.registry.Registry.TldType;
+import google.registry.model.registry.label.PremiumList;
+import google.registry.model.registry.label.ReservedList;
+import google.registry.tools.params.OptionalStringParameter;
+import google.registry.tools.params.TransitionListParameter.BillingCostTransitions;
+import google.registry.tools.params.TransitionListParameter.TldStateTransitions;
+
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 import org.joda.time.Duration;

java/google/registry/tools/CreatePremiumListCommand.java

@@ -12,15 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.domain.registry.model.registry.label.PremiumList;
-import com.google.domain.registry.tools.server.CreatePremiumListAction;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registry.label.PremiumList;
+import google.registry.tools.server.CreatePremiumListAction;
+
 import javax.annotation.Nullable;
 
 /** Command to create a {@link PremiumList} on Datastore. */

java/google/registry/tools/CreateRegistrarCommand.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;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -21,22 +21,23 @@ import static com.google.common.base.Strings.emptyToNull;
 import static com.google.common.collect.Iterables.filter;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.Lists.newArrayList;
-import static com.google.domain.registry.model.registrar.Registrar.State.ACTIVE;
-import static com.google.domain.registry.tools.RegistryToolEnvironment.PRODUCTION;
-import static com.google.domain.registry.tools.RegistryToolEnvironment.SANDBOX;
-import static com.google.domain.registry.tools.RegistryToolEnvironment.UNITTEST;
-import static com.google.domain.registry.util.RegistrarUtils.normalizeClientId;
+import static google.registry.model.registrar.Registrar.State.ACTIVE;
+import static google.registry.tools.RegistryToolEnvironment.PRODUCTION;
+import static google.registry.tools.RegistryToolEnvironment.SANDBOX;
+import static google.registry.tools.RegistryToolEnvironment.UNITTEST;
+import static google.registry.util.RegistrarUtils.normalizeClientId;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.tools.Command.GtechCommand;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registrar.Registrar;
+import google.registry.tools.Command.GtechCommand;
+
 import java.util.List;
 
 import javax.annotation.Nullable;

java/google/registry/tools/CreateRegistrarGroupsCommand.java

@@ -12,22 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.collect.Iterables.transform;
-import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull;
+import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.MediaType;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.server.CreateGroupsAction;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registrar.Registrar;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.server.CreateGroupsAction;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

java/google/registry/tools/CreateReservedListCommand.java

@@ -12,22 +12,23 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
-import static com.google.domain.registry.util.ListNamingUtils.convertFilePathToName;
+import static google.registry.model.registry.Registries.assertTldExists;
+import static google.registry.util.ListNamingUtils.convertFilePathToName;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
-import com.google.domain.registry.model.registry.label.ReservedList;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registry.label.ReservedList;
+
 import org.joda.time.DateTime;
 
 import java.nio.file.Files;

java/google/registry/tools/CreateSandboxTldCommand.java

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.domain.registry.config.RegistryEnvironment;
-import com.google.domain.registry.tools.Command.GtechCommand;
-
 import com.beust.jcommander.Parameters;
 
+import google.registry.config.RegistryEnvironment;
+import google.registry.tools.Command.GtechCommand;
+
 /** Command to create a TLD in sandbox, separated out for Gtech use. */
 @Parameters(separators = " =", commandDescription = "Create new sandbox TLD(s)")
 final class CreateSandboxTldCommand extends CreateTldCommand implements GtechCommand {

java/google/registry/tools/CreateTldCommand.java

@@ -12,21 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.domain.registry.model.registry.Registries.getTlds;
-import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME;
+import static google.registry.model.registry.Registries.getTlds;
+import static google.registry.util.DateTimeUtils.START_OF_TIME;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSortedMap;
-import com.google.domain.registry.model.registry.Registry;
-import com.google.domain.registry.model.registry.Registry.TldState;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registry.Registry;
+import google.registry.model.registry.Registry.TldState;
+
 import org.joda.money.Money;
 
 import javax.annotation.Nullable;

java/google/registry/tools/DeleteCreditCommand.java

@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-
-import com.google.domain.registry.model.billing.RegistrarCredit;
-import com.google.domain.registry.model.billing.RegistrarCreditBalance;
-import com.google.domain.registry.model.registrar.Registrar;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.billing.RegistrarCredit;
+import google.registry.model.billing.RegistrarCreditBalance;
+import google.registry.model.registrar.Registrar;
+
 /** Command for deleting a registrar credit object and all of its child balances. */
 @Parameters(separators = " =", commandDescription = "Delete a registrar credit")
 final class DeleteCreditCommand extends MutatingCommand {

java/google/registry/tools/DeleteDomainCommand.java

@@ -12,15 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.soy.DeleteDomainSoyInfo;
 import com.google.template.soy.data.SoyMapData;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.soy.DeleteDomainSoyInfo;
+
 /** A command to delete a domain via EPP. */
 @Parameters(separators = " =", commandDescription = "Delete domain")
 final class DeleteDomainCommand extends MutatingEppToolCommand implements GtechCommand {

java/google/registry/tools/DeleteEntityCommand.java

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.MediaType;
-import com.google.domain.registry.tools.server.DeleteEntityAction;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.server.DeleteEntityAction;
+
 import java.util.List;
 
 /**

java/google/registry/tools/DeleteEppResourceCommand.java

@@ -12,23 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.util.DateTimeUtils.isBeforeOrAt;
 import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.model.EppResource;
-import com.google.domain.registry.model.index.ForeignKeyIndex;
-import com.google.domain.registry.model.reporting.HistoryEntry;
-import com.google.domain.registry.tools.params.EppResourceTypeParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.Key;
 
+import google.registry.model.EppResource;
+import google.registry.model.index.ForeignKeyIndex;
+import google.registry.model.reporting.HistoryEntry;
+import google.registry.tools.params.EppResourceTypeParameter;
+
 import org.joda.time.DateTime;
 
 import java.util.List;

java/google/registry/tools/DeletePremiumListCommand.java

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.model.registry.label.PremiumList;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
-import javax.annotation.Nullable;
+import google.registry.model.registry.label.PremiumList;
+import google.registry.tools.Command.RemoteApiCommand;
 
+import javax.annotation.Nullable;
 
 /**
  * Command to delete a {@link PremiumList} in Datastore. This command will fail if the premium

java/google/registry/tools/DeleteReservedListCommand.java

@@ -12,17 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.model.registry.label.ReservedList;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registry.label.ReservedList;
+
 /**
  * Command to delete a {@link ReservedList} in Datastore. This command will fail if the reserved
  * list is currently in use on a tld.

java/google/registry/tools/DomainApplicationInfoCommand.java

@@ -12,18 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull;
+import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
-import com.google.domain.registry.model.domain.launch.LaunchPhase;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.soy.DomainApplicationInfoSoyInfo;
 import com.google.template.soy.data.SoyMapData;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.domain.launch.LaunchPhase;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.soy.DomainApplicationInfoSoyInfo;
+
 /** A command to execute a domain application info EPP command. */
 @Parameters(separators = " =", commandDescription = "Get domain application EPP info")
 final class DomainApplicationInfoCommand extends EppToolCommand implements GtechCommand {

java/google/registry/tools/DomainCheckClaimsCommand.java

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.collect.Multimap;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.soy.DomainCheckClaimsSoyInfo;
 import com.google.template.soy.data.SoyMapData;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.soy.DomainCheckClaimsSoyInfo;
+
 import java.util.Collection;
 import java.util.List;
 

java/google/registry/tools/DomainCheckCommand.java

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.collect.Multimap;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.soy.DomainCheckSoyInfo;
 import com.google.template.soy.data.SoyMapData;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.soy.DomainCheckSoyInfo;
+
 import java.util.Collection;
 import java.util.List;
 

java/google/registry/tools/DomainCheckFeeCommand.java

@@ -12,16 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.collect.Multimap;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.soy.DomainCheckFeeSoyInfo;
 import com.google.template.soy.data.SoyMapData;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.soy.DomainCheckFeeSoyInfo;
+
 import java.util.Collection;
 import java.util.List;
 

java/google/registry/tools/EncryptEscrowDepositCommand.java

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.util.DomainNameUtils.canonicalizeDomainName;
-
-import com.google.domain.registry.tools.params.PathParameter;
+import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.params.PathParameter;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
 

java/google/registry/tools/EppToolCommand.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;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -20,11 +20,11 @@ import static com.google.common.base.Predicates.notNull;
 import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.collect.Maps.filterValues;
 import static com.google.common.io.Resources.getResource;
-import static com.google.domain.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8;
-import static com.google.domain.registry.model.registry.Registries.findTldForNameOrThrow;
-import static com.google.domain.registry.tools.CommandUtilities.addHeader;
-import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull;
-import static com.google.domain.registry.xml.XmlTransformer.prettyPrint;
+import static google.registry.flows.EppServletUtils.APPLICATION_EPP_XML_UTF8;
+import static google.registry.model.registry.Registries.findTldForNameOrThrow;
+import static google.registry.tools.CommandUtilities.addHeader;
+import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
+import static google.registry.xml.XmlTransformer.prettyPrint;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Joiner;
@@ -32,7 +32,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.model.registrar.Registrar;
 import com.google.template.soy.SoyFileSet;
 import com.google.template.soy.data.SoyRecord;
 import com.google.template.soy.parseinfo.SoyFileInfo;
@@ -40,6 +39,8 @@ import com.google.template.soy.parseinfo.SoyTemplateInfo;
 
 import com.beust.jcommander.Parameter;
 
+import google.registry.model.registrar.Registrar;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;

java/google/registry/tools/EscrowDepositEncryptor.java

@@ -12,25 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.rde.RdeMode.FULL;
+import static google.registry.model.rde.RdeMode.FULL;
 
 import com.google.common.io.ByteStreams;
-import com.google.domain.registry.keyring.api.KeyModule.Key;
-import com.google.domain.registry.model.rde.RdeNamingUtils;
-import com.google.domain.registry.rde.RdeUtil;
-import com.google.domain.registry.rde.RydePgpCompressionOutputStream;
-import com.google.domain.registry.rde.RydePgpCompressionOutputStreamFactory;
-import com.google.domain.registry.rde.RydePgpEncryptionOutputStream;
-import com.google.domain.registry.rde.RydePgpEncryptionOutputStreamFactory;
-import com.google.domain.registry.rde.RydePgpFileOutputStream;
-import com.google.domain.registry.rde.RydePgpFileOutputStreamFactory;
-import com.google.domain.registry.rde.RydePgpSigningOutputStream;
-import com.google.domain.registry.rde.RydePgpSigningOutputStreamFactory;
-import com.google.domain.registry.rde.RydeTarOutputStream;
-import com.google.domain.registry.rde.RydeTarOutputStreamFactory;
-import com.google.domain.registry.xml.XmlException;
+
+import google.registry.keyring.api.KeyModule.Key;
+import google.registry.model.rde.RdeNamingUtils;
+import google.registry.rde.RdeUtil;
+import google.registry.rde.RydePgpCompressionOutputStream;
+import google.registry.rde.RydePgpCompressionOutputStreamFactory;
+import google.registry.rde.RydePgpEncryptionOutputStream;
+import google.registry.rde.RydePgpEncryptionOutputStreamFactory;
+import google.registry.rde.RydePgpFileOutputStream;
+import google.registry.rde.RydePgpFileOutputStreamFactory;
+import google.registry.rde.RydePgpSigningOutputStream;
+import google.registry.rde.RydePgpSigningOutputStreamFactory;
+import google.registry.rde.RydeTarOutputStream;
+import google.registry.rde.RydeTarOutputStreamFactory;
+import google.registry.xml.XmlException;
 
 import org.bouncycastle.bcpg.ArmoredOutputStream;
 import org.bouncycastle.openpgp.PGPException;

java/google/registry/tools/ExecuteEppCommand.java

@@ -12,17 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.io.CharStreams;
 import com.google.common.io.Files;
-import com.google.domain.registry.util.NonFinalForTesting;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.util.NonFinalForTesting;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

java/google/registry/tools/GenerateApplicationsReportCommand.java

@@ -12,38 +12,39 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static com.google.domain.registry.flows.EppXmlTransformer.unmarshal;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
-import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt;
-import static com.google.domain.registry.util.DomainNameUtils.ACE_PREFIX;
+import static google.registry.flows.EppXmlTransformer.unmarshal;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.registry.Registries.assertTldExists;
+import static google.registry.util.DateTimeUtils.isBeforeOrAt;
+import static google.registry.util.DomainNameUtils.ACE_PREFIX;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.emptyList;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.flows.EppException;
-import com.google.domain.registry.model.domain.DomainApplication;
-import com.google.domain.registry.model.smd.EncodedSignedMark;
-import com.google.domain.registry.model.smd.SignedMark;
-import com.google.domain.registry.model.smd.SignedMarkRevocationList;
-import com.google.domain.registry.model.tmch.ClaimsListShard;
-import com.google.domain.registry.tmch.TmchXmlSignature;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.PathParameter;
-import com.google.domain.registry.util.Clock;
-import com.google.domain.registry.util.Idn;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.cmd.LoadType;
 import com.googlecode.objectify.cmd.Query;
 
+import google.registry.flows.EppException;
+import google.registry.model.domain.DomainApplication;
+import google.registry.model.smd.EncodedSignedMark;
+import google.registry.model.smd.SignedMark;
+import google.registry.model.smd.SignedMarkRevocationList;
+import google.registry.model.tmch.ClaimsListShard;
+import google.registry.tmch.TmchXmlSignature;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.PathParameter;
+import google.registry.util.Clock;
+import google.registry.util.Idn;
+
 import org.joda.time.DateTime;
 
 import java.nio.file.Files;

java/google/registry/tools/GenerateAuctionDataCommand.java

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.nullToEmpty;
-import static com.google.domain.registry.model.domain.launch.ApplicationStatus.REJECTED;
-import static com.google.domain.registry.model.domain.launch.ApplicationStatus.VALIDATED;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
-import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter;
+import static google.registry.model.domain.launch.ApplicationStatus.REJECTED;
+import static google.registry.model.domain.launch.ApplicationStatus.VALIDATED;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.registry.Registries.assertTldExists;
+import static google.registry.util.DateTimeUtils.isAtOrAfter;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.joda.time.DateTimeZone.UTC;
 
@@ -33,22 +33,23 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.TreeMultimap;
-import com.google.domain.registry.model.contact.ContactAddress;
-import com.google.domain.registry.model.contact.ContactPhoneNumber;
-import com.google.domain.registry.model.contact.ContactResource;
-import com.google.domain.registry.model.contact.PostalInfo;
-import com.google.domain.registry.model.domain.DomainApplication;
-import com.google.domain.registry.model.domain.launch.ApplicationStatus;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registrar.RegistrarAddress;
-import com.google.domain.registry.model.registrar.RegistrarContact;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.contact.ContactAddress;
+import google.registry.model.contact.ContactPhoneNumber;
+import google.registry.model.contact.ContactResource;
+import google.registry.model.contact.PostalInfo;
+import google.registry.model.domain.DomainApplication;
+import google.registry.model.domain.launch.ApplicationStatus;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.RegistrarAddress;
+import google.registry.model.registrar.RegistrarContact;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.PathParameter;
+
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;

java/google/registry/tools/GenerateDnsReportCommand.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.io.BaseEncoding.base16;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
-import static com.google.domain.registry.util.DateTimeUtils.isBeforeOrAt;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.registry.Registries.assertTldExists;
+import static google.registry.util.DateTimeUtils.isBeforeOrAt;
 import static java.nio.charset.StandardCharsets.US_ASCII;
 
 import com.google.common.base.Function;
@@ -25,17 +25,18 @@ import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Ordering;
-import com.google.domain.registry.model.domain.DomainResource;
-import com.google.domain.registry.model.domain.secdns.DelegationSignerData;
-import com.google.domain.registry.model.host.HostResource;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.PathParameter;
-import com.google.domain.registry.util.Clock;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.domain.DomainResource;
+import google.registry.model.domain.secdns.DelegationSignerData;
+import google.registry.model.host.HostResource;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.PathParameter;
+import google.registry.util.Clock;
+
 import org.joda.time.DateTime;
 import org.json.simple.JSONValue;
 

java/google/registry/tools/GenerateEscrowDepositCommand.java

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.registry.Registries.assertTldExists;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static org.joda.time.DateTimeZone.UTC;
@@ -25,35 +25,36 @@ import com.google.common.base.Predicates;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.google.domain.registry.config.ConfigModule.Config;
-import com.google.domain.registry.model.EppResource;
-import com.google.domain.registry.model.EppResourceUtils;
-import com.google.domain.registry.model.ImmutableObject;
-import com.google.domain.registry.model.contact.ContactResource;
-import com.google.domain.registry.model.domain.DomainResource;
-import com.google.domain.registry.model.host.HostResource;
-import com.google.domain.registry.model.index.EppResourceIndex;
-import com.google.domain.registry.model.index.EppResourceIndexBucket;
-import com.google.domain.registry.model.rde.RdeMode;
-import com.google.domain.registry.model.rde.RdeNamingUtils;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.rde.DepositFragment;
-import com.google.domain.registry.rde.RdeCounter;
-import com.google.domain.registry.rde.RdeMarshaller;
-import com.google.domain.registry.rde.RdeResourceType;
-import com.google.domain.registry.rde.RdeUtil;
-import com.google.domain.registry.tldconfig.idn.IdnTableEnum;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.DateTimeParameter;
-import com.google.domain.registry.tools.params.PathParameter;
-import com.google.domain.registry.xjc.rdeheader.XjcRdeHeader;
-import com.google.domain.registry.xjc.rdeheader.XjcRdeHeaderElement;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.Result;
 
+import google.registry.config.ConfigModule.Config;
+import google.registry.model.EppResource;
+import google.registry.model.EppResourceUtils;
+import google.registry.model.ImmutableObject;
+import google.registry.model.contact.ContactResource;
+import google.registry.model.domain.DomainResource;
+import google.registry.model.host.HostResource;
+import google.registry.model.index.EppResourceIndex;
+import google.registry.model.index.EppResourceIndexBucket;
+import google.registry.model.rde.RdeMode;
+import google.registry.model.rde.RdeNamingUtils;
+import google.registry.model.registrar.Registrar;
+import google.registry.rde.DepositFragment;
+import google.registry.rde.RdeCounter;
+import google.registry.rde.RdeMarshaller;
+import google.registry.rde.RdeResourceType;
+import google.registry.rde.RdeUtil;
+import google.registry.tldconfig.idn.IdnTableEnum;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.DateTimeParameter;
+import google.registry.tools.params.PathParameter;
+import google.registry.xjc.rdeheader.XjcRdeHeader;
+import google.registry.xjc.rdeheader.XjcRdeHeaderElement;
+
 import org.joda.time.DateTime;
 
 import java.io.OutputStream;

java/google/registry/tools/GenerateLordnCommand.java

@@ -12,21 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.model.domain.DomainResource;
-import com.google.domain.registry.tmch.LordnTask;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.domain.DomainResource;
+import google.registry.tmch.LordnTask;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.PathParameter;
+
 import org.joda.time.DateTime;
 
 import java.io.IOException;

java/google/registry/tools/GenerateZoneFilesCommand.java

@@ -12,19 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
+import static google.registry.model.registry.Registries.assertTldExists;
 import static org.joda.time.DateTimeZone.UTC;
 import static org.joda.time.Duration.standardMinutes;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.domain.registry.tools.params.DateTimeParameter;
-import com.google.domain.registry.tools.server.GenerateZoneFilesAction;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.params.DateTimeParameter;
+import google.registry.tools.server.GenerateZoneFilesAction;
+
 import org.joda.time.DateTime;
 
 import java.io.IOException;

java/google/registry/tools/GetApplicationCommand.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.model.domain.DomainApplication;
-import com.google.domain.registry.tools.Command.GtechCommand;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.domain.DomainApplication;
+import google.registry.tools.Command.GtechCommand;
+
 import java.util.List;
 
 /** Command to show a domain application. */

java/google/registry/tools/GetApplicationIdsCommand.java

@@ -12,21 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName;
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
-import static com.google.domain.registry.model.registry.Registries.findTldForNameOrThrow;
+import static google.registry.model.index.DomainApplicationIndex.loadActiveApplicationsByDomainName;
+import static google.registry.model.registry.Registries.assertTldExists;
+import static google.registry.model.registry.Registries.findTldForNameOrThrow;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.model.domain.DomainApplication;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.domain.DomainApplication;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+
 import java.util.List;
 
 /** Command to generate a list of all applications for a given domain name(s). */

java/google/registry/tools/GetAppliedLabelsCommand.java

@@ -12,26 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.domain.launch.ApplicationStatus.REJECTED;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
-import static com.google.domain.registry.util.DateTimeUtils.isAtOrAfter;
+import static google.registry.model.domain.launch.ApplicationStatus.REJECTED;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.registry.Registries.assertTldExists;
+import static google.registry.util.DateTimeUtils.isAtOrAfter;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.domain.registry.model.domain.DomainApplication;
-import com.google.domain.registry.model.domain.launch.ApplicationStatus;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.PathParameter;
-import com.google.domain.registry.util.Idn;
-
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.beust.jcommander.internal.Sets;
 import com.googlecode.objectify.Work;
 
+import google.registry.model.domain.DomainApplication;
+import google.registry.model.domain.launch.ApplicationStatus;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.PathParameter;
+import google.registry.util.Idn;
+
 import org.joda.time.DateTime;
 
 import java.nio.file.Files;

java/google/registry/tools/GetClaimsListCommand.java

@@ -12,20 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Joiner;
 import com.google.common.io.Files;
-import com.google.domain.registry.model.tmch.ClaimsListShard;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.tmch.ClaimsListShard;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.PathParameter;
+
 import java.nio.file.Path;
 import java.nio.file.Paths;
 

java/google/registry/tools/GetContactCommand.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.model.contact.ContactResource;
-import com.google.domain.registry.tools.Command.GtechCommand;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.contact.ContactResource;
+import google.registry.tools.Command.GtechCommand;
+
 import java.util.List;
 
 /** Command to show one or more contacts. */

java/google/registry/tools/GetDomainCommand.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.model.domain.DomainResource;
-import com.google.domain.registry.tools.Command.GtechCommand;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.domain.DomainResource;
+import google.registry.tools.Command.GtechCommand;
+
 import java.util.List;
 
 /** Command to show a domain resource. */

java/google/registry/tools/GetEppResourceCommand.java

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId;
+import static google.registry.model.EppResourceUtils.loadByUniqueId;
 import static org.joda.time.DateTimeZone.UTC;
 
-import com.google.domain.registry.model.EppResource;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.util.TypeUtils.TypeInstantiator;
-
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.Key;
 
+import google.registry.model.EppResource;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.util.TypeUtils.TypeInstantiator;
+
 import org.joda.time.DateTime;
 
 /**

java/google/registry/tools/GetHistoryEntriesCommand.java

@@ -12,20 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.util.DateTimeUtils.END_OF_TIME;
-import static com.google.domain.registry.util.DateTimeUtils.START_OF_TIME;
-
-import com.google.domain.registry.model.reporting.HistoryEntry;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.xml.XmlTransformer;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.util.DateTimeUtils.END_OF_TIME;
+import static google.registry.util.DateTimeUtils.START_OF_TIME;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.reporting.HistoryEntry;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.xml.XmlTransformer;
+
 import org.joda.time.DateTime;
 
 /** Command to show history entries. */

java/google/registry/tools/GetHostCommand.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.model.host.HostResource;
-import com.google.domain.registry.tools.Command.GtechCommand;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.host.HostResource;
+import google.registry.tools.Command.GtechCommand;
+
 import java.util.List;
 
 /** Command to show one or more host resources. */

java/google/registry/tools/GetRegistrarCommand.java

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkState;
 
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registrar.Registrar;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+
 import java.util.List;
 
 /** Command to show a registrar record. */

java/google/registry/tools/GetResourceByKeyCommand.java

@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-
-import com.google.domain.registry.model.EppResource;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.Key;
 
+import google.registry.model.EppResource;
+import google.registry.tools.Command.RemoteApiCommand;
+
 import java.util.List;
 
 /**

java/google/registry/tools/GetSchemaCommand.java

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.model.SchemaVersion;
-import com.google.domain.registry.tools.Command.GtechCommand;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.SchemaVersion;
+import google.registry.tools.Command.GtechCommand;
+
 /** Generates the schema file used for model versioning. */
 @Parameters(commandDescription = "Generate a model schema file")
 final class GetSchemaCommand implements GtechCommand {

java/google/registry/tools/GetSchemaTreeCommand.java

@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.collect.Ordering.arbitrary;
-import static com.google.domain.registry.model.EntityClasses.ALL_CLASSES;
+import static google.registry.model.EntityClasses.ALL_CLASSES;
 import static java.lang.ClassLoader.getSystemClassLoader;
 import static java.lang.reflect.Modifier.isAbstract;
 
@@ -24,16 +24,17 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Ordering;
 import com.google.common.collect.TreeMultimap;
-import com.google.domain.registry.model.BackupGroupRoot;
-import com.google.domain.registry.model.annotations.NotBackedUp;
-import com.google.domain.registry.model.annotations.VirtualEntity;
-import com.google.domain.registry.tools.Command.GtechCommand;
 
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.annotation.Entity;
 import com.googlecode.objectify.annotation.EntitySubclass;
 import com.googlecode.objectify.annotation.Parent;
 
+import google.registry.model.BackupGroupRoot;
+import google.registry.model.annotations.NotBackedUp;
+import google.registry.model.annotations.VirtualEntity;
+import google.registry.tools.Command.GtechCommand;
+
 import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;

java/google/registry/tools/GetTldCommand.java

@@ -12,17 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.registry.Registries.assertTldExists;
-
-import com.google.domain.registry.model.registry.Registry;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
+import static google.registry.model.registry.Registries.assertTldExists;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registry.Registry;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+
 import java.util.List;
 
 /** Command to show a TLD record. */

java/google/registry/tools/GhostrydeCommand.java

@@ -12,20 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.common.io.ByteStreams;
-import com.google.domain.registry.keyring.api.KeyModule.Key;
-import com.google.domain.registry.rde.Ghostryde;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.keyring.api.KeyModule.Key;
+import google.registry.rde.Ghostryde;
+import google.registry.tools.params.PathParameter;
+
 import org.bouncycastle.openpgp.PGPException;
 import org.bouncycastle.openpgp.PGPPrivateKey;
 import org.bouncycastle.openpgp.PGPPublicKey;

java/google/registry/tools/GtechTool.java

@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSortedMap;
-import com.google.domain.registry.tools.Command.GtechCommand;
+
+import google.registry.tools.Command.GtechCommand;
 
 /** Command line interface with a subset of commands that are safe for tech support to run. */
 public final class GtechTool {

java/google/registry/tools/HashCertificateCommand.java

@@ -12,18 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.domain.registry.util.X509Utils.getCertificateHash;
-import static com.google.domain.registry.util.X509Utils.loadCertificate;
+import static google.registry.util.X509Utils.getCertificateHash;
+import static google.registry.util.X509Utils.loadCertificate;
 
 import com.google.common.base.Joiner;
-import com.google.domain.registry.tools.Command.GtechCommand;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+
 import java.io.IOException;
 import java.nio.file.Paths;
 import java.security.cert.CertificateParsingException;

java/google/registry/tools/HelpCommand.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;
+package google.registry.tools;
 
 import static com.google.common.collect.Iterables.getOnlyElement;
 

java/google/registry/tools/Injector.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;
+package google.registry.tools;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

java/google/registry/tools/ListCreditsCommand.java

@@ -12,23 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.model.billing.RegistrarCredit;
-import com.google.domain.registry.model.billing.RegistrarCreditBalance.BalanceMap;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.Work;
 
+import google.registry.model.billing.RegistrarCredit;
+import google.registry.model.billing.RegistrarCreditBalance.BalanceMap;
+import google.registry.model.registrar.Registrar;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+
 import org.joda.money.Money;
 
 /** Command to list registrar credits and balances. */

java/google/registry/tools/ListCursorsCommand.java

@@ -12,20 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.Ordering;
-import com.google.domain.registry.model.registry.Registries;
-import com.google.domain.registry.model.registry.Registry;
-import com.google.domain.registry.model.registry.Registry.TldType;
-import com.google.domain.registry.model.registry.RegistryCursor;
-import com.google.domain.registry.model.registry.RegistryCursor.CursorType;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registry.Registries;
+import google.registry.model.registry.Registry;
+import google.registry.model.registry.Registry.TldType;
+import google.registry.model.registry.RegistryCursor;
+import google.registry.model.registry.RegistryCursor.CursorType;
+import google.registry.tools.Command.RemoteApiCommand;
+
 import org.joda.time.DateTime;
 
 import java.util.ArrayList;

java/google/registry/tools/ListDomainsCommand.java

@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.domain.registry.tools.server.ListDomainsAction;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
-/** Command to list all second-level domains associated with a TLD. */
+import google.registry.tools.server.ListDomainsAction;
 
+/** Command to list all second-level domains associated with a TLD. */
 @Parameters(separators = " =", commandDescription = "List domains associated with a TLD.")
 final class ListDomainsCommand extends ListObjectsCommand {
 

java/google/registry/tools/ListHostsCommand.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.tools.server.ListHostsAction;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.server.ListHostsAction;
+
 /** Command to list all HostResource entities associated with a TLD. */
 @Parameters(separators = " =", commandDescription = "List hosts associated with a TLD.")
 final class ListHostsCommand extends ListObjectsCommand {

java/google/registry/tools/ListObjectsCommand.java

@@ -12,20 +12,21 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.security.JsonHttp.JSON_SAFETY_PREFIX;
-import static com.google.domain.registry.tools.server.ListObjectsAction.FIELDS_PARAM;
-import static com.google.domain.registry.tools.server.ListObjectsAction.FULL_FIELD_NAMES_PARAM;
-import static com.google.domain.registry.tools.server.ListObjectsAction.PRINT_HEADER_ROW_PARAM;
+import static google.registry.security.JsonHttp.JSON_SAFETY_PREFIX;
+import static google.registry.tools.server.ListObjectsAction.FIELDS_PARAM;
+import static google.registry.tools.server.ListObjectsAction.FULL_FIELD_NAMES_PARAM;
+import static google.registry.tools.server.ListObjectsAction.PRINT_HEADER_ROW_PARAM;
 
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.net.MediaType;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
 
 import com.beust.jcommander.Parameter;
 
+import google.registry.tools.Command.RemoteApiCommand;
+
 import org.json.simple.JSONValue;
 
 import java.util.List;

java/google/registry/tools/ListPremiumListsCommand.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.tools.server.ListPremiumListsAction;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.server.ListPremiumListsAction;
+
 /** Command to list all premium lists. */
 @Parameters(separators = " =", commandDescription = "List all premium lists.")
 final class ListPremiumListsCommand extends ListObjectsCommand {

java/google/registry/tools/ListRegistrarsCommand.java

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.server.ListRegistrarsAction;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.server.ListRegistrarsAction;
+
 /** Command to list all registrars. */
 @Parameters(separators = " =", commandDescription = "List all registrars.")
 final class ListRegistrarsCommand extends ListObjectsCommand implements GtechCommand {

java/google/registry/tools/ListReservedListsCommand.java

@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.tools.server.ListReservedListsAction;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.server.ListReservedListsAction;
+
 /** Command to list all reserved lists. */
 @Parameters(separators = " =", commandDescription = "List all reserved lists.")
 final class ListReservedListsCommand extends ListObjectsCommand {

java/google/registry/tools/ListTldsCommand.java

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.server.ListTldsAction;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.server.ListTldsAction;
+
 /** Command to list all top-level domains. */
 @Parameters(separators = " =", commandDescription = "List all top-level domains.")
 final class ListTldsCommand extends ListObjectsCommand implements GtechCommand {

java/google/registry/tools/LoadSnapshotCommand.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;
+package google.registry.tools;
 
 import static com.google.common.base.Predicates.notNull;
 
@@ -22,12 +22,13 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.domain.registry.bigquery.BigqueryUtils.SourceFormat;
-import com.google.domain.registry.export.ExportConstants;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.bigquery.BigqueryUtils.SourceFormat;
+import google.registry.export.ExportConstants;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

java/google/registry/tools/LoggingParameters.java

@@ -12,18 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
-import static com.google.domain.registry.util.ResourceUtils.readResourceBytes;
+import static google.registry.util.ResourceUtils.readResourceBytes;
 
 import com.google.common.base.Joiner;
 import com.google.common.io.ByteSource;
 import com.google.common.io.Files;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.tools.params.PathParameter;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Path;

java/google/registry/tools/MakeBillingTablesCommand.java

@@ -12,21 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.domain.registry.tools.BigqueryCommandUtilities.handleTableCreation;
-import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8;
+import static google.registry.tools.BigqueryCommandUtilities.handleTableCreation;
+import static google.registry.util.ResourceUtils.readResourceUtf8;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
-import com.google.domain.registry.bigquery.BigqueryUtils.TableType;
-import com.google.domain.registry.tools.BigqueryCommandUtilities.TableCreationException;
-import com.google.domain.registry.util.SqlTemplate;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.bigquery.BigqueryUtils.TableType;
+import google.registry.tools.BigqueryCommandUtilities.TableCreationException;
+import google.registry.util.SqlTemplate;
+
 import java.util.List;
 
 /** Command to make synthetic billing tables and views in Bigquery. */

java/google/registry/tools/MutatingCommand.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;
+package google.registry.tools;
 
 import static com.google.common.base.CaseFormat.UPPER_CAMEL;
 import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
@@ -21,9 +21,9 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.emptyToNull;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.util.DatastoreServiceUtils.getNameOrId;
-import static com.google.domain.registry.util.DiffUtils.prettyPrintDeepDiff;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.util.DatastoreServiceUtils.getNameOrId;
+import static google.registry.util.DiffUtils.prettyPrintDeepDiff;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.MoreObjects;
@@ -32,12 +32,13 @@ import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.model.ImmutableObject;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
 
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.VoidWork;
 
+import google.registry.model.ImmutableObject;
+import google.registry.tools.Command.RemoteApiCommand;
+
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedHashMap;

java/google/registry/tools/MutatingEppToolCommand.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;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameter;
 

java/google/registry/tools/PasswordGenerator.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;
+package google.registry.tools;
 
 /** Password generator interface. */
 interface PasswordGenerator {

java/google/registry/tools/PendingEscrowCommand.java

@@ -12,19 +12,20 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.base.Functions;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
-import com.google.domain.registry.rde.PendingDeposit;
-import com.google.domain.registry.rde.PendingDepositChecker;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
 
 import com.beust.jcommander.Parameters;
 
+import google.registry.rde.PendingDeposit;
+import google.registry.rde.PendingDepositChecker;
+import google.registry.tools.Command.RemoteApiCommand;
+
 import javax.inject.Inject;
 
 /** Command to show what escrow deposits are pending generation on the server. */

java/google/registry/tools/PublishDetailReportCommand.java

@@ -12,18 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.domain.registry.export.PublishDetailReportAction;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.tools.Command.GtechCommand;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.export.PublishDetailReportAction;
+import google.registry.model.registrar.Registrar;
+import google.registry.tools.Command.GtechCommand;
+
 import java.util.Map;
 
 /**

java/google/registry/tools/RandomPasswordGenerator.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;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 

java/google/registry/tools/RegistrarActivityReportCommand.java

@@ -12,24 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.domain.registry.util.ResourceUtils.readResourceUtf8;
+import static google.registry.util.ResourceUtils.readResourceUtf8;
 
 import com.google.api.services.bigquery.model.Job;
 import com.google.api.services.bigquery.model.JobConfiguration;
 import com.google.api.services.bigquery.model.JobConfigurationExtract;
 import com.google.api.services.bigquery.model.JobConfigurationQuery;
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.bigquery.BigqueryConnection;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.util.SqlTemplate;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.beust.jcommander.ParametersDelegate;
 
+import google.registry.bigquery.BigqueryConnection;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.util.SqlTemplate;
+
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;

java/google/registry/tools/RegistrarContactCommand.java

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Strings.isNullOrEmpty;
 import static com.google.common.collect.Iterables.transform;
 import static com.google.common.collect.Sets.newHashSet;
-import static com.google.domain.registry.util.CollectionUtils.nullToEmpty;
-import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull;
+import static google.registry.util.CollectionUtils.nullToEmpty;
+import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.base.Enums;
@@ -28,17 +28,18 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.domain.registry.model.common.GaeUserIdConverter;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registrar.RegistrarContact;
-import com.google.domain.registry.model.registrar.RegistrarContact.Builder;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.params.OptionalPhoneNumberParameter;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.common.GaeUserIdConverter;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.RegistrarContact;
+import google.registry.model.registrar.RegistrarContact.Builder;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.params.OptionalPhoneNumberParameter;
+import google.registry.tools.params.PathParameter;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

java/google/registry/tools/RegistryCli.java

@@ -12,17 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.domain.registry.tools.Injector.injectReflectively;
+import static google.registry.tools.Injector.injectReflectively;
 
 import com.google.appengine.tools.remoteapi.RemoteApiInstaller;
 import com.google.appengine.tools.remoteapi.RemoteApiOptions;
 import com.google.common.collect.ImmutableMap;
-import com.google.domain.registry.model.ofy.ObjectifyService;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.ParameterFactory;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
@@ -30,6 +27,10 @@ import com.beust.jcommander.ParameterException;
 import com.beust.jcommander.Parameters;
 import com.beust.jcommander.ParametersDelegate;
 
+import google.registry.model.ofy.ObjectifyService;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.ParameterFactory;
+
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 
 import java.security.Security;

java/google/registry/tools/RegistryTool.java

@@ -12,12 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSortedMap;
-import com.google.domain.registry.tools.javascrap.LoadAndResaveCommand;
+
+import google.registry.tools.javascrap.LoadAndResaveCommand;
 
 /** Container class to create and run remote commands against a datastore instance. */
 public final class RegistryTool {

java/google/registry/tools/RegistryToolComponent.java

@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.config.ConfigModule;
-import com.google.domain.registry.keyring.api.KeyModule;
-import com.google.domain.registry.keyring.api.VoidKeyringModule;
-import com.google.domain.registry.request.Modules.DatastoreServiceModule;
-import com.google.domain.registry.request.Modules.Jackson2Module;
-import com.google.domain.registry.request.Modules.URLFetchServiceModule;
-import com.google.domain.registry.util.SystemClock.SystemClockModule;
+package google.registry.tools;
 
 import dagger.Component;
 
+import google.registry.config.ConfigModule;
+import google.registry.keyring.api.KeyModule;
+import google.registry.keyring.api.VoidKeyringModule;
+import google.registry.request.Modules.DatastoreServiceModule;
+import google.registry.request.Modules.Jackson2Module;
+import google.registry.request.Modules.URLFetchServiceModule;
+import google.registry.util.SystemClock.SystemClockModule;
+
 /**
  * Dagger component for Registry Tool.
  *

java/google/registry/tools/RegistryToolEnvironment.java

@@ -12,14 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkState;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.domain.registry.config.RegistryEnvironment;
+
+import google.registry.config.RegistryEnvironment;
 
 /** Enum of production environments, used for the {@code --environment} flag. */
 enum RegistryToolEnvironment {
@@ -31,7 +32,7 @@ enum RegistryToolEnvironment {
   LOCALHOST(RegistryEnvironment.LOCAL),
   UNITTEST(RegistryEnvironment.UNITTEST),
   PDT(RegistryEnvironment.PRODUCTION, ImmutableMap.of(
-      "com.google.domain.registry.rde.key.receiver",
+      "google.registry.rde.key.receiver",
           "pdt-escrow-test@icann.org"));
 
   private static final ImmutableList<String> FLAGS = ImmutableList.of("-e", "--environment");

java/google/registry/tools/RegistryToolModule.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;
+package google.registry.tools;
 
 import dagger.Module;
 import dagger.Provides;

java/google/registry/tools/ResaveEnvironmentEntitiesCommand.java

@@ -12,22 +12,22 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.collect.Iterables.concat;
-import static com.google.domain.registry.model.common.EntityGroupRoot.getCrossTldKey;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-
-import com.google.domain.registry.model.ImmutableObject;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registrar.RegistrarContact;
-import com.google.domain.registry.model.registry.Registry;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
+import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.VoidWork;
 
+import google.registry.model.ImmutableObject;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registrar.RegistrarContact;
+import google.registry.model.registry.Registry;
+import google.registry.tools.Command.RemoteApiCommand;
+
 /**
  * Command to re-save all environment entities to ensure that they have valid commit logs.
  *

java/google/registry/tools/SendEscrowReportToIcannCommand.java

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
-
-import com.google.domain.registry.rde.RdeReporter;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.PathParameter;
+package google.registry.tools;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.rde.RdeReporter;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.PathParameter;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;

java/google/registry/tools/ServerSideCommand.java

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.net.MediaType;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
+
+import google.registry.tools.Command.RemoteApiCommand;
 
 import java.io.IOException;
 import java.util.Map;

java/google/registry/tools/SetupOteCommand.java

@@ -12,24 +12,25 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.domain.registry.tools.CommandUtilities.promptForYes;
-import static com.google.domain.registry.util.X509Utils.loadCertificate;
+import static google.registry.tools.CommandUtilities.promptForYes;
+import static google.registry.util.X509Utils.loadCertificate;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.config.RegistryEnvironment;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.registry.Registry.TldState;
-import com.google.domain.registry.tools.Command.GtechCommand;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
-import com.google.domain.registry.tools.params.PathParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.config.RegistryEnvironment;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.registry.Registry.TldState;
+import google.registry.tools.Command.GtechCommand;
+import google.registry.tools.Command.RemoteApiCommand;
+import google.registry.tools.params.PathParameter;
+
 import org.joda.time.Duration;
 
 import java.nio.file.Path;

java/google/registry/tools/UpdateApplicationStatusCommand.java

@@ -12,30 +12,31 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId;
-import static com.google.domain.registry.model.domain.launch.ApplicationStatus.ALLOCATED;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
-import static com.google.domain.registry.util.PreconditionsUtils.checkArgumentNotNull;
+import static google.registry.model.EppResourceUtils.loadByUniqueId;
+import static google.registry.model.domain.launch.ApplicationStatus.ALLOCATED;
+import static google.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 
 import com.google.common.collect.ImmutableList;
-import com.google.domain.registry.model.domain.DomainApplication;
-import com.google.domain.registry.model.domain.launch.ApplicationStatus;
-import com.google.domain.registry.model.domain.launch.LaunchInfoResponseExtension;
-import com.google.domain.registry.model.eppcommon.StatusValue;
-import com.google.domain.registry.model.eppcommon.Trid;
-import com.google.domain.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
-import com.google.domain.registry.model.poll.PollMessage;
-import com.google.domain.registry.model.registrar.Registrar;
-import com.google.domain.registry.model.reporting.HistoryEntry;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.VoidWork;
 
+import google.registry.model.domain.DomainApplication;
+import google.registry.model.domain.launch.ApplicationStatus;
+import google.registry.model.domain.launch.LaunchInfoResponseExtension;
+import google.registry.model.eppcommon.StatusValue;
+import google.registry.model.eppcommon.Trid;
+import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
+import google.registry.model.poll.PollMessage;
+import google.registry.model.registrar.Registrar;
+import google.registry.model.reporting.HistoryEntry;
+
 import org.joda.time.DateTime;
 
 import java.util.List;

java/google/registry/tools/UpdateClaimsNoticeCommand.java

@@ -12,23 +12,24 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.domain.registry.model.EppResourceUtils.loadByUniqueId;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.model.EppResourceUtils.loadByUniqueId;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 
 import com.google.common.net.InternetDomainName;
-import com.google.domain.registry.model.domain.DomainApplication;
-import com.google.domain.registry.model.domain.launch.LaunchNotice;
-import com.google.domain.registry.model.domain.launch.LaunchNotice.InvalidChecksumException;
-import com.google.domain.registry.model.reporting.HistoryEntry;
-import com.google.domain.registry.tools.Command.RemoteApiCommand;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.googlecode.objectify.VoidWork;
 
+import google.registry.model.domain.DomainApplication;
+import google.registry.model.domain.launch.LaunchNotice;
+import google.registry.model.domain.launch.LaunchNotice.InvalidChecksumException;
+import google.registry.model.reporting.HistoryEntry;
+import google.registry.tools.Command.RemoteApiCommand;
+
 import org.joda.time.DateTime;
 
 /** Command to update the claims notice on a domain application. */

java/google/registry/tools/UpdateCreditsCommand.java

@@ -12,25 +12,26 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.domain.registry.bigquery.BigqueryUtils.fromBigqueryTimestampString;
-import static com.google.domain.registry.model.ofy.ObjectifyService.ofy;
+import static google.registry.bigquery.BigqueryUtils.fromBigqueryTimestampString;
+import static google.registry.model.ofy.ObjectifyService.ofy;
 import static org.joda.time.DateTimeZone.UTC;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Splitter;
-import com.google.domain.registry.model.billing.RegistrarCredit;
-import com.google.domain.registry.model.billing.RegistrarCreditBalance;
-import com.google.domain.registry.model.billing.RegistrarCreditBalance.BalanceMap;
-import com.google.domain.registry.model.registrar.Registrar;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.billing.RegistrarCredit;
+import google.registry.model.billing.RegistrarCreditBalance;
+import google.registry.model.billing.RegistrarCreditBalance.BalanceMap;
+import google.registry.model.registrar.Registrar;
+
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 

java/google/registry/tools/UpdateCursorsCommand.java

@@ -12,17 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.domain.registry.tools;
+package google.registry.tools;
 
 import com.google.common.base.Optional;
-import com.google.domain.registry.model.registry.Registry;
-import com.google.domain.registry.model.registry.RegistryCursor;
-import com.google.domain.registry.model.registry.RegistryCursor.CursorType;
-import com.google.domain.registry.tools.params.DateTimeParameter;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 
+import google.registry.model.registry.Registry;
+import google.registry.model.registry.RegistryCursor;
+import google.registry.model.registry.RegistryCursor.CursorType;
+import google.registry.tools.params.DateTimeParameter;
+
 import org.joda.time.DateTime;
 
 import java.util.List;