diff --git a/gerrit-common/.gitignore b/gerrit-common/.gitignore
index f89cac402a..ea79d40f9b 100644
--- a/gerrit-common/.gitignore
+++ b/gerrit-common/.gitignore
@@ -2,4 +2,4 @@
 /.classpath
 /.project
 /.settings/org.maven.ide.eclipse.prefs
-/src/main/java/com/google/gerrit/common/Version.properties
+/src/main/resources/com/google/gerrit/common/Version.properties
diff --git a/gerrit-common/pom.xml b/gerrit-common/pom.xml
index 1bf7b67ad2..5956829290 100644
--- a/gerrit-common/pom.xml
+++ b/gerrit-common/pom.xml
@@ -65,8 +65,9 @@ limitations under the License.
             <phase>generate-resources</phase>
             <configuration>
               <tasks>
-                <property name="src" location="${basedir}/src/main/java/" />
+                <property name="src" location="${basedir}/src/main/resources/" />
                 <property name="pkg" location="${src}/com/google/gerrit/common" />
+                <mkdir dir="${pkg}" />
                 <exec executable="git" outputproperty="v">
                   <arg value="describe"/>
                   <arg value="HEAD"/>
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html
similarity index 100%
rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html
rename to gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/become/BecomeAnyAccount.html
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/LoginRedirect.html b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/LoginRedirect.html
similarity index 100%
rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/auth/container/LoginRedirect.html
rename to gerrit-httpd/src/main/resources/com/google/gerrit/httpd/auth/container/LoginRedirect.html
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPage.html b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/HostPage.html
similarity index 100%
rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/HostPage.html
rename to gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/HostPage.html
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerrit.html b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/LegacyGerrit.html
similarity index 100%
rename from gerrit-httpd/src/main/java/com/google/gerrit/httpd/raw/LegacyGerrit.html
rename to gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/LegacyGerrit.html
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 244b66503f..f22ffcf762 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
@@ -258,16 +258,12 @@ public class Init extends SiteProgram {
       System.err.println();
     }
 
-    if (!secure_config.exists()) {
-      chmod(0600, secure_config);
-    }
     if (!replication_config.exists()) {
       replication_config.createNewFile();
     }
-    if (!gerrit_sh.exists()) {
-      extract(gerrit_sh, "WEB-INF/extra/bin/gerrit.sh");
-      chmod(0755, gerrit_sh);
-    }
+
+    extract(gerrit_sh, Init.class, "gerrit.sh");
+    chmod(0755, gerrit_sh);
   }
 
   private void updateSystemConfig() throws OrmException {
@@ -371,10 +367,7 @@ public class Init extends SiteProgram {
     }
   }
 
-  private static void chmod(final int mode, final File path) throws IOException {
-    if (!path.exists() && !path.createNewFile()) {
-      throw new IOException("Cannot create " + path);
-    }
+  private static void chmod(final int mode, final File path) {
     path.setReadable(false, false /* all */);
     path.setWritable(false, false /* all */);
     path.setExecutable(false, false /* all */);
@@ -1074,14 +1067,30 @@ public class Init extends SiteProgram {
     }
   }
 
-  private static void extract(final File dst, final String path)
-      throws IOException {
-    final URL u = GerritLauncher.class.getClassLoader().getResource(path);
-    if (u == null) {
-      System.err.println("warn: Cannot read " + path);
-      return;
+  private static void extract(final File dst, final Class<?> sibling,
+      final String name) throws IOException {
+    final InputStream in = open(sibling, name);
+    if (in != null) {
+      copy(dst, in);
     }
-    copy(dst, u.openStream());
+  }
+
+  private static InputStream open(final Class<?> sibling, final String name)
+      throws IOException {
+    final URL u = sibling.getResource(name);
+    if (u == null) {
+      String pkg = sibling.getName();
+      int end = pkg.lastIndexOf('.');
+      if (0 < end) {
+        pkg = pkg.substring(0, end + 1);
+        pkg = pkg.replace('.', '/');
+      } else {
+        pkg = "";
+      }
+      System.err.println("warn: Cannot read " + pkg + name);
+      return null;
+    }
+    return u.openStream();
   }
 
   private static void copy(final File dst, final InputStream in)
diff --git a/gerrit-war/src/main/webapp/WEB-INF/extra/bin/gerrit.sh b/gerrit-pgm/src/main/resources/com/google/gerrit/pgm/gerrit.sh
similarity index 100%
rename from gerrit-war/src/main/webapp/WEB-INF/extra/bin/gerrit.sh
rename to gerrit-pgm/src/main/resources/com/google/gerrit/pgm/gerrit.sh
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/TOC b/gerrit-sshd/src/main/resources/com/google/gerrit/sshd/scproot/TOC
similarity index 100%
rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/TOC
rename to gerrit-sshd/src/main/resources/com/google/gerrit/sshd/scproot/TOC
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/bin/gerrit-cherry-pick b/gerrit-sshd/src/main/resources/com/google/gerrit/sshd/scproot/bin/gerrit-cherry-pick
similarity index 100%
rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/bin/gerrit-cherry-pick
rename to gerrit-sshd/src/main/resources/com/google/gerrit/sshd/scproot/bin/gerrit-cherry-pick
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/hooks/commit-msg b/gerrit-sshd/src/main/resources/com/google/gerrit/sshd/scproot/hooks/commit-msg
similarity index 100%
rename from gerrit-sshd/src/main/java/com/google/gerrit/sshd/scproot/hooks/commit-msg
rename to gerrit-sshd/src/main/resources/com/google/gerrit/sshd/scproot/hooks/commit-msg
diff --git a/gerrit-war/src/main/java/log4j.properties b/gerrit-war/src/main/resources/log4j.properties
similarity index 100%
rename from gerrit-war/src/main/java/log4j.properties
rename to gerrit-war/src/main/resources/log4j.properties
diff --git a/pom.xml b/pom.xml
index fe36666a71..d4930f23f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -295,16 +295,6 @@ limitations under the License.
   </licenses>
 
   <build>
-    <resources>
-      <resource>
-        <directory>${basedir}/src/main/java</directory>
-        <excludes>
-          <exclude>**/*.gwt.xml</exclude>
-          <exclude>**/*.java</exclude>
-        </excludes>
-      </resource>
-    </resources>
-
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>