diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD
index 9d487d8f7e..05fb58d6f4 100644
--- a/java/com/google/gerrit/httpd/BUILD
+++ b/java/com/google/gerrit/httpd/BUILD
@@ -1,62 +1,19 @@
-# TODO(davido): Consider to isolate war specific sources in its own package
-WAR_SRCS = [
-    "ReviewDbDataSourceProvider.java",
-    "SiteInitializer.java",
-    "SitePathFromSystemConfigProvider.java",
-    "UnzippedDistribution.java",
-    "WebAppInitializer.java",
-]
-
-DEPS = [
-    "//gerrit-server:receive",
-    "//gerrit-server:server",
-    "//java/com/google/gerrit/extensions:api",
-    "//java/com/google/gerrit/lifecycle",
-    "//java/com/google/gerrit/reviewdb:server",
-    "//lib:guava",
-    "//lib:gwtorm",
-    "//lib/guice",
-    "//lib/guice:guice-servlet",
-    "//lib/jgit/org.eclipse.jgit:jgit",
-    "//lib/log:api",
-]
-
-java_library(
-    name = "war-init",
-    srcs = WAR_SRCS,
-    visibility = ["//visibility:public"],
-    deps = DEPS + [
-        ":httpd",
-        "//gerrit-server:module",
-        "//java/com/google/gerrit/elasticsearch",
-        "//java/com/google/gerrit/gpg",
-        "//java/com/google/gerrit/httpd/auth/oauth",
-        "//java/com/google/gerrit/httpd/auth/openid",
-        "//java/com/google/gerrit/lucene",
-        "//java/com/google/gerrit/metrics/dropwizard",
-        "//java/com/google/gerrit/pgm/init",
-        "//java/com/google/gerrit/pgm/util",
-        "//java/com/google/gerrit/server/cache/h2",
-        "//java/com/google/gerrit/sshd",
-        "//lib:servlet-api-3_1",
-        "//prolog:gerrit-prolog-common",
-    ],
-)
-
 java_library(
     name = "httpd",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = WAR_SRCS,
-    ),
+    srcs = glob(["**/*.java"]),
     resource_strip_prefix = "resources",
     resources = ["//resources/com/google/gerrit/httpd"],
     visibility = ["//visibility:public"],
-    deps = DEPS + [
+    deps = [
+        "//gerrit-server:receive",
+        "//gerrit-server:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
+        "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/launcher",
+        "//java/com/google/gerrit/lifecycle",
         "//java/com/google/gerrit/metrics",
+        "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/util/cli",
         "//java/com/google/gerrit/util/http",
         "//java/com/google/gwtexpui/linker:server",
@@ -64,13 +21,19 @@ java_library(
         "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:gson",
+        "//lib:guava",
         "//lib:gwtjsonrpc",
+        "//lib:gwtorm",
         "//lib:jsch",
         "//lib:servlet-api-3_1",
         "//lib:soy",
         "//lib/auto:auto-value",
         "//lib/commons:codec",
+        "//lib/guice",
         "//lib/guice:guice-assistedinject",
+        "//lib/guice:guice-servlet",
         "//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
     ],
 )
diff --git a/java/com/google/gerrit/httpd/init/BUILD b/java/com/google/gerrit/httpd/init/BUILD
new file mode 100644
index 0000000000..a4ea7e2cda
--- /dev/null
+++ b/java/com/google/gerrit/httpd/init/BUILD
@@ -0,0 +1,32 @@
+java_library(
+    name = "init",
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-server:module",
+        "//gerrit-server:receive",
+        "//gerrit-server:server",
+        "//java/com/google/gerrit/elasticsearch",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/gpg",
+        "//java/com/google/gerrit/httpd",
+        "//java/com/google/gerrit/httpd/auth/oauth",
+        "//java/com/google/gerrit/httpd/auth/openid",
+        "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/lucene",
+        "//java/com/google/gerrit/metrics/dropwizard",
+        "//java/com/google/gerrit/pgm/init",
+        "//java/com/google/gerrit/pgm/util",
+        "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/server/cache/h2",
+        "//java/com/google/gerrit/sshd",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib:servlet-api-3_1",
+        "//lib/guice",
+        "//lib/guice:guice-servlet",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+        "//prolog:gerrit-prolog-common",
+    ],
+)
diff --git a/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java b/java/com/google/gerrit/httpd/init/ReviewDbDataSourceProvider.java
similarity index 98%
rename from java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java
rename to java/com/google/gerrit/httpd/init/ReviewDbDataSourceProvider.java
index 616030e1db..6e65780fbd 100644
--- a/java/com/google/gerrit/httpd/ReviewDbDataSourceProvider.java
+++ b/java/com/google/gerrit/httpd/init/ReviewDbDataSourceProvider.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.httpd;
+package com.google.gerrit.httpd.init;
 
 import com.google.gerrit.extensions.events.LifecycleListener;
 import com.google.inject.Provider;
diff --git a/java/com/google/gerrit/httpd/SiteInitializer.java b/java/com/google/gerrit/httpd/init/SiteInitializer.java
similarity index 98%
rename from java/com/google/gerrit/httpd/SiteInitializer.java
rename to java/com/google/gerrit/httpd/init/SiteInitializer.java
index 07e662beea..17a95b57ec 100644
--- a/java/com/google/gerrit/httpd/SiteInitializer.java
+++ b/java/com/google/gerrit/httpd/init/SiteInitializer.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.httpd;
+package com.google.gerrit.httpd.init;
 
 import com.google.gerrit.pgm.init.BaseInit;
 import com.google.gerrit.pgm.init.PluginsDistribution;
diff --git a/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java b/java/com/google/gerrit/httpd/init/SitePathFromSystemConfigProvider.java
similarity index 98%
rename from java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java
rename to java/com/google/gerrit/httpd/init/SitePathFromSystemConfigProvider.java
index e1eb9de134..96ba28b9bf 100644
--- a/java/com/google/gerrit/httpd/SitePathFromSystemConfigProvider.java
+++ b/java/com/google/gerrit/httpd/init/SitePathFromSystemConfigProvider.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.httpd;
+package com.google.gerrit.httpd.init;
 
 import com.google.gerrit.reviewdb.client.SystemConfig;
 import com.google.gerrit.reviewdb.server.ReviewDb;
diff --git a/java/com/google/gerrit/httpd/UnzippedDistribution.java b/java/com/google/gerrit/httpd/init/UnzippedDistribution.java
similarity index 98%
rename from java/com/google/gerrit/httpd/UnzippedDistribution.java
rename to java/com/google/gerrit/httpd/init/UnzippedDistribution.java
index ec92fbab7d..9c0142c5e7 100644
--- a/java/com/google/gerrit/httpd/UnzippedDistribution.java
+++ b/java/com/google/gerrit/httpd/init/UnzippedDistribution.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.httpd;
+package com.google.gerrit.httpd.init;
 
 import static com.google.gerrit.pgm.init.InitPlugins.JAR;
 import static com.google.gerrit.pgm.init.InitPlugins.PLUGIN_DIR;
diff --git a/java/com/google/gerrit/httpd/WebAppInitializer.java b/java/com/google/gerrit/httpd/init/WebAppInitializer.java
similarity index 97%
rename from java/com/google/gerrit/httpd/WebAppInitializer.java
rename to java/com/google/gerrit/httpd/init/WebAppInitializer.java
index 45270faa88..185157d80e 100644
--- a/java/com/google/gerrit/httpd/WebAppInitializer.java
+++ b/java/com/google/gerrit/httpd/init/WebAppInitializer.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.httpd;
+package com.google.gerrit.httpd.init;
 
 import static com.google.inject.Scopes.SINGLETON;
 import static com.google.inject.Stage.PRODUCTION;
@@ -22,6 +22,16 @@ import com.google.gerrit.common.EventBroker;
 import com.google.gerrit.elasticsearch.ElasticIndexModule;
 import com.google.gerrit.extensions.client.AuthType;
 import com.google.gerrit.gpg.GpgModule;
+import com.google.gerrit.httpd.AllRequestFilter;
+import com.google.gerrit.httpd.GetUserFilter;
+import com.google.gerrit.httpd.GitOverHttpModule;
+import com.google.gerrit.httpd.H2CacheBasedWebSession;
+import com.google.gerrit.httpd.HttpCanonicalWebUrlProvider;
+import com.google.gerrit.httpd.RequestContextFilter;
+import com.google.gerrit.httpd.RequestMetricsFilter;
+import com.google.gerrit.httpd.RequireSslFilter;
+import com.google.gerrit.httpd.WebModule;
+import com.google.gerrit.httpd.WebSshGlueModule;
 import com.google.gerrit.httpd.auth.oauth.OAuthModule;
 import com.google.gerrit.httpd.auth.openid.OpenIdModule;
 import com.google.gerrit.httpd.plugins.HttpPluginModule;
diff --git a/tools/bzl/pkg_war.bzl b/tools/bzl/pkg_war.bzl
index 32256502e8..c9cd5d7438 100644
--- a/tools/bzl/pkg_war.bzl
+++ b/tools/bzl/pkg_war.bzl
@@ -18,7 +18,7 @@ jar_filetype = FileType([".jar"])
 
 LIBS = [
     "//java/com/google/gerrit/common:version",
-    "//java/com/google/gerrit/httpd:war-init",
+    "//java/com/google/gerrit/httpd/init",
     "//lib:postgresql",
     "//lib/bouncycastle:bcpkix",
     "//lib/bouncycastle:bcprov",