diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 11292584458..8e05e4e33fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,6 +2,7 @@
 
 * [Contributor License Agreements](#Contributor-License-Agreements)
 * [Contributing a Patch](#Contributing-a-Patch)
+* [Contributing a new sample](#Contributing-a-new-sample)
 * [Build Tools](#build-tools)
 * [Integration Testing](#testing)
 * [Style](#Style)
@@ -37,6 +38,17 @@ accept your pull requests.
 1. Ensure that your code has an appropriate set of unit tests which all pass.
 1. Submit a pull request.
 
+## Contributing a new sample
+
+1. App Engine Standard samples all go into `/appengine` (java 7) or `/java8-appengine` (Java 8) (if your contributing a group of samples,
+please put the App Engine Standard sample into `/appengine` and provide a link in both `README.md`'s for
+the project for the additional sample.
+
+1. App Engine Flexible samples all go into `/flexible`
+
+1. Technology samples go into the project root.
+
+
 ## Build Tools
 
 All new samples should build and run integration tests with both [Maven](https://maven.apache.org/) and [Gradle](https://gradle.org/).
@@ -66,6 +78,10 @@ test {
 }
 ```
 
+### Keys and Secrets
+
+Please contact a Java DPE for instructions before adding to Travis.
+
 ## Style
 
 Samples in this repository follow the [Google Java Style Guide][java-style].
diff --git a/appengine/analytics/pom.xml b/appengine/analytics/pom.xml
index 0280111e86c..b2e3c5759f5 100644
--- a/appengine/analytics/pom.xml
+++ b/appengine/analytics/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
   <artifactId>appengine-analytics</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-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). -->
 
diff --git a/appengine/appidentity/pom.xml b/appengine/appidentity/pom.xml
index 22c94aa7fb3..23fd77bdc99 100644
--- a/appengine/appidentity/pom.xml
+++ b/appengine/appidentity/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <properties>
diff --git a/appengine/channel/pom.xml b/appengine/channel/pom.xml
index 57d0543bcba..b84fb3f6750 100644
--- a/appengine/channel/pom.xml
+++ b/appengine/channel/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
     <artifactId>appengine-channel</artifactId>
     <parent>
         <groupId>com.google.cloud</groupId>
-        <artifactId>doc-samples</artifactId>
+        <artifactId>appengine-doc-samples</artifactId>
         <version>1.0.0</version>
-        <relativePath>../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
     <properties>
         <objectify.version>5.1.14</objectify.version>
diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml
index 39aa14b3b6f..64324ecaad6 100644
--- a/appengine/cloudsql/pom.xml
+++ b/appengine/cloudsql/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
   <artifactId>appengine-cloudsql</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
 <!-- [START properties] -->
diff --git a/appengine/datastore/indexes-exploding/pom.xml b/appengine/datastore/indexes-exploding/pom.xml
index 02ab18d0e99..310dc2577bc 100644
--- a/appengine/datastore/indexes-exploding/pom.xml
+++ b/appengine/datastore/indexes-exploding/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../../..</relativePath>
+    <relativePath>../..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/datastore/indexes-perfect/pom.xml b/appengine/datastore/indexes-perfect/pom.xml
index 3f54c202ad5..36670e2a86a 100644
--- a/appengine/datastore/indexes-perfect/pom.xml
+++ b/appengine/datastore/indexes-perfect/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../../..</relativePath>
+    <relativePath>../..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/datastore/indexes/pom.xml b/appengine/datastore/indexes/pom.xml
index ce62b653064..811a6af356e 100644
--- a/appengine/datastore/indexes/pom.xml
+++ b/appengine/datastore/indexes/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../../..</relativePath>
+    <relativePath>../..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/datastore/pom.xml b/appengine/datastore/pom.xml
index 99f450c035e..24a121c1e09 100644
--- a/appengine/datastore/pom.xml
+++ b/appengine/datastore/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/endpoints-frameworks-v2/backend/pom.xml b/appengine/endpoints-frameworks-v2/backend/pom.xml
index e8b57b47fa0..91ce2aa3e1d 100644
--- a/appengine/endpoints-frameworks-v2/backend/pom.xml
+++ b/appengine/endpoints-frameworks-v2/backend/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@
     <artifactId>echo</artifactId>
 
     <parent>
-        <artifactId>doc-samples</artifactId>
+        <artifactId>appengine-doc-samples</artifactId>
         <groupId>com.google.cloud</groupId>
         <version>1.0.0</version>
-        <relativePath>../../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <properties>
@@ -106,21 +106,6 @@
         <!-- for hot reload of the web application-->
         <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
         <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>2.2</version>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>display-dependency-updates</goal>
-                            <goal>display-plugin-updates</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
diff --git a/appengine/endpoints-frameworks-v2/discovery/pom.xml b/appengine/endpoints-frameworks-v2/discovery/pom.xml
index 5cfcf297e1b..d62e5d0d164 100644
--- a/appengine/endpoints-frameworks-v2/discovery/pom.xml
+++ b/appengine/endpoints-frameworks-v2/discovery/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
 <!--
 Copyright 2017 Google Inc.
 
@@ -15,6 +14,7 @@ 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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
     <version>1.0-SNAPSHOT</version>
@@ -23,10 +23,10 @@ limitations under the License.
     <artifactId>helloendpoints</artifactId>
 
     <parent>
-        <artifactId>doc-samples</artifactId>
+        <artifactId>appengine-doc-samples</artifactId>
         <groupId>com.google.cloud</groupId>
         <version>1.0.0</version>
-        <relativePath>../../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <properties>
diff --git a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
index 3b60bee0b7f..c4c435ddd55 100644
--- a/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
+++ b/appengine/firebase-event-proxy/gae-firebase-event-proxy/pom.xml
@@ -1,9 +1,11 @@
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 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.
@@ -20,9 +22,9 @@
 
     <parent>
         <groupId>com.google.cloud</groupId>
-        <artifactId>doc-samples</artifactId>
+        <artifactId>appengine-doc-samples</artifactId>
         <version>1.0.0</version>
-        <relativePath>../../..</relativePath>
+        <relativePath>../..</relativePath>
     </parent>
 
     <properties>
diff --git a/appengine/firebase-tictactoe/pom.xml b/appengine/firebase-tictactoe/pom.xml
index 866713c1479..8380a69b790 100644
--- a/appengine/firebase-tictactoe/pom.xml
+++ b/appengine/firebase-tictactoe/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
     <artifactId>appengine-firebase-tictactoe</artifactId>
     <parent>
         <groupId>com.google.cloud</groupId>
-        <artifactId>doc-samples</artifactId>
+        <artifactId>appengine-doc-samples</artifactId>
         <version>1.0.0</version>
-        <relativePath>../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
     <properties>
         <objectify.version>5.1.14</objectify.version>
diff --git a/appengine/guestbook-cloud-datastore/pom.xml b/appengine/guestbook-cloud-datastore/pom.xml
index bc7683efe06..59b8dd6b236 100644
--- a/appengine/guestbook-cloud-datastore/pom.xml
+++ b/appengine/guestbook-cloud-datastore/pom.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2016 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:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns="http://maven.apache.org/POM/4.0.0"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -14,9 +29,9 @@
   </properties>
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <!-- [START set_versions] -->
diff --git a/appengine/guestbook-objectify/pom.xml b/appengine/guestbook-objectify/pom.xml
index b59d7e9919b..11ee21a06cf 100644
--- a/appengine/guestbook-objectify/pom.xml
+++ b/appengine/guestbook-objectify/pom.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2015 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/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -13,9 +28,9 @@
     </properties>
     <parent>
         <groupId>com.google.cloud</groupId>
-        <artifactId>doc-samples</artifactId>
+        <artifactId>appengine-doc-samples</artifactId>
         <version>1.0.0</version>
-        <relativePath>../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
 
     <!-- [START set_versions] -->
diff --git a/appengine/helloworld-new-plugins/pom.xml b/appengine/helloworld-new-plugins/pom.xml
index 889ad91cf04..d4829028018 100644
--- a/appengine/helloworld-new-plugins/pom.xml
+++ b/appengine/helloworld-new-plugins/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@ Copyright 2015 Google Inc. All Rights Reserved.
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/helloworld/pom.xml b/appengine/helloworld/pom.xml
index 55155e62efd..10dbb193de0 100644
--- a/appengine/helloworld/pom.xml
+++ b/appengine/helloworld/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <artifactId>appengine-helloworld</artifactId>
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/appengine/images/pom.xml b/appengine/images/pom.xml
index f52f8161b00..308a0cff36a 100644
--- a/appengine/images/pom.xml
+++ b/appengine/images/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@ Copyright 2015 Google Inc. All Rights Reserved.
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/logs/pom.xml b/appengine/logs/pom.xml
index df77d0e2e15..d47bada9702 100644
--- a/appengine/logs/pom.xml
+++ b/appengine/logs/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <dependencies>
    <dependency>
diff --git a/appengine/mail/pom.xml b/appengine/mail/pom.xml
index 19318a04121..a1e5b964c7c 100644
--- a/appengine/mail/pom.xml
+++ b/appengine/mail/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/mailgun/pom.xml b/appengine/mailgun/pom.xml
index 4e34256aad4..ea9784f4366 100644
--- a/appengine/mailgun/pom.xml
+++ b/appengine/mailgun/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
   <artifactId>appengine-mailgun</artifactId>
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/appengine/mailjet/pom.xml b/appengine/mailjet/pom.xml
index 59f9cdb92f1..4f48c524938 100644
--- a/appengine/mailjet/pom.xml
+++ b/appengine/mailjet/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2015 Google Inc. All Rights Reserved.
+ Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@
   <artifactId>appengine-mailjet</artifactId>
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <properties>
     <mailjet.version>4.0.5</mailjet.version>
diff --git a/appengine/memcache/pom.xml b/appengine/memcache/pom.xml
index 0eeb3f52eb6..25bb16fc642 100644
--- a/appengine/memcache/pom.xml
+++ b/appengine/memcache/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <artifactId>appengine-memcache</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/multitenancy/pom.xml b/appengine/multitenancy/pom.xml
index a1b7cc67d86..727767b9074 100644
--- a/appengine/multitenancy/pom.xml
+++ b/appengine/multitenancy/pom.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2016 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/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
@@ -14,9 +29,9 @@
     </properties>
     <parent>
         <groupId>com.google.cloud</groupId>
-        <artifactId>doc-samples</artifactId>
+        <artifactId>appengine-doc-samples</artifactId>
         <version>1.0.0</version>
-        <relativePath>../..</relativePath>
+        <relativePath>..</relativePath>
     </parent>
 
     <!-- [START set_versions] -->
diff --git a/appengine/oauth2/pom.xml b/appengine/oauth2/pom.xml
index 4382d2b0273..024dab38fa9 100644
--- a/appengine/oauth2/pom.xml
+++ b/appengine/oauth2/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/pom.xml b/appengine/pom.xml
new file mode 100644
index 00000000000..4b29a3e6beb
--- /dev/null
+++ b/appengine/pom.xml
@@ -0,0 +1,140 @@
+<!--
+ Copyright 2016 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>
+    <modelVersion>4.0.0</modelVersion>
+    <version>1.0.0</version>
+
+    <groupId>com.google.cloud</groupId>
+    <artifactId>appengine-doc-samples</artifactId>
+    <packaging>pom</packaging>
+
+    <!-- Parent POM defines common plugins and properties. -->
+    <parent>
+        <artifactId>doc-samples</artifactId>
+        <groupId>com.google.cloud</groupId>
+        <version>1.0.0</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <properties>
+        <appengine.sdk.version>1.9.49</appengine.sdk.version>
+        <appengine.app.version>1</appengine.app.version>
+
+        <project.http.version>1.19.0</project.http.version>
+        <project.oauth.version>1.19.0</project.oauth.version>
+
+        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.7</maven.compiler.source>
+    </properties>
+
+    <prerequisites>
+        <maven>3.3.9</maven>
+    </prerequisites>
+
+    <modules>
+        <!-- App Engine Standard -->
+        <module>analytics</module>
+        <module>appidentity</module>
+        <module>channel</module>
+        <module>cloudsql</module>
+        <module>datastore</module>
+        <module>datastore/indexes</module>
+        <module>datastore/indexes-exploding</module>
+        <module>datastore/indexes-perfect</module>
+        <module>endpoints-frameworks-v2/backend</module>
+        <module>firebase-event-proxy/gae-firebase-event-proxy</module>
+        <module>firebase-tictactoe</module>
+        <module>guestbook-objectify</module>
+        <module>helloworld</module>
+        <module>helloworld-new-plugins</module>
+        <module>images</module>
+        <module>logs</module>
+        <module>mailgun</module>
+        <module>mailjet</module>
+        <module>memcache</module>
+        <module>multitenancy</module>
+        <module>oauth2</module>
+        <module>requests</module>
+        <module>search</module>
+        <module>sendgrid</module>
+        <module>remote/remote-client</module>
+        <module>remote/remote-server</module>
+        <module>static-files</module>
+        <module>taskqueue-push</module>
+        <module>twilio</module>
+        <module>urlfetch</module>
+        <module>users</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+        <!-- Compile/runtime dependencies -->
+        <dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-api-1.0-sdk</artifactId>
+            <version>${appengine.sdk.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>jstl</groupId>
+            <artifactId>jstl</artifactId>
+            <version>1.2</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.5.5</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.jcabi</groupId>
+            <artifactId>jcabi-matchers</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-testing</artifactId>
+            <version>${appengine.sdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.appengine</groupId>
+            <artifactId>appengine-api-stubs</artifactId>
+            <version>${appengine.sdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <build>
+    <plugins> <!-- DISABLE ErrorProne - until we move to Java 8 -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
+        <configuration combine.self="override" />
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/appengine/remote/remote-client/pom.xml b/appengine/remote/remote-client/pom.xml
index 40d77ab3fe2..b2d55b838ce 100644
--- a/appengine/remote/remote-client/pom.xml
+++ b/appengine/remote/remote-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
   <artifactId>appengine-remote-client</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-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/remote/remote-server/pom.xml b/appengine/remote/remote-server/pom.xml
index 75a68586cb4..b056c7ef91f 100644
--- a/appengine/remote/remote-server/pom.xml
+++ b/appengine/remote/remote-server/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
   <artifactId>appengine-remote-server</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-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/requests/pom.xml b/appengine/requests/pom.xml
index 347f5e3c148..f985e663fe1 100644
--- a/appengine/requests/pom.xml
+++ b/appengine/requests/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <dependencies>
    <dependency>
diff --git a/appengine/search/pom.xml b/appengine/search/pom.xml
index c990803ab9f..beeb3f7f0cb 100644
--- a/appengine/search/pom.xml
+++ b/appengine/search/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,9 +21,9 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <artifactId>appengine-search</artifactId>
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/appengine/sendgrid/pom.xml b/appengine/sendgrid/pom.xml
index 4e8f7e34c26..f25ad2b7d97 100644
--- a/appengine/sendgrid/pom.xml
+++ b/appengine/sendgrid/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <artifactId>appengine-sendgrid</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/static-files/pom.xml b/appengine/static-files/pom.xml
index a3eaf7d2f8f..80bc6e63d3e 100644
--- a/appengine/static-files/pom.xml
+++ b/appengine/static-files/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <artifactId>appengine-staticfiles</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
diff --git a/appengine/taskqueue-push/pom.xml b/appengine/taskqueue-push/pom.xml
index f904872a241..fab28f9170a 100644
--- a/appengine/taskqueue-push/pom.xml
+++ b/appengine/taskqueue-push/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@ Copyright 2016 Google Inc. All Rights Reserved.
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/appengine/taskqueue/pull/pom.xml b/appengine/taskqueue/pull/pom.xml
index 62e2cf70090..162ffb2b03c 100644
--- a/appengine/taskqueue/pull/pom.xml
+++ b/appengine/taskqueue/pull/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -23,10 +23,10 @@ Copyright 2016 Google Inc. All Rights Reserved.
     <artifactId>taskqueue</artifactId>
 
     <parent>
-      <artifactId>doc-samples</artifactId>
+      <artifactId>appengine-doc-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/twilio/pom.xml b/appengine/twilio/pom.xml
index 7db6abaab1e..4f79a933d01 100644
--- a/appengine/twilio/pom.xml
+++ b/appengine/twilio/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <artifactId>appengine-twilio</artifactId>
 
   <parent>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <groupId>com.google.cloud</groupId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
@@ -53,15 +53,6 @@ Copyright 2015 Google Inc. All Rights Reserved.
         <artifactId>appengine-maven-plugin</artifactId>
         <version>${appengine.sdk.version}</version>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/appengine/urlfetch/pom.xml b/appengine/urlfetch/pom.xml
index 2acd297343b..8912befc531 100644
--- a/appengine/urlfetch/pom.xml
+++ b/appengine/urlfetch/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@ Copyright 2015 Google Inc. All Rights Reserved.
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
 
   <dependencies>
@@ -45,15 +45,6 @@ Copyright 2015 Google Inc. All Rights Reserved.
     <!-- for hot reload of the web application -->
     <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <version>3.3</version>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
       <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
       <plugin>
         <groupId>com.google.appengine</groupId>
diff --git a/appengine/users/pom.xml b/appengine/users/pom.xml
index 5ecc5616eba..2a4ec685632 100644
--- a/appengine/users/pom.xml
+++ b/appengine/users/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2015 Google Inc. All Rights Reserved.
+Copyright 2015 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@ Copyright 2015 Google Inc. All Rights Reserved.
   <!-- Parent POM defines ${appengine.sdk.version} (updates frequently). -->
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>doc-samples</artifactId>
+    <artifactId>appengine-doc-samples</artifactId>
     <version>1.0.0</version>
-    <relativePath>../..</relativePath>
+    <relativePath>..</relativePath>
   </parent>
   <dependencies>
     <dependency>
diff --git a/compute/sendgrid/pom.xml b/compute/sendgrid/pom.xml
index 5d8d21212aa..01fac304879 100644
--- a/compute/sendgrid/pom.xml
+++ b/compute/sendgrid/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/datastore/cloud-client/pom.xml b/datastore/cloud-client/pom.xml
index 6af9a66bde2..ab03d81de4b 100644
--- a/datastore/cloud-client/pom.xml
+++ b/datastore/cloud-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/datastore/pom.xml b/datastore/pom.xml
index d3e20768975..822318d04b5 100644
--- a/datastore/pom.xml
+++ b/datastore/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/flexible/sparkjava/pom.xml b/flexible/sparkjava/pom.xml
index 17608523944..8daf96ca4f1 100644
--- a/flexible/sparkjava/pom.xml
+++ b/flexible/sparkjava/pom.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2016 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/xsd/maven-4.0.0.xsd">
diff --git a/logging/pom.xml b/logging/pom.xml
index 2113c23ebc3..b2cc05516cf 100644
--- a/logging/pom.xml
+++ b/logging/pom.xml
@@ -1,3 +1,18 @@
+<!--
+Copyright 2016 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>
diff --git a/monitoring/v2/pom.xml b/monitoring/v2/pom.xml
index 2c2b3d9d6a4..3e21e95c3c7 100644
--- a/monitoring/v2/pom.xml
+++ b/monitoring/v2/pom.xml
@@ -1,3 +1,18 @@
+<!--
+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.
+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>
diff --git a/monitoring/v3/pom.xml b/monitoring/v3/pom.xml
index cc43dbc6b52..63df8036f6e 100644
--- a/monitoring/v3/pom.xml
+++ b/monitoring/v3/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index c49ff8fa61b..78532733367 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <!--
- Copyright 2016 Google Inc. All Rights Reserved.
+ Copyright 2016 Google Inc.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -29,9 +29,6 @@
     </parent>
 
     <properties>
-        <appengine.sdk.version>1.9.48</appengine.sdk.version>
-        <appengine.app.version>1</appengine.app.version>
-
         <project.http.version>1.19.0</project.http.version>
         <project.oauth.version>1.19.0</project.oauth.version>
 
@@ -49,37 +46,7 @@
 
     <modules>
         <!-- App Engine Standard -->
-        <module>appengine/analytics</module>
-        <module>appengine/appidentity</module>
-        <module>appengine/channel</module>
-        <module>appengine/cloudsql</module>
-        <module>appengine/datastore</module>
-        <module>appengine/datastore/indexes</module>
-        <module>appengine/datastore/indexes-exploding</module>
-        <module>appengine/datastore/indexes-perfect</module>
-        <module>appengine/endpoints-frameworks-v2/backend</module>
-        <module>appengine/firebase-event-proxy/gae-firebase-event-proxy</module>
-        <module>appengine/firebase-tictactoe</module>
-        <module>appengine/guestbook-objectify</module>
-        <module>appengine/helloworld</module>
-        <module>appengine/helloworld-new-plugins</module>
-        <module>appengine/images</module>
-        <module>appengine/logs</module>
-        <module>appengine/mailgun</module>
-        <module>appengine/mailjet</module>
-        <module>appengine/memcache</module>
-        <module>appengine/multitenancy</module>
-        <module>appengine/oauth2</module>
-        <module>appengine/requests</module>
-        <module>appengine/search</module>
-        <module>appengine/sendgrid</module>
-        <module>appengine/remote/remote-client</module>
-        <module>appengine/remote/remote-server</module>
-        <module>appengine/static-files</module>
-        <module>appengine/taskqueue-push</module>
-        <module>appengine/twilio</module>
-        <module>appengine/urlfetch</module>
-        <module>appengine/users</module>
+        <module>appengine</module>
 
         <!-- App Engine Flexible -->
         <module>flexible/analytics</module>
@@ -137,11 +104,6 @@
     <dependencyManagement>
         <dependencies>
         <!-- Compile/runtime dependencies -->
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>${appengine.sdk.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>jstl</groupId>
@@ -167,18 +129,6 @@
             <artifactId>jcabi-matchers</artifactId>
             <version>1.3</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-testing</artifactId>
-            <version>${appengine.sdk.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.appengine</groupId>
-            <artifactId>appengine-api-stubs</artifactId>
-            <version>${appengine.sdk.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/spanner/cloud-client/pom.xml b/spanner/cloud-client/pom.xml
index b0b00bc4a5b..40279a035c3 100644
--- a/spanner/cloud-client/pom.xml
+++ b/spanner/cloud-client/pom.xml
@@ -13,6 +13,21 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<!--
+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.
+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>
   <modelVersion>4.0.0</modelVersion>
   <groupId>come.example.spanner</groupId>
diff --git a/speech/grpc/pom.xml b/speech/grpc/pom.xml
index 2030c90a54f..7a08331f7c3 100644
--- a/speech/grpc/pom.xml
+++ b/speech/grpc/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/storage/xml-api/serviceaccount-appengine-sample/pom.xml b/storage/xml-api/serviceaccount-appengine-sample/pom.xml
index f5a90fdf453..06294e5fda1 100644
--- a/storage/xml-api/serviceaccount-appengine-sample/pom.xml
+++ b/storage/xml-api/serviceaccount-appengine-sample/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -33,6 +33,7 @@
   <properties>
     <maven.compiler.target>1.7</maven.compiler.target>
     <maven.compiler.source>1.7</maven.compiler.source>
+    <appengine.sdk.version>1.9.49</appengine.sdk.version> <!-- TODO(): MOVE to /appengine -->
     <google-api-client.version>1.22.0</google-api-client.version>
     <webappDirectory>${project.build.directory}/${project.build.finalName}
     </webappDirectory>
diff --git a/taskqueue/deferred/pom.xml b/taskqueue/deferred/pom.xml
index 38605ecb963..4f8cf995e10 100644
--- a/taskqueue/deferred/pom.xml
+++ b/taskqueue/deferred/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
     <properties>
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.source>1.7</maven.compiler.source>
+        <appengine.sdk.version>1.9.49</appengine.sdk.version> <!-- TODO: MOVE TO /appengine -->
         <codehaus-versions-maven-plugin-version>2.3</codehaus-versions-maven-plugin-version>
         <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
     </properties>
@@ -40,6 +41,7 @@
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
+            <version>${appengine.sdk.version}</version>
         </dependency>
         <dependency>
           <groupId>javax.servlet</groupId>
@@ -56,19 +58,23 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>2.5.5</version>
         </dependency>
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-testing</artifactId>
+            <version>${appengine.sdk.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-stubs</artifactId>
-        </dependency>
+            <version>${appengine.sdk.version}</version>
+       </dependency>
     </dependencies>
 
     <build>
diff --git a/translate/cloud-client/pom.xml b/translate/cloud-client/pom.xml
index 22c7f586ccd..b054589e487 100644
--- a/translate/cloud-client/pom.xml
+++ b/translate/cloud-client/pom.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright 2016 Google Inc. All Rights Reserved.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/translate/pom.xml b/translate/pom.xml
index 155ba7145d8..d21e8216a91 100644
--- a/translate/pom.xml
+++ b/translate/pom.xml
@@ -1,5 +1,5 @@
 <!--
-Copyright 2016 Google Inc. All Rights Reserved.
+Copyright 2016 Google Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/unittests/pom.xml b/unittests/pom.xml
index 14f49a21471..06bd7185b3f 100644
--- a/unittests/pom.xml
+++ b/unittests/pom.xml
@@ -19,6 +19,7 @@
     <properties>
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.compiler.source>1.7</maven.compiler.source>
+        <appengine.sdk.version>1.9.49</appengine.sdk.version> <!-- TODO: MOVE TO /appengine -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven-war-plugin-version>3.0.0</maven-war-plugin-version>
         <maven-compiler-plugin-version>2.5.1</maven-compiler-plugin-version>
diff --git a/unittests/src/test/java/com/google/appengine/samples/OAuthTest.java b/unittests/src/test/java/com/google/appengine/samples/OAuthTest.java
deleted file mode 100644
index 7a74897a3d2..00000000000
--- a/unittests/src/test/java/com/google/appengine/samples/OAuthTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2015 Google Inc. All Rights Reserved.
- *
- * 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.
- */
-
-package com.google.appengine.samples;
-
-// [START OAuthTest]
-
-import static org.junit.Assert.assertEquals;
-
-import com.google.appengine.api.oauth.OAuthRequestException;
-import com.google.appengine.api.oauth.OAuthService;
-import com.google.appengine.api.oauth.OAuthServiceFactory;
-import com.google.appengine.api.users.User;
-import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
-import com.google.appengine.tools.development.testing.LocalUserServiceTestConfig;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-public class OAuthTest {
-  private static final String OAUTH_CONSUMER_KEY = "notexample.com";
-  private static final String OAUTH_EMAIL = "bozo@clown.com";
-  private static final String OAUTH_USER_ID = "bozo";
-  private static final String OAUTH_AUTH_DOMAIN = "clown.com";
-  private static final boolean OAUTH_IS_ADMIN = true;
-
-  private final LocalServiceTestHelper helper =
-      new LocalServiceTestHelper(new LocalUserServiceTestConfig()
-          .setOAuthConsumerKey(OAUTH_CONSUMER_KEY)
-          .setOAuthEmail(OAUTH_EMAIL)
-          .setOAuthUserId(OAUTH_USER_ID)
-          .setOAuthAuthDomain(OAUTH_AUTH_DOMAIN)
-          .setOAuthIsAdmin(OAUTH_IS_ADMIN));
-
-  @Before
-  public void setUp() {
-    helper.setUp();
-  }
-
-  @After
-  public void tearDown() {
-    helper.tearDown();
-  }
-
-  @Test
-  public void testConfig() throws OAuthRequestException {
-    OAuthService oauthService = OAuthServiceFactory.getOAuthService();
-    assertEquals(OAUTH_CONSUMER_KEY, oauthService.getOAuthConsumerKey());
-    assertEquals(new User(OAUTH_EMAIL, OAUTH_AUTH_DOMAIN, OAUTH_USER_ID),
-        oauthService.getCurrentUser());
-    assertEquals(OAUTH_IS_ADMIN, oauthService.isUserAdmin());
-  }
-}
-
-// [END OAuthTest]