diff --git a/appengine-java8/datastore/indexes-exploding/pom.xml b/appengine-java8/datastore-indexes-exploding/pom.xml
similarity index 98%
rename from appengine-java8/datastore/indexes-exploding/pom.xml
rename to appengine-java8/datastore-indexes-exploding/pom.xml
index c0a049533bb..f39d35414d5 100644
--- a/appengine-java8/datastore/indexes-exploding/pom.xml
+++ b/appengine-java8/datastore-indexes-exploding/pom.xml
@@ -24,7 +24,7 @@
     <groupId>com.google.cloud</groupId>
     <artifactId>appengine-java8-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine-java8/datastore/indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java b/appengine-java8/datastore-indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java
similarity index 100%
rename from appengine-java8/datastore/indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java
rename to appengine-java8/datastore-indexes-exploding/src/main/java/com/example/appengine/IndexesServlet.java
diff --git a/appengine-java8/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/datastore-indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/datastore/indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/datastore-indexes-exploding/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/datastore/indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine-java8/datastore-indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml
similarity index 100%
rename from appengine-java8/datastore/indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml
rename to appengine-java8/datastore-indexes-exploding/src/main/webapp/WEB-INF/datastore-indexes.xml
diff --git a/appengine-java8/datastore/indexes-exploding/src/main/webapp/WEB-INF/web.xml b/appengine-java8/datastore-indexes-exploding/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/datastore/indexes-exploding/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/datastore-indexes-exploding/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine-java8/datastore-indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
similarity index 100%
rename from appengine-java8/datastore/indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
rename to appengine-java8/datastore-indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
diff --git a/appengine-java8/datastore/indexes-perfect/pom.xml b/appengine-java8/datastore-indexes-perfect/pom.xml
similarity index 98%
rename from appengine-java8/datastore/indexes-perfect/pom.xml
rename to appengine-java8/datastore-indexes-perfect/pom.xml
index 1e8359e42df..8a14336ba19 100644
--- a/appengine-java8/datastore/indexes-perfect/pom.xml
+++ b/appengine-java8/datastore-indexes-perfect/pom.xml
@@ -24,7 +24,7 @@
     <groupId>com.google.cloud</groupId>
     <artifactId>appengine-java8-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine-java8/datastore/indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java b/appengine-java8/datastore-indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java
similarity index 100%
rename from appengine-java8/datastore/indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java
rename to appengine-java8/datastore-indexes-perfect/src/main/java/com/example/appengine/IndexesServlet.java
diff --git a/appengine-java8/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/datastore-indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/datastore/indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/datastore-indexes-perfect/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/datastore/indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine-java8/datastore-indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml
similarity index 100%
rename from appengine-java8/datastore/indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml
rename to appengine-java8/datastore-indexes-perfect/src/main/webapp/WEB-INF/datastore-indexes.xml
diff --git a/appengine-java8/datastore/indexes-perfect/src/main/webapp/WEB-INF/web.xml b/appengine-java8/datastore-indexes-perfect/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/datastore/indexes-perfect/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/datastore-indexes-perfect/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/datastore/indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine-java8/datastore-indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java
similarity index 100%
rename from appengine-java8/datastore/indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java
rename to appengine-java8/datastore-indexes-perfect/src/test/java/com/example/appengine/IndexesServletTest.java
diff --git a/appengine-java8/datastore/indexes/pom.xml b/appengine-java8/datastore-indexes/pom.xml
similarity index 98%
rename from appengine-java8/datastore/indexes/pom.xml
rename to appengine-java8/datastore-indexes/pom.xml
index 86d5cc7b8c2..1493f1c3bee 100644
--- a/appengine-java8/datastore/indexes/pom.xml
+++ b/appengine-java8/datastore-indexes/pom.xml
@@ -24,7 +24,7 @@
     <groupId>com.google.cloud</groupId>
     <artifactId>appengine-java8-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine-java8/datastore/indexes/src/main/java/com/example/appengine/IndexesServlet.java b/appengine-java8/datastore-indexes/src/main/java/com/example/appengine/IndexesServlet.java
similarity index 100%
rename from appengine-java8/datastore/indexes/src/main/java/com/example/appengine/IndexesServlet.java
rename to appengine-java8/datastore-indexes/src/main/java/com/example/appengine/IndexesServlet.java
diff --git a/appengine-java8/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/datastore-indexes/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/datastore/indexes/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/datastore-indexes/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/datastore/indexes/src/main/webapp/WEB-INF/datastore-indexes.xml b/appengine-java8/datastore-indexes/src/main/webapp/WEB-INF/datastore-indexes.xml
similarity index 100%
rename from appengine-java8/datastore/indexes/src/main/webapp/WEB-INF/datastore-indexes.xml
rename to appengine-java8/datastore-indexes/src/main/webapp/WEB-INF/datastore-indexes.xml
diff --git a/appengine-java8/datastore/indexes/src/main/webapp/WEB-INF/web.xml b/appengine-java8/datastore-indexes/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/datastore/indexes/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/datastore-indexes/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/datastore/indexes/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine-java8/datastore-indexes/src/test/java/com/example/appengine/IndexesServletTest.java
similarity index 100%
rename from appengine-java8/datastore/indexes/src/test/java/com/example/appengine/IndexesServletTest.java
rename to appengine-java8/datastore-indexes/src/test/java/com/example/appengine/IndexesServletTest.java
diff --git a/appengine-java8/endpoints-frameworks-v2/README.md b/appengine-java8/endpoints-v2-README.md
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/README.md
rename to appengine-java8/endpoints-v2-README.md
diff --git a/appengine-java8/endpoints-frameworks-v2/backend/.gitignore b/appengine-java8/endpoints-v2-backend/.gitignore
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/backend/.gitignore
rename to appengine-java8/endpoints-v2-backend/.gitignore
diff --git a/appengine-java8/endpoints-frameworks-v2/backend/README.md b/appengine-java8/endpoints-v2-backend/README.md
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/backend/README.md
rename to appengine-java8/endpoints-v2-backend/README.md
diff --git a/appengine-java8/endpoints-frameworks-v2/backend/pom.xml b/appengine-java8/endpoints-v2-backend/pom.xml
similarity index 99%
rename from appengine-java8/endpoints-frameworks-v2/backend/pom.xml
rename to appengine-java8/endpoints-v2-backend/pom.xml
index 376be68c122..12af100ce6f 100644
--- a/appengine-java8/endpoints-frameworks-v2/backend/pom.xml
+++ b/appengine-java8/endpoints-v2-backend/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>appengine-java8-samples</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>
diff --git a/appengine-java8/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Echo.java b/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Echo.java
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Echo.java
rename to appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Echo.java
diff --git a/appengine-java8/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Email.java b/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Email.java
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Email.java
rename to appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Email.java
diff --git a/appengine-java8/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Message.java b/appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Message.java
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/backend/src/main/java/com/example/echo/Message.java
rename to appengine-java8/endpoints-v2-backend/src/main/java/com/example/echo/Message.java
diff --git a/appengine-java8/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/logging.properties b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/logging.properties
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/logging.properties
rename to appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/logging.properties
diff --git a/appengine-java8/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml b/appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/backend/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/endpoints-v2-backend/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/README.md b/appengine-java8/endpoints-v2-migration/README.md
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/README.md
rename to appengine-java8/endpoints-v2-migration/README.md
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/build.gradle b/appengine-java8/endpoints-v2-migration/build.gradle
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/build.gradle
rename to appengine-java8/endpoints-v2-migration/build.gradle
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/gradle/wrapper/gradle-wrapper.properties b/appengine-java8/endpoints-v2-migration/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/gradle/wrapper/gradle-wrapper.properties
rename to appengine-java8/endpoints-v2-migration/gradle/wrapper/gradle-wrapper.properties
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/gradlew b/appengine-java8/endpoints-v2-migration/gradlew
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/gradlew
rename to appengine-java8/endpoints-v2-migration/gradlew
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/gradlew.bat b/appengine-java8/endpoints-v2-migration/gradlew.bat
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/gradlew.bat
rename to appengine-java8/endpoints-v2-migration/gradlew.bat
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/jenkins.sh b/appengine-java8/endpoints-v2-migration/jenkins.sh
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/jenkins.sh
rename to appengine-java8/endpoints-v2-migration/jenkins.sh
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/pom.xml b/appengine-java8/endpoints-v2-migration/pom.xml
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/pom.xml
rename to appengine-java8/endpoints-v2-migration/pom.xml
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/Constants.java b/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Constants.java
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/Constants.java
rename to appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Constants.java
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/Greetings.java b/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Greetings.java
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/Greetings.java
rename to appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/Greetings.java
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/HelloGreeting.java b/appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/HelloGreeting.java
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/java/com/example/helloendpoints/HelloGreeting.java
rename to appengine-java8/endpoints-v2-migration/src/main/java/com/example/helloendpoints/HelloGreeting.java
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/endpoints-v2-migration/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/endpoints-v2-migration/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/WEB-INF/logging.properties b/appengine-java8/endpoints-v2-migration/src/main/webapp/WEB-INF/logging.properties
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/WEB-INF/logging.properties
rename to appengine-java8/endpoints-v2-migration/src/main/webapp/WEB-INF/logging.properties
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/WEB-INF/web.xml b/appengine-java8/endpoints-v2-migration/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/endpoints-v2-migration/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/bootstrap/css/bootstrap-responsive.css b/appengine-java8/endpoints-v2-migration/src/main/webapp/bootstrap/css/bootstrap-responsive.css
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/bootstrap/css/bootstrap-responsive.css
rename to appengine-java8/endpoints-v2-migration/src/main/webapp/bootstrap/css/bootstrap-responsive.css
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/bootstrap/css/bootstrap.css b/appengine-java8/endpoints-v2-migration/src/main/webapp/bootstrap/css/bootstrap.css
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/bootstrap/css/bootstrap.css
rename to appengine-java8/endpoints-v2-migration/src/main/webapp/bootstrap/css/bootstrap.css
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/css/style.css b/appengine-java8/endpoints-v2-migration/src/main/webapp/css/style.css
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/css/style.css
rename to appengine-java8/endpoints-v2-migration/src/main/webapp/css/style.css
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/index.html b/appengine-java8/endpoints-v2-migration/src/main/webapp/index.html
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/index.html
rename to appengine-java8/endpoints-v2-migration/src/main/webapp/index.html
diff --git a/appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/js/base.js b/appengine-java8/endpoints-v2-migration/src/main/webapp/js/base.js
similarity index 100%
rename from appengine-java8/endpoints-frameworks-v2/migration-example/src/main/webapp/js/base.js
rename to appengine-java8/endpoints-v2-migration/src/main/webapp/js/base.js
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-listener-python/.gitignore b/appengine-java8/firebase-event-listener-python/.gitignore
similarity index 100%
rename from appengine-java8/firebase-event-proxy/gae-firebase-listener-python/.gitignore
rename to appengine-java8/firebase-event-listener-python/.gitignore
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-listener-python/app.yaml b/appengine-java8/firebase-event-listener-python/app.yaml
similarity index 100%
rename from appengine-java8/firebase-event-proxy/gae-firebase-listener-python/app.yaml
rename to appengine-java8/firebase-event-listener-python/app.yaml
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-listener-python/main.py b/appengine-java8/firebase-event-listener-python/main.py
similarity index 100%
rename from appengine-java8/firebase-event-proxy/gae-firebase-listener-python/main.py
rename to appengine-java8/firebase-event-listener-python/main.py
diff --git a/appengine-java8/firebase-event-proxy/README.md b/appengine-java8/firebase-event-proxy-README.md
similarity index 100%
rename from appengine-java8/firebase-event-proxy/README.md
rename to appengine-java8/firebase-event-proxy-README.md
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/pom.xml b/appengine-java8/firebase-event-proxy/pom.xml
similarity index 98%
rename from appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
rename to appengine-java8/firebase-event-proxy/pom.xml
index 374ce1fa4cf..3ef0cb15212 100644
--- a/appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
+++ b/appengine-java8/firebase-event-proxy/pom.xml
@@ -24,7 +24,7 @@
       <groupId>com.google.cloud</groupId>
       <artifactId>appengine-java8-samples</artifactId>
       <version>1.0.0</version>
-      <relativePath>../..</relativePath>
+      <relativePath>..</relativePath>
   </parent>
 
   <properties>
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java b/appengine-java8/firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
similarity index 100%
rename from appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
rename to appengine-java8/firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java b/appengine-java8/firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
similarity index 100%
rename from appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
rename to appengine-java8/firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/ServletContextListenerImpl.java
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/firebase-event-proxy/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties b/appengine-java8/firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties
similarity index 100%
rename from appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties
rename to appengine-java8/firebase-event-proxy/src/main/webapp/WEB-INF/logging.properties
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml b/appengine-java8/firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/firebase-event-proxy/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/index.jsp b/appengine-java8/firebase-event-proxy/src/main/webapp/index.jsp
similarity index 100%
rename from appengine-java8/firebase-event-proxy/gae-firebase-event-proxy/src/main/webapp/index.jsp
rename to appengine-java8/firebase-event-proxy/src/main/webapp/index.jsp
diff --git a/appengine-java8/pom.xml b/appengine-java8/pom.xml
index dc39478adca..02ccbef5d98 100644
--- a/appengine-java8/pom.xml
+++ b/appengine-java8/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2016 Google Inc.
+ Copyright 2017 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -41,13 +41,13 @@
     <module>cloudsql</module>
 
     <module>datastore</module>
-    <module>datastore/indexes</module>
-    <module>datastore/indexes-exploding</module>
-    <module>datastore/indexes-perfect</module>
+    <module>datastore-indexes</module>
+    <module>datastore-indexes-exploding</module>
+    <module>datastore-indexes-perfect</module>
 
-    <module>endpoints-frameworks-v2/backend</module>
+    <module>endpoints-v2-backend</module>
 
-    <module>firebase-event-proxy/gae-firebase-event-proxy</module>
+    <module>firebase-event-proxy</module>
 
     <module>firebase-tictactoe</module>
 
@@ -65,14 +65,14 @@
     <module>search</module>
     <module>sendgrid</module>
 
-    <module>remote/remote-client</module>
-    <module>remote/remote-server</module>
+    <module>remote-client</module>
+    <module>remote-server</module>
 
     <module>static-files</module>
 
-    <module>taskqueue/deferred</module>
-    <module>taskqueue/pull</module>
-    <module>taskqueue/push</module>
+    <module>taskqueues-deferred</module>
+    <module>taskqueues-pull</module>
+    <module>taskqueues-push</module>
 
     <module>twilio</module>
 
diff --git a/appengine-java8/remote/README.md b/appengine-java8/remote-README.md
similarity index 100%
rename from appengine-java8/remote/README.md
rename to appengine-java8/remote-README.md
diff --git a/appengine-java8/remote/remote-client/pom.xml b/appengine-java8/remote-client/pom.xml
similarity index 98%
rename from appengine-java8/remote/remote-client/pom.xml
rename to appengine-java8/remote-client/pom.xml
index 0f65dbfceee..9a61f65f994 100644
--- a/appengine-java8/remote/remote-client/pom.xml
+++ b/appengine-java8/remote-client/pom.xml
@@ -24,7 +24,7 @@
     <artifactId>appengine-java8-samples</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <dependencies>
diff --git a/appengine-java8/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java b/appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
similarity index 100%
rename from appengine-java8/remote/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
rename to appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
diff --git a/appengine-java8/remote/remote-server/pom.xml b/appengine-java8/remote-server/pom.xml
similarity index 98%
rename from appengine-java8/remote/remote-server/pom.xml
rename to appengine-java8/remote-server/pom.xml
index 1eff745a61e..1c17e738a64 100644
--- a/appengine-java8/remote/remote-server/pom.xml
+++ b/appengine-java8/remote-server/pom.xml
@@ -24,7 +24,7 @@
     <artifactId>appengine-java8-samples</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <dependencies>
diff --git a/appengine-java8/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java b/appengine-java8/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java
similarity index 100%
rename from appengine-java8/remote/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java
rename to appengine-java8/remote-server/src/main/java/com/example/appengine/remote/RemoteServlet.java
diff --git a/appengine-java8/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/remote-server/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/remote/remote-server/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/remote-server/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/remote/remote-server/src/main/webapp/WEB-INF/web.xml b/appengine-java8/remote-server/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/remote/remote-server/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/remote-server/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/taskqueue/README.md b/appengine-java8/taskqueues-README.md
similarity index 100%
rename from appengine-java8/taskqueue/README.md
rename to appengine-java8/taskqueues-README.md
diff --git a/appengine-java8/taskqueue/deferred/README.md b/appengine-java8/taskqueues-deferred/README.md
similarity index 100%
rename from appengine-java8/taskqueue/deferred/README.md
rename to appengine-java8/taskqueues-deferred/README.md
diff --git a/appengine-java8/taskqueue/deferred/pom.xml b/appengine-java8/taskqueues-deferred/pom.xml
similarity index 98%
rename from appengine-java8/taskqueue/deferred/pom.xml
rename to appengine-java8/taskqueues-deferred/pom.xml
index 13254ab6c1a..1c69e62912e 100644
--- a/appengine-java8/taskqueue/deferred/pom.xml
+++ b/appengine-java8/taskqueues-deferred/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>appengine-java8-samples</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>
diff --git a/appengine-java8/taskqueue/deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java b/appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java
similarity index 100%
rename from appengine-java8/taskqueue/deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java
rename to appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java
diff --git a/appengine-java8/taskqueue/deferred/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/taskqueues-deferred/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/taskqueue/deferred/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/taskqueues-deferred/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/taskqueue/deferred/src/main/webapp/WEB-INF/logging.properties b/appengine-java8/taskqueues-deferred/src/main/webapp/WEB-INF/logging.properties
similarity index 100%
rename from appengine-java8/taskqueue/deferred/src/main/webapp/WEB-INF/logging.properties
rename to appengine-java8/taskqueues-deferred/src/main/webapp/WEB-INF/logging.properties
diff --git a/appengine-java8/taskqueue/deferred/src/main/webapp/WEB-INF/web.xml b/appengine-java8/taskqueues-deferred/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/taskqueue/deferred/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/taskqueues-deferred/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/taskqueue/deferred/src/main/webapp/guestbook.jsp b/appengine-java8/taskqueues-deferred/src/main/webapp/guestbook.jsp
similarity index 100%
rename from appengine-java8/taskqueue/deferred/src/main/webapp/guestbook.jsp
rename to appengine-java8/taskqueues-deferred/src/main/webapp/guestbook.jsp
diff --git a/appengine-java8/taskqueue/pull/README.md b/appengine-java8/taskqueues-pull/README.md
similarity index 100%
rename from appengine-java8/taskqueue/pull/README.md
rename to appengine-java8/taskqueues-pull/README.md
diff --git a/appengine-java8/taskqueue/pull/pom.xml b/appengine-java8/taskqueues-pull/pom.xml
similarity index 98%
rename from appengine-java8/taskqueue/pull/pom.xml
rename to appengine-java8/taskqueues-pull/pom.xml
index 68c6ed7fae0..a7b1b1a6f7c 100644
--- a/appengine-java8/taskqueue/pull/pom.xml
+++ b/appengine-java8/taskqueues-pull/pom.xml
@@ -26,7 +26,7 @@ Copyright 2016 Google Inc.
       <artifactId>appengine-java8-samples</artifactId>
       <groupId>com.google.cloud</groupId>
       <version>1.0.0</version>
-      <relativePath>../..</relativePath>
+      <relativePath>..</relativePath>
     </parent>
     <dependencies>
         <!-- Compile/runtime dependencies -->
diff --git a/appengine-java8/taskqueue/pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java b/appengine-java8/taskqueues-pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java
similarity index 100%
rename from appengine-java8/taskqueue/pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java
rename to appengine-java8/taskqueues-pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java
diff --git a/appengine-java8/taskqueue/pull/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/taskqueues-pull/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/taskqueue/pull/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/taskqueues-pull/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/taskqueue/pull/src/main/webapp/WEB-INF/logging.properties b/appengine-java8/taskqueues-pull/src/main/webapp/WEB-INF/logging.properties
similarity index 100%
rename from appengine-java8/taskqueue/pull/src/main/webapp/WEB-INF/logging.properties
rename to appengine-java8/taskqueues-pull/src/main/webapp/WEB-INF/logging.properties
diff --git a/appengine-java8/taskqueue/pull/src/main/webapp/WEB-INF/queue.xml b/appengine-java8/taskqueues-pull/src/main/webapp/WEB-INF/queue.xml
similarity index 100%
rename from appengine-java8/taskqueue/pull/src/main/webapp/WEB-INF/queue.xml
rename to appengine-java8/taskqueues-pull/src/main/webapp/WEB-INF/queue.xml
diff --git a/appengine-java8/taskqueue/pull/src/main/webapp/WEB-INF/web.xml b/appengine-java8/taskqueues-pull/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/taskqueue/pull/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/taskqueues-pull/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/taskqueue/pull/src/main/webapp/tasks.jsp b/appengine-java8/taskqueues-pull/src/main/webapp/tasks.jsp
similarity index 100%
rename from appengine-java8/taskqueue/pull/src/main/webapp/tasks.jsp
rename to appengine-java8/taskqueues-pull/src/main/webapp/tasks.jsp
diff --git a/appengine-java8/taskqueue/push/README.md b/appengine-java8/taskqueues-push/README.md
similarity index 100%
rename from appengine-java8/taskqueue/push/README.md
rename to appengine-java8/taskqueues-push/README.md
diff --git a/appengine-java8/taskqueue/push/pom.xml b/appengine-java8/taskqueues-push/pom.xml
similarity index 98%
rename from appengine-java8/taskqueue/push/pom.xml
rename to appengine-java8/taskqueues-push/pom.xml
index 7274ac04056..fdbfa15702e 100644
--- a/appengine-java8/taskqueue/push/pom.xml
+++ b/appengine-java8/taskqueues-push/pom.xml
@@ -25,7 +25,7 @@ Copyright 2016 Google Inc.
     <groupId>com.google.cloud</groupId>
     <artifactId>appengine-java8-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/appengine-java8/taskqueue/push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java b/appengine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java
similarity index 100%
rename from appengine-java8/taskqueue/push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java
rename to appengine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java
diff --git a/appengine-java8/taskqueue/push/src/main/java/com/example/appengine/taskqueue/push/Worker.java b/appengine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Worker.java
similarity index 100%
rename from appengine-java8/taskqueue/push/src/main/java/com/example/appengine/taskqueue/push/Worker.java
rename to appengine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Worker.java
diff --git a/appengine-java8/taskqueue/push/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java8/taskqueues-push/src/main/webapp/WEB-INF/appengine-web.xml
similarity index 100%
rename from appengine-java8/taskqueue/push/src/main/webapp/WEB-INF/appengine-web.xml
rename to appengine-java8/taskqueues-push/src/main/webapp/WEB-INF/appengine-web.xml
diff --git a/appengine-java8/taskqueue/push/src/main/webapp/WEB-INF/web.xml b/appengine-java8/taskqueues-push/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from appengine-java8/taskqueue/push/src/main/webapp/WEB-INF/web.xml
rename to appengine-java8/taskqueues-push/src/main/webapp/WEB-INF/web.xml
diff --git a/appengine-java8/taskqueue/push/src/main/webapp/index.html b/appengine-java8/taskqueues-push/src/main/webapp/index.html
similarity index 100%
rename from appengine-java8/taskqueue/push/src/main/webapp/index.html
rename to appengine-java8/taskqueues-push/src/main/webapp/index.html
diff --git a/appengine-java8/taskqueue/push/src/test/java/com/example/appengine/taskqueue/push/WorkerTest.java b/appengine-java8/taskqueues-push/src/test/java/com/example/appengine/taskqueue/push/WorkerTest.java
similarity index 100%
rename from appengine-java8/taskqueue/push/src/test/java/com/example/appengine/taskqueue/push/WorkerTest.java
rename to appengine-java8/taskqueues-push/src/test/java/com/example/appengine/taskqueue/push/WorkerTest.java