diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/CreateSchema.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/CreateSchema.java
index 245dd0f414..fa458cde67 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/CreateSchema.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/CreateSchema.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.pgm;
 
+import com.google.gerrit.pgm.util.SiteProgram;
 import com.google.gerrit.reviewdb.ReviewDb;
 import com.google.gerrit.reviewdb.SchemaVersion;
 import com.google.gerrit.reviewdb.SystemConfig;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
index 6495a96a3c..9573832169 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -19,6 +19,9 @@ import com.google.gerrit.httpd.WebModule;
 import com.google.gerrit.lifecycle.LifecycleManager;
 import com.google.gerrit.pgm.http.jetty.JettyEnv;
 import com.google.gerrit.pgm.http.jetty.JettyModule;
+import com.google.gerrit.pgm.util.ErrorLogFile;
+import com.google.gerrit.pgm.util.RuntimeShutdown;
+import com.google.gerrit.pgm.util.SiteProgram;
 import com.google.gerrit.server.config.AuthConfigModule;
 import com.google.gerrit.server.config.CanonicalWebUrlModule;
 import com.google.gerrit.server.config.CanonicalWebUrlProvider;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Gsql.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Gsql.java
index b9a8ec1d1f..611ca09612 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Gsql.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Gsql.java
@@ -15,6 +15,8 @@
 package com.google.gerrit.pgm;
 
 import com.google.gerrit.lifecycle.LifecycleManager;
+import com.google.gerrit.pgm.util.RuntimeShutdown;
+import com.google.gerrit.pgm.util.SiteProgram;
 import com.google.gerrit.server.config.FactoryModule;
 import com.google.gerrit.sshd.commands.QueryShell;
 import com.google.gerrit.sshd.commands.QueryShell.Factory;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
index d5a9301902..c197d4a54d 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
@@ -14,8 +14,13 @@
 
 package com.google.gerrit.pgm;
 
-import static com.google.gerrit.pgm.DataSourceProvider.Type.H2;
+import static com.google.gerrit.pgm.util.DataSourceProvider.Type.H2;
 
+import com.google.gerrit.pgm.util.ConsoleUI;
+import com.google.gerrit.pgm.util.DataSourceProvider;
+import com.google.gerrit.pgm.util.ErrorLogFile;
+import com.google.gerrit.pgm.util.LibraryDownloader;
+import com.google.gerrit.pgm.util.SiteProgram;
 import com.google.gerrit.reviewdb.AuthType;
 import com.google.gerrit.reviewdb.Project;
 import com.google.gerrit.reviewdb.ReviewDb;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Version.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Version.java
index 3bf9cf8605..2392be532d 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Version.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Version.java
@@ -14,6 +14,8 @@
 
 package com.google.gerrit.pgm;
 
+import com.google.gerrit.pgm.util.AbstractProgram;
+
 /** Display the version of Gerrit. */
 public class Version extends AbstractProgram {
   @Override
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/AbstractProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java
similarity index 99%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/AbstractProgram.java
rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java
index 4d60c989a4..5d40923cea 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/AbstractProgram.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/AbstractProgram.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.pgm;
+package com.google.gerrit.pgm.util;
 
 
 import com.google.gerrit.util.cli.CmdLineParser;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ConsoleUI.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ConsoleUI.java
similarity index 99%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/ConsoleUI.java
rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ConsoleUI.java
index 212f00b4b9..a5939e86cf 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ConsoleUI.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ConsoleUI.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.pgm;
+package com.google.gerrit.pgm.util;
 
 import static org.eclipse.jgit.util.StringUtils.equalsIgnoreCase;
 
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/DataSourceProvider.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/DataSourceProvider.java
similarity index 99%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/DataSourceProvider.java
rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/DataSourceProvider.java
index 2752d93564..b5c90d8fc8 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/DataSourceProvider.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/DataSourceProvider.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.pgm;
+package com.google.gerrit.pgm.util;
 
 import com.google.gerrit.lifecycle.LifecycleListener;
 import com.google.gerrit.server.config.ConfigUtil;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Die.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/Die.java
similarity index 95%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/Die.java
rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/Die.java
index ab4484194a..96e2ec8e51 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Die.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/Die.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.pgm;
+package com.google.gerrit.pgm.util;
 
 public class Die extends RuntimeException {
   private static final long serialVersionUID = 1L;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ErrorLogFile.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java
similarity index 98%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/ErrorLogFile.java
rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java
index 4c19a47f97..ade4a64776 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ErrorLogFile.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ErrorLogFile.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.pgm;
+package com.google.gerrit.pgm.util;
 
 import com.google.gerrit.lifecycle.LifecycleListener;
 
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/LibraryDownloader.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/LibraryDownloader.java
similarity index 93%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/LibraryDownloader.java
rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/LibraryDownloader.java
index d72c948d62..e90395795c 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/LibraryDownloader.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/LibraryDownloader.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.pgm;
+package com.google.gerrit.pgm.util;
 
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.util.HttpSupport;
@@ -32,7 +32,7 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 
 /** Get optional or required 3rd party library files into $site_path/lib. */
-class LibraryDownloader {
+public class LibraryDownloader {
   private final ConsoleUI console;
   private final File libDirectory;
   private boolean required;
@@ -41,32 +41,32 @@ class LibraryDownloader {
   private String sha1;
   private File dst;
 
-  LibraryDownloader(final ConsoleUI console, final File sitePath) {
+  public LibraryDownloader(final ConsoleUI console, final File sitePath) {
     this.console = console;
     this.libDirectory = new File(sitePath, "lib");
   }
 
-  LibraryDownloader setRequired(final boolean required) {
+  public LibraryDownloader setRequired(final boolean required) {
     this.required = required;
     return this;
   }
 
-  LibraryDownloader setName(final String name) {
+  public LibraryDownloader setName(final String name) {
     this.name = name;
     return this;
   }
 
-  LibraryDownloader setJarUrl(final String url) {
+  public LibraryDownloader setJarUrl(final String url) {
     this.jarUrl = url;
     return this;
   }
 
-  LibraryDownloader setSHA1(final String sha1) {
+  public LibraryDownloader setSHA1(final String sha1) {
     this.sha1 = sha1;
     return this;
   }
 
-  void download() {
+  public void download() {
     if (jarUrl == null || !jarUrl.contains("/")) {
       throw new IllegalStateException("Invalid JarUrl for " + name);
     }
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProxyUtil.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ProxyUtil.java
similarity index 98%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProxyUtil.java
rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ProxyUtil.java
index b606ba1481..cce15bf884 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProxyUtil.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/ProxyUtil.java
@@ -35,7 +35,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 // ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-package com.google.gerrit.pgm;
+package com.google.gerrit.pgm.util;
 
 import org.eclipse.jgit.util.CachedAuthenticator;
 
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RuntimeShutdown.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java
similarity index 98%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/RuntimeShutdown.java
rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java
index a97afa9741..18b706442d 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RuntimeShutdown.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/RuntimeShutdown.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.pgm;
+package com.google.gerrit.pgm.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/SiteProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
similarity index 99%
rename from gerrit-pgm/src/main/java/com/google/gerrit/pgm/SiteProgram.java
rename to gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
index bbc8a9d68c..3fc0320d92 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/SiteProgram.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.pgm;
+package com.google.gerrit.pgm.util;
 
 import static com.google.inject.Scopes.SINGLETON;
 import static com.google.inject.Stage.PRODUCTION;