diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 409ead37fc..0000000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/.jgit_version
-/config.mak
-/gerrit2_dump.sql.bz2
-/gerrit-server.jar
-/gerrit.war
-/release
-hs_err_pid*.log
diff --git a/DEV_README b/DEV_README
index 0484d85ce1..04b3ee9009 100644
--- a/DEV_README
+++ b/DEV_README
@@ -17,10 +17,6 @@ To create a new client workspace:
     -u git://android.git.kernel.org/tools/manifest.git \
     -b gerrit2
 
-  echo 'GWT_SDK = path/to/your/gwt' >gwtjsonrpc/config.mak
-  echo 'GWT_SDK = path/to/your/gwt' >gerrit/config.mak
-
-
 Setting up the Database
 -----------------------
 
@@ -28,28 +24,18 @@ You'll need to configure your development workspace to use a database
 gwtorm supports (or add the necessary dialect support to gwtorm,
 and then configure your workspace anyway).
 
-  cd webapp/src
+  cd devdb
   cp GerritServer.properties_example GerritServer.properties
 
 Now edit GerritServer.properties to uncomment the database you are
 going to use, and possibly update properties such as "user" and
 "password" to reflect the actual connection information used.
 
-In the future gwtorm (and Gerrit 2) should be getting the DataSource
-from the application server, but I don't yet know how to configure
-that in GWT hosted mode.
-
 
 Setting up Eclipse
 ------------------
 
-Bootstrap the build by compiling the libraries:
-
-  make -C gerrit web-lib
-
-Setup the "GWT" user library (see gerrit/README_ECLIPSE).
-
-Import the 'Gerrit-webapp' project from "gerrit/webapp/".
+see gerrit/README_ECLIPSE
 
 
 Debugging the Application
@@ -57,11 +43,21 @@ Debugging the Application
 
 From Eclipse:
 
-  Use the "Gerrit-webapp" launch profile.
+  Use "gerrit_debug" launch profile (all platforms).
+
+  Use "gerrit_macos" launch profile (Mac OS X systems).
+
+
+Building
+--------
 
 From the command line:
 
-  make -C gerrit web-shell
+  (cd appdist && mvn package)
+
+Output packages will be in:
+
+  appdst/target/gerrit-*-bin.*
 
 
 Client-Server RPC
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 293c1561db..0000000000
--- a/Makefile
+++ /dev/null
@@ -1,221 +0,0 @@
-# Gerrit
-#
-# Copyright 2008 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Define GWT_SDK to the location of the Google Web Toolkit SDK.
-#
-# Define GEN_DEBUG to save the generated Java code from GWT.
-#
-
-uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
-
-JAVA       = java
-JAVAC      = javac
-JAR        = jar
-JAVA_ARGS  = -Xmx265m
-CPIO       = cpio -pud
-GWT_OS     = unknown
-GWT_FLAGS  =
-
-gwtjsonrpc = ../gwtjsonrpc
-gwtorm     = ../gwtorm
-jgit       = ../jgit
-
-ifeq ($(uname_S),Darwin)
-	GWT_OS = mac
-endif
-ifeq ($(uname_S),Linux)
-	GWT_OS = linux
-endif
-ifeq ($(uname_S),Cygwin)
-	GWT_OS = win
-endif
-
--include config.mak
-
-WEBAPP   := $(abspath webapp)
-GWT_SDK  := $(abspath $(GWT_SDK))
-WEB_MAIN := com.google.gerrit.Gerrit
-GWT_CP   = \
-	$(GWT_SDK)/gwt-user.jar \
-	$(GWT_SDK)/gwt-dev-$(GWT_OS).jar \
-#end GWT_CP
-
-WEB_LIB_GEN = \
-	$(WEBAPP)/lib/antlr.jar \
-	$(WEBAPP)/lib/asm.jar \
-	$(WEBAPP)/lib/commons-codec.jar \
-	$(WEBAPP)/lib/gson.jar \
-	$(WEBAPP)/lib/gwtjsonrpc.jar \
-	$(WEBAPP)/lib/gwtorm.jar \
-	$(WEBAPP)/lib/jdbc-h2.jar \
-    $(WEBAPP)/lib/jgit.jar \
-    $(WEBAPP)/lib/jsch.jar \
-#end WEB_LIB_GEN
-
-ALL_LIB = $(filter-out $(WEBAPP)/lib/jdbc-h2.jar, \
-	$(GWT_SDK)/gwt-servlet.jar \
-	$(WEBAPP)/lib/dyuproject-openid.jar \
-	$(WEBAPP)/lib/dyuproject-util.jar \
-	$(WEBAPP)/lib/jetty-util.jar \
-	$(WEB_LIB_GEN) \
-	)
-#end ALL_LIB
-
-ALL_JDBC = $(wildcard $(WEBAPP)/lib/jdbc-*.jar)
-
-ifdef GEN_DEBUG
-	GWT_FLAGS += -gen gensrc
-endif
-
-MY_JAVA := $(shell find $(WEBAPP)/src -name \*.java)
-MY_RSRC := $(shell find $(WEBAPP)/src \
-     -name \*.css \
-  -o -name \*.gif \
-  -o -name \*.html \
-  -o -name \*.png \
-  -o -name \*.properties \
-  )
-MY_JAR  := gerrit-server.jar
-MY_WAR  := gerrit.war
-MY_WXML := $(WEBAPP)/src/com/google/gerrit/web.xml
-MY_NCJS := $(WEBAPP)/www/$(WEB_MAIN)/$(WEB_MAIN).nocache.js
-
-all: $(MY_WAR)
-
-clean:
-	rm -rf $(MY_JAR) $(MY_WAR) .bin
-	rm -f $(WEB_LIB_GEN)
-	rm -f .jgit_version
-	rm -rf $(WEBAPP)/gensrc
-	rm -rf $(WEBAPP)/classes
-	rm -rf $(WEBAPP)/www
-	rm -rf $(WEBAPP)/tomcat
-	rm -rf release
-
-release: $(ALL_LIB) $(MY_JAR)
-	rm -rf release
-	mkdir -p release/bin release/lib
-	$(foreach p,$(ALL_LIB) $(MY_JAR) $(ALL_JDBC),cp $p release/lib &&) :
-	$(foreach p,$(wildcard bin/*),\
-	  cp $p release/$p && \
-	  chmod 555 release/$p &&) :
-
-clean-h2db:
-	rm -f $(WEBAPP)/ReviewDb.*.db
-.PHONY: clean-h2db
-
-$(MY_JAR): $(MY_JAVA) $(ALL_LIB)
-	rm -rf .bin
-	mkdir .bin
-	CLASSPATH= && \
-	$(foreach p,$(ALL_LIB) $(GWT_SDK)/gwt-user.jar,CLASSPATH="$$CLASSPATH:$p" &&) \
-	export CLASSPATH && \
-	cd $(WEBAPP)/src && $(JAVAC) \
-		-encoding utf-8 \
-		-source 1.5 \
-		-target 1.5 \
-		-g \
-		-d "$(abspath .bin)" \
-		$(patsubst $(WEBAPP)/src/%,%,$(MY_JAVA))
-	cd .bin && $(JAR) cf ../$(MY_JAR) .
-	rm -rf .bin
-
-$(MY_WAR): $(MY_NCJS) $(ALL_LIB) $(MY_JAR) $(MY_WXML)
-	rm -rf .bin
-	mkdir -p .bin/WEB-INF/lib
-	cd $(WEBAPP)/www/$(WEB_MAIN) && find . | $(CPIO) $(abspath .bin)
-	for p in $$(find .bin -type f); do\
-	  case $$p in\
-	  *.png) : skip ;;\
-	  *) gzip -9c $$p > $$p.gz || exit ;;\
-	  esac;\
-	done
-	$(foreach p,$(ALL_LIB) $(MY_JAR),cp $p .bin/WEB-INF/lib &&) :
-	cp $(MY_WXML) .bin/WEB-INF
-	mkdir -p .bin/WEB-INF/classes/com/google/gerrit/public
-	$(foreach p,Gerrit.html SetCookie.html,\
-	  rm .bin/$p.gz && \
-	  mv .bin/$p .bin/WEB-INF/classes/com/google/gerrit/public &&) :
-	cd .bin && $(JAR) cf ../$(MY_WAR) .
-	rm -rf .bin
-
-$(MY_NCJS): \
-		$(MY_JAR) \
-		$(MY_JAVA) \
-		$(MY_RSRC) \
-		$(WEBAPP)/src/com/google/gerrit/Gerrit.gwt.xml
-	CLASSPATH=src:$(abspath $(MY_JAR)) && \
-	$(foreach p,$(GWT_CP) $(ALL_LIB),CLASSPATH=$$CLASSPATH:$p &&) \
-	export CLASSPATH && \
-	cd $(WEBAPP) && $(JAVA) $(JAVA_ARGS) \
-		com.google.gwt.dev.GWTCompiler \
-		-out www \
-		$(GWT_FLAGS) \
-		$(WEB_MAIN)
-
-web-shell: $(MY_JAR) web-lib
-	CLASSPATH=src:$(abspath $(MY_JAR)) && \
-	$(foreach p,$(GWT_CP) $(ALL_LIB) $(ALL_JDBC),CLASSPATH=$$CLASSPATH:$p &&) \
-	export CLASSPATH && \
-	cd $(WEBAPP) && $(JAVA) $(JAVA_ARGS) \
-		com.google.gwt.dev.GWTShell \
-		-out www \
-		$(WEB_MAIN)/Gerrit.html
-
-web-lib: $(WEB_LIB_GEN)
-
-$(WEBAPP)/lib/gwtjsonrpc.jar: $(gwtjsonrpc)/lib/gwtjsonrpc.jar
-	cp $< $@
-$(WEBAPP)/lib/gson.jar: $(gwtjsonrpc)/lib/gson.jar
-	cp $< $@
-$(WEBAPP)/lib/commons-codec.jar: $(gwtjsonrpc)/lib/commons-codec.jar
-	cp $< $@
-$(gwtjsonrpc)/lib/gwtjsonrpc.jar: make-gwtjsonrpc
-	$(MAKE) -C $(gwtjsonrpc) GWT_SDK=$(GWT_SDK)
-.PHONY: make-gwtjsonrpc
-
-$(WEBAPP)/lib/gwtorm.jar: $(gwtorm)/lib/gwtorm.jar
-	cp $< $@
-$(WEBAPP)/lib/antlr.jar: $(gwtorm)/lib/antlr.jar
-	cp $< $@
-$(WEBAPP)/lib/asm.jar: $(gwtorm)/lib/asm.jar
-	cp $< $@
-$(WEBAPP)/lib/jdbc-h2.jar: $(gwtorm)/lib/jdbc-h2.jar
-	cp $< $@
-$(gwtorm)/lib/gwtorm.jar: make-gwtorm
-	$(MAKE) -C $(gwtorm) GWT_SDK=$(GWT_SDK)
-.PHONY: make-gwtorm
-
-$(WEBAPP)/lib/jsch.jar: $(jgit)/org.spearce.jgit/lib/jsch-0.1.37.jar
-	cp $< $@
-$(WEBAPP)/lib/jgit.jar: .jgit_version
-	rm -f $@ $(basename $@)_src.zip
-	cd $(jgit) && $(SHELL) ./make_jgit.sh
-	cp $(jgit)/jgit.jar $@
-	chmod 644 $@
-	cp $(jgit)/jgit_src.zip $(basename $@)_src.zip
-
-.jgit_version: jgit_phony
-	@a=`git --git-dir=$(jgit)/.git rev-parse HEAD 2>/dev/null`; \
-	 b=`cat .jgit_version 2>/dev/null`; \
-	 if test z$$a = z$$b; then : up to date; \
-	 else echo $$a >$@; fi
-.PHONY: jgit_phony
-
-.PHONY: all
-.PHONY: clean
-.PHONY: release
-.PHONY: web-shell web-lib
diff --git a/README_ECLIPSE b/README_ECLIPSE
index ba31783f1e..d1756358d1 100644
--- a/README_ECLIPSE
+++ b/README_ECLIPSE
@@ -16,3 +16,35 @@ Create a User Library called "GWT":
 
   * Select gwt-user.jar from the $(GWT_SDK) directory.
   * Select gwt-dev-$(GWT_OS).jar from the $(GWT_SDK) directory.
+
+
+Maven
+-----
+
+- Install the Maven Integration plugins:
+
+  http://m2eclipse.codehaus.org/
+
+
+Build
+-----
+
+- Ensure jgit is installed in your maven repository:
+
+  (cd ../jgit/jgit-maven/jgit/ && mvn install)
+
+
+Import
+------
+
+- Import appdist using General -> Maven Projects
+
+  Uncheck "jgit".  You don't want to import it.
+
+- Right click on gwtorm, Maven -> Update Project Configuration to
+  force a compile of the generted ANTLR sources.  This fixes the
+  compile errors identified after import.
+
+- Import gerrit-devdb using General -> Existing Projects
+
+- Copy the PostgreSQL JDBC driver into the gerrit-devdb project.
diff --git a/appdist/.gitignore b/appdist/.gitignore
new file mode 100644
index 0000000000..54608607e9
--- /dev/null
+++ b/appdist/.gitignore
@@ -0,0 +1,5 @@
+/target
+/bin
+/.classpath
+/.project
+/.settings
diff --git a/appdist/bin/.classpath b/appdist/bin/.classpath
new file mode 100644
index 0000000000..d23ddd2b58
--- /dev/null
+++ b/appdist/bin/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/appdist/bin/.gitignore b/appdist/bin/.gitignore
new file mode 100644
index 0000000000..7075a2f4f2
--- /dev/null
+++ b/appdist/bin/.gitignore
@@ -0,0 +1,4 @@
+/target
+/.classpath
+/.project
+/.settings
diff --git a/appdist/bin/.project b/appdist/bin/.project
new file mode 100644
index 0000000000..7c55999aa3
--- /dev/null
+++ b/appdist/bin/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>gerrit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/appdist/bin/.settings/org.maven.ide.eclipse.prefs b/appdist/bin/.settings/org.maven.ide.eclipse.prefs
new file mode 100644
index 0000000000..528720b5e1
--- /dev/null
+++ b/appdist/bin/.settings/org.maven.ide.eclipse.prefs
@@ -0,0 +1,8 @@
+#Sat Dec 20 16:35:24 PST 2008
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+version=1
diff --git a/appdist/bin/distribution.xml b/appdist/bin/distribution.xml
new file mode 100644
index 0000000000..863e529c2b
--- /dev/null
+++ b/appdist/bin/distribution.xml
@@ -0,0 +1,40 @@
+<assembly>
+  <id>bin</id>
+
+  <formats>
+    <format>dir</format>
+    <format>tar.bz2</format>
+  </formats>
+
+  <moduleSets>
+    <moduleSet>
+      <includes>
+        <include>gerrit:gerrit-appjar</include>
+      </includes>
+      <binaries>
+        <outputDirectory>lib</outputDirectory>
+        <unpack>false</unpack>
+      </binaries>
+    </moduleSet>
+
+    <moduleSet>
+      <includes>
+        <include>gerrit:gerrit-appwar</include>
+      </includes>
+      <binaries>
+        <outputDirectory>www</outputDirectory>
+        <unpack>false</unpack>
+        <includeDependencies>false</includeDependencies>
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <lineEnding>unix</lineEnding>
+      <fileMode>755</fileMode>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/appdist/bin/pom.xml b/appdist/bin/pom.xml
new file mode 100644
index 0000000000..c50c23c8dd
--- /dev/null
+++ b/appdist/bin/pom.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2008 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>gerrit</groupId>
+  <artifactId>gerrit</artifactId>
+  <packaging>pom</packaging>
+  <version>2.0-SNAPSHOT</version>
+  <name>gerrit</name>
+  <description>Gerrit - Web Based Code Review</description>
+  <url>http://android.git.kernel.org/?p=tools/gerrit.git</url>
+
+  <mailingLists>
+    <mailingList>
+      <name>repo-discuss mailing list</name>
+      <post>repo-discuss@googlegroups.com</post>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <name>Shawn O. Pearce</name>
+      <email>sop@google.com</email>
+      <roles>
+        <role>Maintainer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License, 2.0</name>
+      <comments>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+      </comments>
+    </license>
+  </licenses>
+
+  <modules>
+    <module>../../jgit/jgit-maven/jgit</module>
+    <module>../../gwtorm</module>
+    <module>../../gwtjsonrpc</module>
+    <module>../appjar</module>
+    <module>../appwar</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>distribution.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/appdist/distribution.xml b/appdist/distribution.xml
new file mode 100644
index 0000000000..863e529c2b
--- /dev/null
+++ b/appdist/distribution.xml
@@ -0,0 +1,40 @@
+<assembly>
+  <id>bin</id>
+
+  <formats>
+    <format>dir</format>
+    <format>tar.bz2</format>
+  </formats>
+
+  <moduleSets>
+    <moduleSet>
+      <includes>
+        <include>gerrit:gerrit-appjar</include>
+      </includes>
+      <binaries>
+        <outputDirectory>lib</outputDirectory>
+        <unpack>false</unpack>
+      </binaries>
+    </moduleSet>
+
+    <moduleSet>
+      <includes>
+        <include>gerrit:gerrit-appwar</include>
+      </includes>
+      <binaries>
+        <outputDirectory>www</outputDirectory>
+        <unpack>false</unpack>
+        <includeDependencies>false</includeDependencies>
+      </binaries>
+    </moduleSet>
+  </moduleSets>
+
+  <fileSets>
+    <fileSet>
+      <directory>src/main/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <lineEnding>unix</lineEnding>
+      <fileMode>755</fileMode>
+    </fileSet>
+  </fileSets>
+</assembly>
diff --git a/appdist/pom.xml b/appdist/pom.xml
new file mode 100644
index 0000000000..c50c23c8dd
--- /dev/null
+++ b/appdist/pom.xml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2008 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>gerrit</groupId>
+  <artifactId>gerrit</artifactId>
+  <packaging>pom</packaging>
+  <version>2.0-SNAPSHOT</version>
+  <name>gerrit</name>
+  <description>Gerrit - Web Based Code Review</description>
+  <url>http://android.git.kernel.org/?p=tools/gerrit.git</url>
+
+  <mailingLists>
+    <mailingList>
+      <name>repo-discuss mailing list</name>
+      <post>repo-discuss@googlegroups.com</post>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <name>Shawn O. Pearce</name>
+      <email>sop@google.com</email>
+      <roles>
+        <role>Maintainer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License, 2.0</name>
+      <comments>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+      </comments>
+    </license>
+  </licenses>
+
+  <modules>
+    <module>../../jgit/jgit-maven/jgit</module>
+    <module>../../gwtorm</module>
+    <module>../../gwtjsonrpc</module>
+    <module>../appjar</module>
+    <module>../appwar</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>distribution.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/bin/gerrit2.sh b/appdist/src/main/bin/gerrit2.sh
similarity index 88%
rename from bin/gerrit2.sh
rename to appdist/src/main/bin/gerrit2.sh
index 52053702dd..5af5668ce4 100644
--- a/bin/gerrit2.sh
+++ b/appdist/src/main/bin/gerrit2.sh
@@ -27,12 +27,6 @@ then
 	exit 1
 fi
 
-if ! [ -f "$GERRIT2_HOME/lib/gerrit-server.jar" ]
-then
-	echo >&2 "error: $GERRIT2_HOME does not have lib/gerrit-server.jar"
-	exit 1
-fi
-
 if [ -z "$GERRIT2_JAVA" ]
 then
 	GERRIT2_JAVA=java
@@ -71,17 +65,24 @@ shift
 if [ -n "$config_dir" ]
 then
 	CLASSPATH=$config_dir
+	for j in $config_dir/jdbc-*.jar
+	do
+		[ -f "$j" ] && CLASSPATH=$CLASSPATH:$j
+	done
 else
 	CLASSPATH=
 fi
 
 for j in $GERRIT2_HOME/lib/*.jar
 do
-	if [ -z "$CLASSPATH" ]
+	if [ -f "$j" ]
 	then
-		CLASSPATH=$j
-	else
-		CLASSPATH=$CLASSPATH:$j
+        if [ -z "$CLASSPATH" ]
+		then
+			CLASSPATH=$j
+		else
+			CLASSPATH=$CLASSPATH:$j
+        fi
 	fi
 done
 export CLASSPATH
diff --git a/appjar/.gitignore b/appjar/.gitignore
new file mode 100644
index 0000000000..ac1c91e6a3
--- /dev/null
+++ b/appjar/.gitignore
@@ -0,0 +1,6 @@
+/target
+/.classpath
+/.project
+/.settings/org.maven.ide.eclipse.prefs
+/gwt_www
+/tomcat
diff --git a/webapp/.settings/org.eclipse.core.resources.prefs b/appjar/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from webapp/.settings/org.eclipse.core.resources.prefs
rename to appjar/.settings/org.eclipse.core.resources.prefs
diff --git a/webapp/.settings/org.eclipse.core.runtime.prefs b/appjar/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from webapp/.settings/org.eclipse.core.runtime.prefs
rename to appjar/.settings/org.eclipse.core.runtime.prefs
diff --git a/webapp/.settings/org.eclipse.jdt.core.prefs b/appjar/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from webapp/.settings/org.eclipse.jdt.core.prefs
rename to appjar/.settings/org.eclipse.jdt.core.prefs
diff --git a/webapp/.settings/org.eclipse.jdt.ui.prefs b/appjar/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from webapp/.settings/org.eclipse.jdt.ui.prefs
rename to appjar/.settings/org.eclipse.jdt.ui.prefs
diff --git a/appjar/gerrit_debug.launch b/appjar/gerrit_debug.launch
new file mode 100644
index 0000000000..eb59268cb6
--- /dev/null
+++ b/appjar/gerrit_debug.launch
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<stringAttribute key="bad_container_name" value="/gerrit-appja"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/gerrit-appjar"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;gerrit-appjar&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.USER_LIBRARY/GWT&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/gwtorm/src/main/java&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/gwtjsonrpc/src/main/java&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;gerrit-appjar&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;gerrit-devdb&quot; type=&quot;1&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/gerrit-devdb/jdbc-postgresql.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out gwt_www com.google.gerrit.Gerrit/Gerrit.html"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="gerrit-appjar"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M"/>
+</launchConfiguration>
diff --git a/appjar/gerrit_macos.launch b/appjar/gerrit_macos.launch
new file mode 100644
index 0000000000..cebc0f86b6
--- /dev/null
+++ b/appjar/gerrit_macos.launch
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<stringAttribute key="bad_container_name" value="/gerrit-appja"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/gerrit-appjar"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;gerrit-appjar&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.USER_LIBRARY/GWT&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/gwtorm/src/main/java&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/gwtjsonrpc/src/main/java&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;gerrit-appjar&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;gerrit-devdb&quot; type=&quot;1&quot;/&gt;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/gerrit-devdb/jdbc-postgresql.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.classpathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out gwt_www com.google.gerrit.Gerrit/Gerrit.html"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="gerrit-appjar"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.maven.ide.eclipse.launchconfig.sourcepathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M -XstartOnFirstThread"/>
+</launchConfiguration>
diff --git a/appjar/pom.xml b/appjar/pom.xml
new file mode 100644
index 0000000000..28d4d5f540
--- /dev/null
+++ b/appjar/pom.xml
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2008 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>gerrit</groupId>
+  <artifactId>gerrit-appjar</artifactId>
+  <packaging>jar</packaging>
+  <version>2.0-SNAPSHOT</version>
+  <name>gerrit-appjar</name>
+  <description>Gerrit - Web Based Code Review</description>
+  <url>http://android.git.kernel.org/?p=tools/gerrit.git</url>
+
+  <mailingLists>
+    <mailingList>
+      <name>repo-discuss mailing list</name>
+      <post>repo-discuss@googlegroups.com</post>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <name>Shawn O. Pearce</name>
+      <email>sop@google.com</email>
+      <roles>
+        <role>Maintainer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License, 2.0</name>
+      <comments>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+      </comments>
+    </license>
+  </licenses>
+
+  <properties>
+    <gwtVersion>1.5.3</gwtVersion>
+  </properties>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>com/google/gerrit/Gerrit.gwt.xml</include>
+          <include>com/google/gerrit/public/**</include>
+          <include>com/google/gerrit/client/**</include>
+        </includes>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>gwtorm</groupId>
+      <artifactId>gwtorm</artifactId>
+      <version>0.1-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>gwtjsonrpc</groupId>
+      <artifactId>gwtjsonrpc</artifactId>
+      <version>0.1-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.dyuproject</groupId>
+      <artifactId>dyuproject-openid</artifactId>
+      <version>1.1.0</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.spearce</groupId>
+      <artifactId>jgit</artifactId>
+      <version>0.4-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+
+    <!-- GWT -->
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-servlet</artifactId>
+      <version>${gwtVersion}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-user</artifactId>
+      <version>${gwtVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-dev</artifactId>
+      <version>${gwtVersion}</version>
+      <classifier>${platform}-libs</classifier>
+      <type>zip</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gwt</groupId>
+      <artifactId>gwt-dev</artifactId>
+      <version>${gwtVersion}</version>
+      <classifier>${platform}</classifier>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>gwt-dev-windows</id>
+      <properties>
+        <platform>windows</platform>
+      </properties>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+    </profile>
+    <profile>
+      <id>gwt-dev-mac</id>
+      <properties>
+        <platform>mac</platform>
+      </properties>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+    </profile>
+    <profile>
+      <id>gwt-dev-linux</id>
+      <properties>
+        <platform>linux</platform>
+      </properties>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <os>
+          <name>linux</name>
+        </os>
+      </activation>
+    </profile>
+  </profiles>
+
+  <repositories>
+    <repository>
+      <id>dyuproject-repo</id>
+      <url>http://dyuproject.googlecode.com/svn/repos/maven2/</url>
+    </repository>
+
+    <repository>
+      <id>jgit-snapshot-repository</id>
+      <url>http://egit.googlecode.com/svn/maven/snapshot-repository/</url>
+    </repository>
+
+    <repository>
+      <id>gwt-maven</id>
+      <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url>
+    </repository>
+  </repositories>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>gwt-maven-plugins</id>
+      <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url>
+    </pluginRepository>
+  </pluginRepositories>
+</project>
diff --git a/webapp/src/com/google/gerrit/Gerrit.gwt.xml b/appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml
similarity index 100%
rename from webapp/src/com/google/gerrit/Gerrit.gwt.xml
rename to appjar/src/main/java/com/google/gerrit/Gerrit.gwt.xml
diff --git a/webapp/src/com/google/gerrit/client/ErrorDialog.java b/appjar/src/main/java/com/google/gerrit/client/ErrorDialog.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ErrorDialog.java
rename to appjar/src/main/java/com/google/gerrit/client/ErrorDialog.java
diff --git a/webapp/src/com/google/gerrit/client/FormatUtil.java b/appjar/src/main/java/com/google/gerrit/client/FormatUtil.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/FormatUtil.java
rename to appjar/src/main/java/com/google/gerrit/client/FormatUtil.java
diff --git a/webapp/src/com/google/gerrit/client/Gerrit.java b/appjar/src/main/java/com/google/gerrit/client/Gerrit.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/Gerrit.java
rename to appjar/src/main/java/com/google/gerrit/client/Gerrit.java
diff --git a/webapp/src/com/google/gerrit/client/GerritConstants.java b/appjar/src/main/java/com/google/gerrit/client/GerritConstants.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/GerritConstants.java
rename to appjar/src/main/java/com/google/gerrit/client/GerritConstants.java
diff --git a/webapp/src/com/google/gerrit/client/GerritConstants.properties b/appjar/src/main/java/com/google/gerrit/client/GerritConstants.properties
similarity index 100%
rename from webapp/src/com/google/gerrit/client/GerritConstants.properties
rename to appjar/src/main/java/com/google/gerrit/client/GerritConstants.properties
diff --git a/webapp/src/com/google/gerrit/client/GerritIcons.java b/appjar/src/main/java/com/google/gerrit/client/GerritIcons.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/GerritIcons.java
rename to appjar/src/main/java/com/google/gerrit/client/GerritIcons.java
diff --git a/webapp/src/com/google/gerrit/client/Link.java b/appjar/src/main/java/com/google/gerrit/client/Link.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/Link.java
rename to appjar/src/main/java/com/google/gerrit/client/Link.java
diff --git a/webapp/src/com/google/gerrit/client/NotFoundScreen.java b/appjar/src/main/java/com/google/gerrit/client/NotFoundScreen.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/NotFoundScreen.java
rename to appjar/src/main/java/com/google/gerrit/client/NotFoundScreen.java
diff --git a/webapp/src/com/google/gerrit/client/RpcStatus.java b/appjar/src/main/java/com/google/gerrit/client/RpcStatus.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/RpcStatus.java
rename to appjar/src/main/java/com/google/gerrit/client/RpcStatus.java
diff --git a/webapp/src/com/google/gerrit/client/SignInDialog.java b/appjar/src/main/java/com/google/gerrit/client/SignInDialog.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/SignInDialog.java
rename to appjar/src/main/java/com/google/gerrit/client/SignInDialog.java
diff --git a/webapp/src/com/google/gerrit/client/SignedInListener.java b/appjar/src/main/java/com/google/gerrit/client/SignedInListener.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/SignedInListener.java
rename to appjar/src/main/java/com/google/gerrit/client/SignedInListener.java
diff --git a/webapp/src/com/google/gerrit/client/account/AccountConstants.java b/appjar/src/main/java/com/google/gerrit/client/account/AccountConstants.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/account/AccountConstants.java
rename to appjar/src/main/java/com/google/gerrit/client/account/AccountConstants.java
diff --git a/webapp/src/com/google/gerrit/client/account/AccountConstants.properties b/appjar/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
similarity index 100%
rename from webapp/src/com/google/gerrit/client/account/AccountConstants.properties
rename to appjar/src/main/java/com/google/gerrit/client/account/AccountConstants.properties
diff --git a/webapp/src/com/google/gerrit/client/account/AccountService.java b/appjar/src/main/java/com/google/gerrit/client/account/AccountService.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/account/AccountService.java
rename to appjar/src/main/java/com/google/gerrit/client/account/AccountService.java
diff --git a/webapp/src/com/google/gerrit/client/account/AccountServiceImpl.java b/appjar/src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/account/AccountServiceImpl.java
rename to appjar/src/main/java/com/google/gerrit/client/account/AccountServiceImpl.java
diff --git a/webapp/src/com/google/gerrit/client/account/AccountSettings.java b/appjar/src/main/java/com/google/gerrit/client/account/AccountSettings.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/account/AccountSettings.java
rename to appjar/src/main/java/com/google/gerrit/client/account/AccountSettings.java
diff --git a/webapp/src/com/google/gerrit/client/account/LoginService.java b/appjar/src/main/java/com/google/gerrit/client/account/LoginService.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/account/LoginService.java
rename to appjar/src/main/java/com/google/gerrit/client/account/LoginService.java
diff --git a/webapp/src/com/google/gerrit/client/account/SignInResult.java b/appjar/src/main/java/com/google/gerrit/client/account/SignInResult.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/account/SignInResult.java
rename to appjar/src/main/java/com/google/gerrit/client/account/SignInResult.java
diff --git a/webapp/src/com/google/gerrit/client/account/Util.java b/appjar/src/main/java/com/google/gerrit/client/account/Util.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/account/Util.java
rename to appjar/src/main/java/com/google/gerrit/client/account/Util.java
diff --git a/webapp/src/com/google/gerrit/client/arrowRight.gif b/appjar/src/main/java/com/google/gerrit/client/arrowRight.gif
similarity index 100%
rename from webapp/src/com/google/gerrit/client/arrowRight.gif
rename to appjar/src/main/java/com/google/gerrit/client/arrowRight.gif
diff --git a/webapp/src/com/google/gerrit/client/changes/AccountDashboardScreen.java b/appjar/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/AccountDashboardScreen.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/AccountDashboardScreen.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ApprovalTable.java b/appjar/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ApprovalTable.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ApprovalTable.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeConstants.java b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeConstants.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeConstants.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeConstants.properties b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeConstants.properties
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeConstants.properties
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeDetailService.java b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeDetailService.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeDetailService.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeDetailServiceImpl.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeInfoBlock.java b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeInfoBlock.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeInfoBlock.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeListService.java b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeListService.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeListService.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeListService.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeListServiceImpl.java b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeListServiceImpl.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeListServiceImpl.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeMessages.java b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeMessages.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeMessages.properties b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeMessages.properties
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeMessages.properties
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeScreen.java b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeScreen.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ChangeTable.java b/appjar/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ChangeTable.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ChangeTable.java
diff --git a/webapp/src/com/google/gerrit/client/changes/MessagePanel.java b/appjar/src/main/java/com/google/gerrit/client/changes/MessagePanel.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/MessagePanel.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/MessagePanel.java
diff --git a/webapp/src/com/google/gerrit/client/changes/MineStarredScreen.java b/appjar/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/MineStarredScreen.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/MineStarredScreen.java
diff --git a/webapp/src/com/google/gerrit/client/changes/PatchSetPanel.java b/appjar/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/PatchSetPanel.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/PatchSetPanel.java
diff --git a/webapp/src/com/google/gerrit/client/changes/PatchTable.java b/appjar/src/main/java/com/google/gerrit/client/changes/PatchTable.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/PatchTable.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/PatchTable.java
diff --git a/webapp/src/com/google/gerrit/client/changes/ToggleStarRequest.java b/appjar/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/ToggleStarRequest.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/ToggleStarRequest.java
diff --git a/webapp/src/com/google/gerrit/client/changes/Util.java b/appjar/src/main/java/com/google/gerrit/client/changes/Util.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/changes/Util.java
rename to appjar/src/main/java/com/google/gerrit/client/changes/Util.java
diff --git a/webapp/src/com/google/gerrit/client/data/AccountDashboardInfo.java b/appjar/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/AccountDashboardInfo.java
rename to appjar/src/main/java/com/google/gerrit/client/data/AccountDashboardInfo.java
diff --git a/webapp/src/com/google/gerrit/client/data/AccountInfo.java b/appjar/src/main/java/com/google/gerrit/client/data/AccountInfo.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/AccountInfo.java
rename to appjar/src/main/java/com/google/gerrit/client/data/AccountInfo.java
diff --git a/webapp/src/com/google/gerrit/client/data/AccountInfoCache.java b/appjar/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/AccountInfoCache.java
rename to appjar/src/main/java/com/google/gerrit/client/data/AccountInfoCache.java
diff --git a/webapp/src/com/google/gerrit/client/data/AccountInfoCacheFactory.java b/appjar/src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/AccountInfoCacheFactory.java
rename to appjar/src/main/java/com/google/gerrit/client/data/AccountInfoCacheFactory.java
diff --git a/webapp/src/com/google/gerrit/client/data/ApprovalDetail.java b/appjar/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/ApprovalDetail.java
rename to appjar/src/main/java/com/google/gerrit/client/data/ApprovalDetail.java
diff --git a/webapp/src/com/google/gerrit/client/data/ApprovalType.java b/appjar/src/main/java/com/google/gerrit/client/data/ApprovalType.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/ApprovalType.java
rename to appjar/src/main/java/com/google/gerrit/client/data/ApprovalType.java
diff --git a/webapp/src/com/google/gerrit/client/data/BasePatchDetail.java b/appjar/src/main/java/com/google/gerrit/client/data/BasePatchDetail.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/BasePatchDetail.java
rename to appjar/src/main/java/com/google/gerrit/client/data/BasePatchDetail.java
diff --git a/webapp/src/com/google/gerrit/client/data/ChangeDetail.java b/appjar/src/main/java/com/google/gerrit/client/data/ChangeDetail.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/ChangeDetail.java
rename to appjar/src/main/java/com/google/gerrit/client/data/ChangeDetail.java
diff --git a/webapp/src/com/google/gerrit/client/data/ChangeInfo.java b/appjar/src/main/java/com/google/gerrit/client/data/ChangeInfo.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/ChangeInfo.java
rename to appjar/src/main/java/com/google/gerrit/client/data/ChangeInfo.java
diff --git a/webapp/src/com/google/gerrit/client/data/GerritConfig.java b/appjar/src/main/java/com/google/gerrit/client/data/GerritConfig.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/GerritConfig.java
rename to appjar/src/main/java/com/google/gerrit/client/data/GerritConfig.java
diff --git a/webapp/src/com/google/gerrit/client/data/GitwebLink.java b/appjar/src/main/java/com/google/gerrit/client/data/GitwebLink.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/GitwebLink.java
rename to appjar/src/main/java/com/google/gerrit/client/data/GitwebLink.java
diff --git a/webapp/src/com/google/gerrit/client/data/LineWithComments.java b/appjar/src/main/java/com/google/gerrit/client/data/LineWithComments.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/LineWithComments.java
rename to appjar/src/main/java/com/google/gerrit/client/data/LineWithComments.java
diff --git a/webapp/src/com/google/gerrit/client/data/MineStarredInfo.java b/appjar/src/main/java/com/google/gerrit/client/data/MineStarredInfo.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/MineStarredInfo.java
rename to appjar/src/main/java/com/google/gerrit/client/data/MineStarredInfo.java
diff --git a/webapp/src/com/google/gerrit/client/data/PatchLine.java b/appjar/src/main/java/com/google/gerrit/client/data/PatchLine.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/PatchLine.java
rename to appjar/src/main/java/com/google/gerrit/client/data/PatchLine.java
diff --git a/webapp/src/com/google/gerrit/client/data/PatchSetDetail.java b/appjar/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/PatchSetDetail.java
rename to appjar/src/main/java/com/google/gerrit/client/data/PatchSetDetail.java
diff --git a/webapp/src/com/google/gerrit/client/data/ProjectInfo.java b/appjar/src/main/java/com/google/gerrit/client/data/ProjectInfo.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/ProjectInfo.java
rename to appjar/src/main/java/com/google/gerrit/client/data/ProjectInfo.java
diff --git a/webapp/src/com/google/gerrit/client/data/SideBySideLine.java b/appjar/src/main/java/com/google/gerrit/client/data/SideBySideLine.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/SideBySideLine.java
rename to appjar/src/main/java/com/google/gerrit/client/data/SideBySideLine.java
diff --git a/webapp/src/com/google/gerrit/client/data/SideBySidePatchDetail.java b/appjar/src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/SideBySidePatchDetail.java
rename to appjar/src/main/java/com/google/gerrit/client/data/SideBySidePatchDetail.java
diff --git a/webapp/src/com/google/gerrit/client/data/SystemInfoService.java b/appjar/src/main/java/com/google/gerrit/client/data/SystemInfoService.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/SystemInfoService.java
rename to appjar/src/main/java/com/google/gerrit/client/data/SystemInfoService.java
diff --git a/webapp/src/com/google/gerrit/client/data/UnifiedPatchDetail.java b/appjar/src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/data/UnifiedPatchDetail.java
rename to appjar/src/main/java/com/google/gerrit/client/data/UnifiedPatchDetail.java
diff --git a/webapp/src/com/google/gerrit/client/greenCheck.png b/appjar/src/main/java/com/google/gerrit/client/greenCheck.png
similarity index 100%
rename from webapp/src/com/google/gerrit/client/greenCheck.png
rename to appjar/src/main/java/com/google/gerrit/client/greenCheck.png
diff --git a/webapp/src/com/google/gerrit/client/patches/AbstractPatchContentTable.java b/appjar/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/AbstractPatchContentTable.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/AbstractPatchContentTable.java
diff --git a/webapp/src/com/google/gerrit/client/patches/CommentEditorPanel.java b/appjar/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/CommentEditorPanel.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/CommentEditorPanel.java
diff --git a/webapp/src/com/google/gerrit/client/patches/LineCommentPanel.java b/appjar/src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/LineCommentPanel.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/LineCommentPanel.java
diff --git a/webapp/src/com/google/gerrit/client/patches/PatchConstants.java b/appjar/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/PatchConstants.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/PatchConstants.java
diff --git a/webapp/src/com/google/gerrit/client/patches/PatchConstants.properties b/appjar/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/PatchConstants.properties
rename to appjar/src/main/java/com/google/gerrit/client/patches/PatchConstants.properties
diff --git a/webapp/src/com/google/gerrit/client/patches/PatchDetailService.java b/appjar/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/PatchDetailService.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/PatchDetailService.java
diff --git a/webapp/src/com/google/gerrit/client/patches/PatchMessages.java b/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/PatchMessages.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.java
diff --git a/webapp/src/com/google/gerrit/client/patches/PatchMessages.properties b/appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/PatchMessages.properties
rename to appjar/src/main/java/com/google/gerrit/client/patches/PatchMessages.properties
diff --git a/webapp/src/com/google/gerrit/client/patches/PatchScreen.java b/appjar/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/PatchScreen.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
diff --git a/webapp/src/com/google/gerrit/client/patches/PatchSideBySideScreen.java b/appjar/src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/PatchSideBySideScreen.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/PatchSideBySideScreen.java
diff --git a/webapp/src/com/google/gerrit/client/patches/PatchUnifiedScreen.java b/appjar/src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/PatchUnifiedScreen.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/PatchUnifiedScreen.java
diff --git a/webapp/src/com/google/gerrit/client/patches/PatchUtil.java b/appjar/src/main/java/com/google/gerrit/client/patches/PatchUtil.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/PatchUtil.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/PatchUtil.java
diff --git a/webapp/src/com/google/gerrit/client/patches/SideBySideTable.java b/appjar/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/SideBySideTable.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/SideBySideTable.java
diff --git a/webapp/src/com/google/gerrit/client/patches/UnifiedDiffTable.java b/appjar/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/patches/UnifiedDiffTable.java
rename to appjar/src/main/java/com/google/gerrit/client/patches/UnifiedDiffTable.java
diff --git a/webapp/src/com/google/gerrit/client/redNot.png b/appjar/src/main/java/com/google/gerrit/client/redNot.png
similarity index 100%
rename from webapp/src/com/google/gerrit/client/redNot.png
rename to appjar/src/main/java/com/google/gerrit/client/redNot.png
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/Account.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/Account.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/Account.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/Account.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/AccountAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/AccountAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/AccountAgreement.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/AccountAgreement.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreement.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountAgreementAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/AccountExternalId.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/AccountExternalId.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalId.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountExternalIdAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/AccountGroup.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/AccountGroup.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroup.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/AccountGroupAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/AccountGroupAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/AccountGroupMember.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/AccountGroupMember.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMember.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/AccountGroupMemberAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ApprovalCategory.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ApprovalCategory.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategory.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValue.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ApprovalCategoryValueAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/Branch.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/Branch.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/Branch.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/Branch.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/BranchAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/BranchAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/BranchAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/Change.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/Change.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/Change.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/Change.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ChangeAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ChangeAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ChangeApproval.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ChangeApproval.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeApproval.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeApprovalAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ChangeMessage.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ChangeMessage.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessage.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ChangeMessageAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ContactInformation.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ContactInformation.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ContactInformation.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ContributorAgreement.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ContributorAgreement.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreement.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ContributorAgreementAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/Patch.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/Patch.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/Patch.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/Patch.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchContent.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchContent.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchContent.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchContentAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchContentAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchContentAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchLineComment.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchLineComment.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchLineComment.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchLineCommentAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchSet.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchSet.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSet.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchSetAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchSetAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchSetAncestor.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchSetAncestor.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestor.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetAncestorAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchSetInfo.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchSetInfo.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfo.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/PatchSetInfoAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/Project.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/Project.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/Project.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/Project.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ProjectAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ProjectAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ProjectLeadAccount.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectLeadAccount.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ProjectLeadAccount.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectLeadAccount.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ProjectLeadAccountAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectLeadAccountAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ProjectLeadAccountAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectLeadAccountAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ProjectLeadGroup.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectLeadGroup.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ProjectLeadGroup.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectLeadGroup.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ProjectLeadGroupAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectLeadGroupAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ProjectLeadGroupAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ProjectLeadGroupAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/RevId.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/RevId.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/RevId.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/RevId.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/ReviewDb.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/ReviewDb.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/ReviewDb.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/StarredChange.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/StarredChange.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/StarredChange.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/StarredChangeAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/StarredChangeAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/StarredChangeAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/SystemConfig.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/SystemConfig.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/SystemConfig.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/SystemConfigAccess.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/SystemConfigAccess.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/SystemConfigAccess.java
diff --git a/webapp/src/com/google/gerrit/client/reviewdb/UserIdentity.java b/appjar/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/reviewdb/UserIdentity.java
rename to appjar/src/main/java/com/google/gerrit/client/reviewdb/UserIdentity.java
diff --git a/webapp/src/com/google/gerrit/client/rpc/BaseServiceImplementation.java b/appjar/src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/BaseServiceImplementation.java
rename to appjar/src/main/java/com/google/gerrit/client/rpc/BaseServiceImplementation.java
diff --git a/webapp/src/com/google/gerrit/client/rpc/CorruptEntityException.java b/appjar/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/CorruptEntityException.java
rename to appjar/src/main/java/com/google/gerrit/client/rpc/CorruptEntityException.java
diff --git a/webapp/src/com/google/gerrit/client/rpc/GerritCallback.java b/appjar/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/GerritCallback.java
rename to appjar/src/main/java/com/google/gerrit/client/rpc/GerritCallback.java
diff --git a/webapp/src/com/google/gerrit/client/rpc/NoSuchEntityException.java b/appjar/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/NoSuchEntityException.java
rename to appjar/src/main/java/com/google/gerrit/client/rpc/NoSuchEntityException.java
diff --git a/webapp/src/com/google/gerrit/client/rpc/NotSignedInException.java b/appjar/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/NotSignedInException.java
rename to appjar/src/main/java/com/google/gerrit/client/rpc/NotSignedInException.java
diff --git a/webapp/src/com/google/gerrit/client/rpc/RpcConstants.java b/appjar/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/RpcConstants.java
rename to appjar/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java
diff --git a/webapp/src/com/google/gerrit/client/rpc/RpcConstants.properties b/appjar/src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/RpcConstants.properties
rename to appjar/src/main/java/com/google/gerrit/client/rpc/RpcConstants.properties
diff --git a/webapp/src/com/google/gerrit/client/rpc/RpcUtil.java b/appjar/src/main/java/com/google/gerrit/client/rpc/RpcUtil.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/RpcUtil.java
rename to appjar/src/main/java/com/google/gerrit/client/rpc/RpcUtil.java
diff --git a/webapp/src/com/google/gerrit/client/rpc/ScreenLoadCallback.java b/appjar/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/ScreenLoadCallback.java
rename to appjar/src/main/java/com/google/gerrit/client/rpc/ScreenLoadCallback.java
diff --git a/webapp/src/com/google/gerrit/client/rpc/SignInRequired.java b/appjar/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/rpc/SignInRequired.java
rename to appjar/src/main/java/com/google/gerrit/client/rpc/SignInRequired.java
diff --git a/webapp/src/com/google/gerrit/client/starFilled.gif b/appjar/src/main/java/com/google/gerrit/client/starFilled.gif
similarity index 100%
rename from webapp/src/com/google/gerrit/client/starFilled.gif
rename to appjar/src/main/java/com/google/gerrit/client/starFilled.gif
diff --git a/webapp/src/com/google/gerrit/client/starOpen.gif b/appjar/src/main/java/com/google/gerrit/client/starOpen.gif
similarity index 100%
rename from webapp/src/com/google/gerrit/client/starOpen.gif
rename to appjar/src/main/java/com/google/gerrit/client/starOpen.gif
diff --git a/webapp/src/com/google/gerrit/client/ui/AccountDashboardLink.java b/appjar/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/AccountDashboardLink.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/AccountDashboardLink.java
diff --git a/webapp/src/com/google/gerrit/client/ui/AccountScreen.java b/appjar/src/main/java/com/google/gerrit/client/ui/AccountScreen.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/AccountScreen.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/AccountScreen.java
diff --git a/webapp/src/com/google/gerrit/client/ui/AutoCenterDialogBox.java b/appjar/src/main/java/com/google/gerrit/client/ui/AutoCenterDialogBox.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/AutoCenterDialogBox.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/AutoCenterDialogBox.java
diff --git a/webapp/src/com/google/gerrit/client/ui/ChangeLink.java b/appjar/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/ChangeLink.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/ChangeLink.java
diff --git a/webapp/src/com/google/gerrit/client/ui/ComplexDisclosurePanel.java b/appjar/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/ComplexDisclosurePanel.java
diff --git a/webapp/src/com/google/gerrit/client/ui/DirectScreenLink.java b/appjar/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/DirectScreenLink.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/DirectScreenLink.java
diff --git a/webapp/src/com/google/gerrit/client/ui/DomUtil.java b/appjar/src/main/java/com/google/gerrit/client/ui/DomUtil.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/DomUtil.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/DomUtil.java
diff --git a/webapp/src/com/google/gerrit/client/ui/ExpandAllCommand.java b/appjar/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/ExpandAllCommand.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/ExpandAllCommand.java
diff --git a/webapp/src/com/google/gerrit/client/ui/FancyFlexTable.java b/appjar/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/FancyFlexTable.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java
diff --git a/webapp/src/com/google/gerrit/client/ui/LinkMenuBar.java b/appjar/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/LinkMenuBar.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/LinkMenuBar.java
diff --git a/webapp/src/com/google/gerrit/client/ui/LinkMenuItem.java b/appjar/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/LinkMenuItem.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/LinkMenuItem.java
diff --git a/webapp/src/com/google/gerrit/client/ui/PatchLink.java b/appjar/src/main/java/com/google/gerrit/client/ui/PatchLink.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/PatchLink.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/PatchLink.java
diff --git a/webapp/src/com/google/gerrit/client/ui/Screen.java b/appjar/src/main/java/com/google/gerrit/client/ui/Screen.java
similarity index 100%
rename from webapp/src/com/google/gerrit/client/ui/Screen.java
rename to appjar/src/main/java/com/google/gerrit/client/ui/Screen.java
diff --git a/webapp/src/com/google/gerrit/git/GitMetaUtil.java b/appjar/src/main/java/com/google/gerrit/git/GitMetaUtil.java
similarity index 100%
rename from webapp/src/com/google/gerrit/git/GitMetaUtil.java
rename to appjar/src/main/java/com/google/gerrit/git/GitMetaUtil.java
diff --git a/webapp/src/com/google/gerrit/git/InvalidRepositoryException.java b/appjar/src/main/java/com/google/gerrit/git/InvalidRepositoryException.java
similarity index 100%
rename from webapp/src/com/google/gerrit/git/InvalidRepositoryException.java
rename to appjar/src/main/java/com/google/gerrit/git/InvalidRepositoryException.java
diff --git a/webapp/src/com/google/gerrit/git/PatchSetImporter.java b/appjar/src/main/java/com/google/gerrit/git/PatchSetImporter.java
similarity index 100%
rename from webapp/src/com/google/gerrit/git/PatchSetImporter.java
rename to appjar/src/main/java/com/google/gerrit/git/PatchSetImporter.java
diff --git a/webapp/src/com/google/gerrit/git/RepositoryCache.java b/appjar/src/main/java/com/google/gerrit/git/RepositoryCache.java
similarity index 100%
rename from webapp/src/com/google/gerrit/git/RepositoryCache.java
rename to appjar/src/main/java/com/google/gerrit/git/RepositoryCache.java
diff --git a/webapp/src/com/google/gerrit/pgm/ReimportPatchSets.java b/appjar/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
similarity index 100%
rename from webapp/src/com/google/gerrit/pgm/ReimportPatchSets.java
rename to appjar/src/main/java/com/google/gerrit/pgm/ReimportPatchSets.java
diff --git a/webapp/src/com/google/gerrit/public/Gerrit.css b/appjar/src/main/java/com/google/gerrit/public/Gerrit.css
similarity index 100%
rename from webapp/src/com/google/gerrit/public/Gerrit.css
rename to appjar/src/main/java/com/google/gerrit/public/Gerrit.css
diff --git a/webapp/src/com/google/gerrit/public/Gerrit.html b/appjar/src/main/java/com/google/gerrit/public/Gerrit.html
similarity index 100%
rename from webapp/src/com/google/gerrit/public/Gerrit.html
rename to appjar/src/main/java/com/google/gerrit/public/Gerrit.html
diff --git a/webapp/src/com/google/gerrit/public/SetCookie.html b/appjar/src/main/java/com/google/gerrit/public/SetCookie.html
similarity index 100%
rename from webapp/src/com/google/gerrit/public/SetCookie.html
rename to appjar/src/main/java/com/google/gerrit/public/SetCookie.html
diff --git a/webapp/src/com/google/gerrit/server/AccountServiceSrv.java b/appjar/src/main/java/com/google/gerrit/server/AccountServiceSrv.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/AccountServiceSrv.java
rename to appjar/src/main/java/com/google/gerrit/server/AccountServiceSrv.java
diff --git a/webapp/src/com/google/gerrit/server/CacheControlFilter.java b/appjar/src/main/java/com/google/gerrit/server/CacheControlFilter.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/CacheControlFilter.java
rename to appjar/src/main/java/com/google/gerrit/server/CacheControlFilter.java
diff --git a/webapp/src/com/google/gerrit/server/ChangeDetailServiceSrv.java b/appjar/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/ChangeDetailServiceSrv.java
rename to appjar/src/main/java/com/google/gerrit/server/ChangeDetailServiceSrv.java
diff --git a/webapp/src/com/google/gerrit/server/ChangeListServiceSrv.java b/appjar/src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/ChangeListServiceSrv.java
rename to appjar/src/main/java/com/google/gerrit/server/ChangeListServiceSrv.java
diff --git a/webapp/src/com/google/gerrit/server/GerritCall.java b/appjar/src/main/java/com/google/gerrit/server/GerritCall.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/GerritCall.java
rename to appjar/src/main/java/com/google/gerrit/server/GerritCall.java
diff --git a/webapp/src/com/google/gerrit/server/GerritJsonServlet.java b/appjar/src/main/java/com/google/gerrit/server/GerritJsonServlet.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/GerritJsonServlet.java
rename to appjar/src/main/java/com/google/gerrit/server/GerritJsonServlet.java
diff --git a/webapp/src/com/google/gerrit/server/GerritServer.java b/appjar/src/main/java/com/google/gerrit/server/GerritServer.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/GerritServer.java
rename to appjar/src/main/java/com/google/gerrit/server/GerritServer.java
diff --git a/webapp/src/com/google/gerrit/server/GoogleAccountDiscovery.java b/appjar/src/main/java/com/google/gerrit/server/GoogleAccountDiscovery.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/GoogleAccountDiscovery.java
rename to appjar/src/main/java/com/google/gerrit/server/GoogleAccountDiscovery.java
diff --git a/webapp/src/com/google/gerrit/server/HostPageServlet.java b/appjar/src/main/java/com/google/gerrit/server/HostPageServlet.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/HostPageServlet.java
rename to appjar/src/main/java/com/google/gerrit/server/HostPageServlet.java
diff --git a/webapp/src/com/google/gerrit/server/HtmlDomUtil.java b/appjar/src/main/java/com/google/gerrit/server/HtmlDomUtil.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/HtmlDomUtil.java
rename to appjar/src/main/java/com/google/gerrit/server/HtmlDomUtil.java
diff --git a/webapp/src/com/google/gerrit/server/LoginServlet.java b/appjar/src/main/java/com/google/gerrit/server/LoginServlet.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/LoginServlet.java
rename to appjar/src/main/java/com/google/gerrit/server/LoginServlet.java
diff --git a/webapp/src/com/google/gerrit/server/PatchDetailServiceSrv.java b/appjar/src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/PatchDetailServiceSrv.java
rename to appjar/src/main/java/com/google/gerrit/server/PatchDetailServiceSrv.java
diff --git a/webapp/src/com/google/gerrit/server/SystemInfoServiceImpl.java b/appjar/src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/SystemInfoServiceImpl.java
rename to appjar/src/main/java/com/google/gerrit/server/SystemInfoServiceImpl.java
diff --git a/webapp/src/com/google/gerrit/server/SystemInfoServiceSrv.java b/appjar/src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/SystemInfoServiceSrv.java
rename to appjar/src/main/java/com/google/gerrit/server/SystemInfoServiceSrv.java
diff --git a/webapp/src/com/google/gerrit/server/UrlRewriteFilter.java b/appjar/src/main/java/com/google/gerrit/server/UrlRewriteFilter.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/UrlRewriteFilter.java
rename to appjar/src/main/java/com/google/gerrit/server/UrlRewriteFilter.java
diff --git a/webapp/src/com/google/gerrit/server/patch/PatchDetailAction.java b/appjar/src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/patch/PatchDetailAction.java
rename to appjar/src/main/java/com/google/gerrit/server/patch/PatchDetailAction.java
diff --git a/webapp/src/com/google/gerrit/server/patch/PatchDetailServiceImpl.java b/appjar/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/patch/PatchDetailServiceImpl.java
rename to appjar/src/main/java/com/google/gerrit/server/patch/PatchDetailServiceImpl.java
diff --git a/webapp/src/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java b/appjar/src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java
rename to appjar/src/main/java/com/google/gerrit/server/patch/SideBySidePatchDetailAction.java
diff --git a/webapp/src/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java b/appjar/src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java
similarity index 100%
rename from webapp/src/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java
rename to appjar/src/main/java/com/google/gerrit/server/patch/UnifiedPatchDetailAction.java
diff --git a/appwar/.gitignore b/appwar/.gitignore
new file mode 100644
index 0000000000..cf30e1c482
--- /dev/null
+++ b/appwar/.gitignore
@@ -0,0 +1,5 @@
+/target
+/.classpath
+/.project
+/.settings/org.maven.ide.eclipse.prefs
+/.settings/org.eclipse.jdt.core.prefs
diff --git a/appwar/pom.xml b/appwar/pom.xml
new file mode 100644
index 0000000000..6868d287b1
--- /dev/null
+++ b/appwar/pom.xml
@@ -0,0 +1,333 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2008 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>gerrit</groupId>
+  <artifactId>gerrit-appwar</artifactId>
+  <packaging>war</packaging>
+  <version>2.0-SNAPSHOT</version>
+  <name>gerrit-appwar</name>
+  <description>Gerrit - Web Based Code Review</description>
+  <url>http://android.git.kernel.org/?p=tools/gerrit.git</url>
+
+  <mailingLists>
+    <mailingList>
+      <name>repo-discuss mailing list</name>
+      <post>repo-discuss@googlegroups.com</post>
+    </mailingList>
+  </mailingLists>
+
+  <developers>
+    <developer>
+      <name>Shawn O. Pearce</name>
+      <email>sop@google.com</email>
+      <roles>
+        <role>Maintainer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License, 2.0</name>
+      <comments>
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+      </comments>
+    </license>
+  </licenses>
+
+  <properties>
+    <gwtVersion>1.5.3</gwtVersion>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.totsp.gwt</groupId>
+        <artifactId>maven-googlewebtoolkit2-plugin</artifactId>
+        <version>2.0-beta26</version>
+        <configuration>
+          <compileTargets>
+            <value>com.google.gerrit.Gerrit</value>
+          </compileTargets>
+          <runTarget>com.google.gerrit.Gerrit/Gerrit.html</runTarget>
+          <noServer>false</noServer>
+          <extraJvmArgs>-Xmx512m</extraJvmArgs>
+          <gwtVersion>${gwtVersion}</gwtVersion>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>compile</goal>                    
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>                                
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>fixOutput</id>
+            <phase>process-classes</phase>
+            <configuration>
+              <tasks>
+                <move todir="${basedir}/target/${project.name}-${project.version}">
+                  <fileset dir="${basedir}/target/${project.name}-${project.version}/com.google.gerrit.Gerrit">
+                    <exclude name="Gerrit.html" />
+                    <exclude name="SetCookie.html" />
+                    <exclude name="hosted.html" />
+                  </fileset>
+                </move>
+                <delete dir="${basedir}/target/${project.name}-${project.version}/com.google.gerrit.Gerrit" />
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <warSourceExcludes>.gwt-tmp/**</warSourceExcludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>gerrit</groupId>
+      <artifactId>gerrit-appjar</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+
+  <pluginRepositories>
+    <pluginRepository>
+      <id>gwt-maven-plugins</id>
+      <url>http://gwt-maven.googlecode.com/svn/trunk/mavenrepo/</url>
+    </pluginRepository>
+  </pluginRepositories>
+</project>
diff --git a/webapp/src/com/google/gerrit/web.xml b/appwar/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from webapp/src/com/google/gerrit/web.xml
rename to appwar/src/main/webapp/WEB-INF/web.xml
diff --git a/devdb/.classpath b/devdb/.classpath
new file mode 100644
index 0000000000..082e1fa080
--- /dev/null
+++ b/devdb/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry exported="true" kind="lib" path="jdbc-postgresql.jar"/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/devdb/.gitignore b/devdb/.gitignore
new file mode 100644
index 0000000000..f93c4c0329
--- /dev/null
+++ b/devdb/.gitignore
@@ -0,0 +1,3 @@
+/.settings
+/jdbc-*.jar
+/GerritServer.properties
diff --git a/webapp/.project b/devdb/.project
similarity index 83%
rename from webapp/.project
rename to devdb/.project
index ca7d4b5f83..4f64f337bf 100644
--- a/webapp/.project
+++ b/devdb/.project
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>Gerrit-webapp</name>
-	<comment>GerritUI project</comment>
+	<name>gerrit-devdb</name>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
diff --git a/webapp/src/GerritServer.properties_example b/devdb/GerritServer.properties_example
similarity index 100%
rename from webapp/src/GerritServer.properties_example
rename to devdb/GerritServer.properties_example
diff --git a/to_jetty.sh b/to_jetty.sh
new file mode 100755
index 0000000000..966d125546
--- /dev/null
+++ b/to_jetty.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# Builds and deploys into Jetty; primarily for debugging
+
+jetty=$1
+if [ -z "$jetty" ]
+then
+	echo >&2 "usage: $0 jettydir"
+	exit 1
+fi
+if ! [ -f "$jetty/etc/jetty.xml" ]
+then
+	echo >&2 "error: $jetty is not a Jetty installation"
+	exit 1
+fi
+
+out=appdist/target/gerrit-*-bin.dir &&
+ctx="$jetty/contexts/gerrit.xml" &&
+
+(cd appdist && mvn package) &&
+
+cp devdb/jdbc-postgresql.jar "$jetty/lib/plus" &&
+cp $out/gerrit-*/www/gerrit-*.war "$jetty/webapps/gerrit.war" &&
+
+if [ -f "$ctx" ]
+then
+	touch "$ctx"
+else
+	cp jetty_gerrit.xml "$ctx" &&
+	echo "You need to edit and configure $ctx"
+fi
diff --git a/webapp/.classpath b/webapp/.classpath
deleted file mode 100644
index 4574cc5a4a..0000000000
--- a/webapp/.classpath
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/GWT"/>
-	<classpathentry kind="lib" path="lib/gson.jar" sourcepath="lib/gson_src.zip"/>
-	<classpathentry kind="lib" path="lib/gwtjsonrpc.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec.jar"/>
-	<classpathentry kind="lib" path="lib/antlr.jar"/>
-	<classpathentry kind="lib" path="lib/asm.jar"/>
-	<classpathentry kind="lib" path="lib/gwtorm.jar"/>
-	<classpathentry kind="lib" path="lib/dyuproject-openid.jar"/>
-	<classpathentry kind="lib" path="lib/dyuproject-util.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-util.jar"/>
-	<classpathentry kind="lib" path="lib/jdbc-h2.jar"/>
-	<classpathentry kind="lib" path="lib/jdbc-postgresql.jar"/>
-	<classpathentry kind="lib" path="lib/jgit.jar" sourcepath="lib/jgit_src.zip"/>
-	<classpathentry kind="lib" path="lib/jsch.jar"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
diff --git a/webapp/.gitignore b/webapp/.gitignore
deleted file mode 100644
index 65a63c1261..0000000000
--- a/webapp/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/classes
-/tomcat
-/www
-/gensrc
-/src/GerritServer.properties
-/ReviewDb.*.db
diff --git a/webapp/Gerrit-webapp_Generic.launch b/webapp/Gerrit-webapp_Generic.launch
deleted file mode 100644
index 87d45f30ff..0000000000
--- a/webapp/Gerrit-webapp_Generic.launch
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/Gerrit-webapp"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;Gerrit-webapp&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/Gerrit-webapp/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;Gerrit-webapp&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out www com.google.gerrit.Gerrit/Gerrit.html"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Gerrit-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M"/>
-</launchConfiguration>
diff --git a/webapp/Gerrit-webapp_MacOS.launch b/webapp/Gerrit-webapp_MacOS.launch
deleted file mode 100644
index fb18169106..0000000000
--- a/webapp/Gerrit-webapp_MacOS.launch
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/Gerrit-webapp"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;Gerrit-webapp&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/Gerrit-webapp/src&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;Gerrit-webapp&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out www com.google.gerrit.Gerrit/Gerrit.html"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Gerrit-webapp"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx256M -XstartOnFirstThread"/>
-</launchConfiguration>
diff --git a/webapp/lib/.gitignore b/webapp/lib/.gitignore
deleted file mode 100644
index 4bca9f3ee9..0000000000
--- a/webapp/lib/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-/*_src.zip
-/gwtjsonrpc.jar
-/gson.jar
-/commons-codec.jar
-/antlr.jar
-/asm.jar
-/gwtorm.jar
-/jgit.jar
-/jsch.jar
-/jdbc-*.jar
diff --git a/webapp/lib/dyuproject-openid.jar b/webapp/lib/dyuproject-openid.jar
deleted file mode 100644
index 4bda683ec3..0000000000
Binary files a/webapp/lib/dyuproject-openid.jar and /dev/null differ
diff --git a/webapp/lib/dyuproject-util.jar b/webapp/lib/dyuproject-util.jar
deleted file mode 100644
index 960316083e..0000000000
Binary files a/webapp/lib/dyuproject-util.jar and /dev/null differ
diff --git a/webapp/lib/jetty-util.jar b/webapp/lib/jetty-util.jar
deleted file mode 100644
index 4e827baae2..0000000000
Binary files a/webapp/lib/jetty-util.jar and /dev/null differ