diff --git a/java/demo/README b/java/demo/README
index ae42c5bce..0bc32d88a 100644
--- a/java/demo/README
+++ b/java/demo/README
@@ -1,21 +1,6 @@
-How to install the Appengine SDK to the Maven local repository?
-Note that this needs to be done only once.
-  $ mvn gae:unpack
-  Note that you don't need to manually download any SDK.
+Prerequisite:
+  Install the Appengine SDK.
+  $ sudo apt-get install google-cloud-sdk-app-engine-java
 
-How to generate the WAR?
-  $ mvn package
-  $ mvn war:war
-  Note that this must be done before running the webapp locally and before
-  deploying it to Appengine.
-
-How to run the webapp locally?
-  $ mvn gae:run
-
-How to deploy the webapp to Appengine?
-  $ mvn gae:update
-
-If you have made any changes to the code or pom.xml file of demo here,
-you may need to run Maven commands like ```mvn clean install -U```
-(especially one hierarchy above i.e at java/ folder) to resolve any
-dependency issues w.r.t new developement version.
+How to regenreate the WAR, deploy and run in appengine?
+  $ mvn appengine:run
diff --git a/java/demo/pom.xml b/java/demo/pom.xml
index 7c69a474d..64907f8b4 100644
--- a/java/demo/pom.xml
+++ b/java/demo/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
   <version>8.12.51-SNAPSHOT</version>
-  <packaging>jar</packaging>
+  <packaging>war</packaging>  
   <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
@@ -13,63 +13,32 @@
   </parent>
 
   <properties>
-    <gae.version>1.9.32</gae.version>
+    <app.deploy.project>libphonenumber-hrd</app.deploy.project>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
+    <archiveClasses>true</archiveClasses>
   </properties>
 
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.7</source>
-	  <target>1.7</target>
-	  <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>net.kindleit</groupId>
-        <artifactId>maven-gae-plugin</artifactId>
-        <version>0.9.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>2.1.1</version>
-        <configuration>
-          <warSourceDirectory>war</warSourceDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.10</version>
-        <configuration>
-          <webAppSourceDirectory>webapp</webAppSourceDirectory>
-          <scanIntervalSeconds>10</scanIntervalSeconds>
-          <webAppConfig>
-            <contextPath>/</contextPath>
-          </webAppConfig>
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>8080</port>
-              <maxIdleTime>60000</maxIdleTime>
-            </connector>
-          </connectors>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
+  <prerequisites>
+    <maven>3.5</maven>
+  </prerequisites>
 
   <dependencies>
+    <!-- Compile/runtime dependencies -->
+    <dependency>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>appengine-api-1.0-sdk</artifactId>
+      <version>1.9.96</version>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.5</version>
+      <type>jar</type>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
@@ -103,4 +72,17 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <!-- for hot reload of the web application-->
+    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>com.google.cloud.tools</groupId>
+        <artifactId>appengine-maven-plugin</artifactId>
+        <version>1.3.1</version>
+        <configuration>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java b/java/demo/src/main/java/com/google/phonenumbers/PhoneNumberParserServlet.java
similarity index 100%
rename from java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java
rename to java/demo/src/main/java/com/google/phonenumbers/PhoneNumberParserServlet.java
diff --git a/java/demo/war/WEB-INF/appengine-web.xml b/java/demo/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from java/demo/war/WEB-INF/appengine-web.xml
rename to java/demo/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/java/demo/war/WEB-INF/logging.properties b/java/demo/src/main/webapp/WEB-INF/logging.properties
similarity index 99%
rename from java/demo/war/WEB-INF/logging.properties
rename to java/demo/src/main/webapp/WEB-INF/logging.properties
index a17206681..0c2ea51bc 100644
--- a/java/demo/war/WEB-INF/logging.properties
+++ b/java/demo/src/main/webapp/WEB-INF/logging.properties
@@ -3,7 +3,7 @@
 #
 # To use this configuration, copy it into your application's WEB-INF
 # folder and add the following to your appengine-web.xml:
-# 
+#
 # <system-properties>
 #   <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
 # </system-properties>
diff --git a/java/demo/war/WEB-INF/web.xml b/java/demo/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from java/demo/war/WEB-INF/web.xml
rename to java/demo/src/main/webapp/WEB-INF/web.xml
diff --git a/java/demo/war/favicon.ico b/java/demo/src/main/webapp/favicon.ico
similarity index 100%
rename from java/demo/war/favicon.ico
rename to java/demo/src/main/webapp/favicon.ico
diff --git a/java/demo/war/phonenumberparser.jsp b/java/demo/src/main/webapp/phonenumberparser.jsp
similarity index 100%
rename from java/demo/war/phonenumberparser.jsp
rename to java/demo/src/main/webapp/phonenumberparser.jsp
diff --git a/java/demo/war/stylesheets/main.css b/java/demo/src/main/webapp/stylesheets/main.css
similarity index 100%
rename from java/demo/war/stylesheets/main.css
rename to java/demo/src/main/webapp/stylesheets/main.css
diff --git a/java/demo/war/WEB-INF/lib/commons-fileupload-1.2.1.jar b/java/demo/war/WEB-INF/lib/commons-fileupload-1.2.1.jar
deleted file mode 100644
index aa209b388..000000000
Binary files a/java/demo/war/WEB-INF/lib/commons-fileupload-1.2.1.jar and /dev/null differ
diff --git a/java/demo/war/WEB-INF/lib/commons-io-1.4.jar b/java/demo/war/WEB-INF/lib/commons-io-1.4.jar
deleted file mode 100644
index 133dc6cb3..000000000
Binary files a/java/demo/war/WEB-INF/lib/commons-io-1.4.jar and /dev/null differ
diff --git a/java/demo/war/WEB-INF/lib/commons-lang-2.6.jar b/java/demo/war/WEB-INF/lib/commons-lang-2.6.jar
deleted file mode 100644
index 98467d3a6..000000000
Binary files a/java/demo/war/WEB-INF/lib/commons-lang-2.6.jar and /dev/null differ
diff --git a/java/demo/war/WEB-INF/lib/servlet-api-2.5.jar b/java/demo/war/WEB-INF/lib/servlet-api-2.5.jar
deleted file mode 100644
index fb5249346..000000000
Binary files a/java/demo/war/WEB-INF/lib/servlet-api-2.5.jar and /dev/null differ